diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/RpcState.cpp | 7 | ||||
| -rw-r--r-- | libs/binder/RpcState.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp index b5eaaa3413..5881703752 100644 --- a/libs/binder/RpcState.cpp +++ b/libs/binder/RpcState.cpp @@ -34,11 +34,10 @@ namespace android { using base::ScopeGuard; -#ifdef RPC_FLAKE_PRONE +#if RPC_FLAKE_PRONE void rpcMaybeWaitToFlake() { - static std::random_device r; - static std::mutex m; - + [[clang::no_destroy]] static std::random_device r; + [[clang::no_destroy]] static std::mutex m; unsigned num; { std::lock_guard<std::mutex> lock(m); diff --git a/libs/binder/RpcState.h b/libs/binder/RpcState.h index 8201eba5da..5ac0b973f1 100644 --- a/libs/binder/RpcState.h +++ b/libs/binder/RpcState.h @@ -44,7 +44,7 @@ struct RpcWireHeader; #define RPC_FLAKE_PRONE false -#ifdef RPC_FLAKE_PRONE +#if RPC_FLAKE_PRONE void rpcMaybeWaitToFlake(); #define MAYBE_WAIT_IN_FLAKE_MODE rpcMaybeWaitToFlake() #else |