diff options
| author | 2022-12-20 08:17:05 +0000 | |
|---|---|---|
| committer | 2022-12-20 08:17:05 +0000 | |
| commit | 8a1a5f8d8a8d3c7cb4ac5aed4e5b7a2ac14f2bd2 (patch) | |
| tree | eeabfae143043246a1480c52f5066370395dcd7f /libs/binder/RpcServer.cpp | |
| parent | ef70e8193f751f04daa997e30667d3c60001fe95 (diff) | |
| parent | 4766a1ffc97cd7268407472f33a7cca2d8f57ec5 (diff) | |
Merge changes from topics "rpc-session", "virtmgr-binary"
* changes:
rpc_binder: Prevent RpcServer shutdown deadlock
rpc_binder: Mark ARpcServer_shutdown [[nodiscard]]
rpc_binder: Create C/Rust bindings for bootstrap UDS
rpc_binder: Refactor C/Rust wrappers for RpcSession
rpc_binder: Remove unused VsockFactory server code
Diffstat (limited to 'libs/binder/RpcServer.cpp')
| -rw-r--r-- | libs/binder/RpcServer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp index fedc1d9593..d47e4f044a 100644 --- a/libs/binder/RpcServer.cpp +++ b/libs/binder/RpcServer.cpp @@ -50,7 +50,8 @@ using base::unique_fd; RpcServer::RpcServer(std::unique_ptr<RpcTransportCtx> ctx) : mCtx(std::move(ctx)) {} RpcServer::~RpcServer() { - (void)shutdown(); + RpcMutexUniqueLock _l(mLock); + LOG_ALWAYS_FATAL_IF(mShutdownTrigger != nullptr, "Must call shutdown() before destructor"); } sp<RpcServer> RpcServer::make(std::unique_ptr<RpcTransportCtxFactory> rpcTransportCtxFactory) { |