Merge "Fixed build error with clang/llvm."

This commit is contained in:
Wale Ogunwale 2015-04-22 00:27:30 +00:00 committed by Android (Google) Code Review
commit 1c38c4192b

View File

@ -403,8 +403,9 @@ void IPCThreadState::blockUntilThreadAvailable()
{ {
pthread_mutex_lock(&mProcess->mThreadCountLock); pthread_mutex_lock(&mProcess->mThreadCountLock);
while (mProcess->mExecutingThreadsCount >= mProcess->mMaxThreads) { while (mProcess->mExecutingThreadsCount >= mProcess->mMaxThreads) {
ALOGW("Waiting for thread to be free. mExecutingThreadsCount=%i mMaxThreads=%i\n", ALOGW("Waiting for thread to be free. mExecutingThreadsCount=%lu mMaxThreads=%lu\n",
mProcess->mExecutingThreadsCount, mProcess->mMaxThreads); static_cast<unsigned long>(mProcess->mExecutingThreadsCount),
static_cast<unsigned long>(mProcess->mMaxThreads));
pthread_cond_wait(&mProcess->mThreadCountDecrement, &mProcess->mThreadCountLock); pthread_cond_wait(&mProcess->mThreadCountDecrement, &mProcess->mThreadCountLock);
} }
pthread_mutex_unlock(&mProcess->mThreadCountLock); pthread_mutex_unlock(&mProcess->mThreadCountLock);