| commit | f3d34a7129aa8354ee9bb18f8eabdf198785edfe | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jul 12 23:17:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 12 23:17:18 2021 +0000 |
| tree | d40f2a6b5e4723401fc2e6391550ed0b120870b0 | |
| parent | fed72014cfe01c58eadbcac9775af9869c29f4c4 [diff] | |
| parent | 3158118bb0bc66da20432adebc6a5b4bd60e0322 [diff] |
Merge "libbinder: RPC flake mode fix" am: e9d9b27a64 am: 3158118bb0 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1755433 Change-Id: Ia4a30017ed40f3196cf002a1edf8bec65096b2ca
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp index b5eaaa3..5881703 100644 --- a/libs/binder/RpcState.cpp +++ b/libs/binder/RpcState.cpp
@@ -34,11 +34,10 @@ 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 8201eba..5ac0b97 100644 --- a/libs/binder/RpcState.h +++ b/libs/binder/RpcState.h
@@ -44,7 +44,7 @@ #define RPC_FLAKE_PRONE false -#ifdef RPC_FLAKE_PRONE +#if RPC_FLAKE_PRONE void rpcMaybeWaitToFlake(); #define MAYBE_WAIT_IN_FLAKE_MODE rpcMaybeWaitToFlake() #else