diff options
| author | Luke Huang <huangluke@google.com> | 2018-06-29 13:49:58 +0800 |
|---|---|---|
| committer | Luke Huang <huangluke@google.com> | 2018-07-11 15:04:07 +0800 |
| commit | d1ee462e94c34193bf5e8eb2975fff61b82ab1fb (patch) | |
| tree | dd8ba06ec3939751c61f9f1a672b2474729f2e5f /server/main.cpp | |
| parent | d4c0be8ed437ee2198a0d5d8561093ab23e51c2e (diff) | |
| download | platform_system_netd-d1ee462e94c34193bf5e8eb2975fff61b82ab1fb.tar.gz platform_system_netd-d1ee462e94c34193bf5e8eb2975fff61b82ab1fb.tar.bz2 platform_system_netd-d1ee462e94c34193bf5e8eb2975fff61b82ab1fb.zip | |
Replace RW lock with mutex, shared_mutex
Test: built, flashed, booted
system/netd/tests/runtests.sh passes
Change-Id: I42b52d815b6ba0ba6f93dc27e83a900d2abec715
Diffstat (limited to 'server/main.cpp')
| -rw-r--r-- | server/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/main.cpp b/server/main.cpp index 0f5716b93..a14cd8b98 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -19,6 +19,7 @@ #include <signal.h> #include <errno.h> #include <string.h> +#include <mutex> #include <sys/stat.h> #include <sys/types.h> #include <sys/wait.h> @@ -29,7 +30,6 @@ #define LOG_TAG "Netd" #include "log/log.h" -#include "utils/RWLock.h" #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> @@ -64,7 +64,7 @@ using android::net::makeNFLogListener; const char* const PID_FILE_PATH = "/data/misc/net/netd_pid"; -android::RWLock android::net::gBigNetdLock; +std::mutex android::net::gBigNetdLock; int main() { using android::net::gLog; |