From 5bf516f8b7ac0721cb2e68d11ff123a16c97d5e4 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 13 Jul 2018 11:13:42 -0700 Subject: libbinder: move to mutexes. Bug: N/A Test: builds Change-Id: Ia3a3719c7d66b6cbd2f3aaa18cff4ca11967f34b --- libs/binder/BufferedTextOutput.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libs/binder/BufferedTextOutput.cpp') diff --git a/libs/binder/BufferedTextOutput.cpp b/libs/binder/BufferedTextOutput.cpp index 0946aca876..d516eb1d54 100644 --- a/libs/binder/BufferedTextOutput.cpp +++ b/libs/binder/BufferedTextOutput.cpp @@ -25,6 +25,7 @@ #include +#include #include #include @@ -87,7 +88,7 @@ struct BufferedTextOutput::ThreadState Vector > states; }; -static mutex_t gMutex; +static pthread_mutex_t gMutex = PTHREAD_MUTEX_INITIALIZER; static thread_store_t tls; @@ -113,7 +114,7 @@ static int32_t allocBufferIndex() { int32_t res = -1; - mutex_lock(&gMutex); + pthread_mutex_lock(&gMutex); if (gFreeBufferIndex >= 0) { res = gFreeBufferIndex; @@ -125,17 +126,17 @@ static int32_t allocBufferIndex() gTextBuffers.add(-1); } - mutex_unlock(&gMutex); + pthread_mutex_unlock(&gMutex); return res; } static void freeBufferIndex(int32_t idx) { - mutex_lock(&gMutex); + pthread_mutex_lock(&gMutex); gTextBuffers.editItemAt(idx) = gFreeBufferIndex; gFreeBufferIndex = idx; - mutex_unlock(&gMutex); + pthread_mutex_unlock(&gMutex); } // --------------------------------------------------------------------------- -- cgit v1.2.3-59-g8ed1b