Merge "Make threadLoop() logs identical"

This commit is contained in:
Glenn Kasten
2012-02-27 07:24:46 -08:00
committed by Android (Google) Code Review

View File

@@ -2052,9 +2052,9 @@ bool AudioFlinger::MixerThread::threadLoop()
releaseWakeLock_l();
// wait until we have something to do...
ALOGV("MixerThread %p TID %d going to sleep", this, gettid());
ALOGV("Thread %p type %d TID %d going to sleep", this, mType, gettid());
mWaitWorkCV.wait(mLock);
ALOGV("MixerThread %p TID %d waking up", this, gettid());
ALOGV("Thread %p type %d TID %d waking up", this, mType, gettid());
acquireWakeLock_l();
mPrevMixerStatus = MIXER_IDLE;
@@ -2183,7 +2183,7 @@ bool AudioFlinger::MixerThread::threadLoop()
releaseWakeLock();
ALOGV("MixerThread %p exiting", this);
ALOGV("Thread %p type %d exiting", this, mType);
return false;
}
@@ -2740,7 +2740,7 @@ bool AudioFlinger::DirectOutputThread::threadLoop()
mSuspended)) {
// wait until we have something to do...
if (!mStandby) {
ALOGV("Audio hardware entering standby, mixer %p", this);
ALOGV("Audio hardware entering standby, mixer %p, mSuspended %d", this, mSuspended);
mOutput->stream->common.standby(&mOutput->stream->common);
mStandby = true;
mBytesWritten = 0;
@@ -2753,9 +2753,9 @@ bool AudioFlinger::DirectOutputThread::threadLoop()
if (exitPending()) break;
releaseWakeLock_l();
ALOGV("DirectOutputThread %p TID %d going to sleep", this, gettid());
ALOGV("Thread %p type %d TID %d going to sleep", this, mType, gettid());
mWaitWorkCV.wait(mLock);
ALOGV("DirectOutputThread %p TID %d waking up in active mode", this, gettid());
ALOGV("Thread %p type %d TID %d waking up", this, mType, gettid());
acquireWakeLock_l();
checkSilentMode_l();
@@ -2972,7 +2972,7 @@ bool AudioFlinger::DirectOutputThread::threadLoop()
releaseWakeLock();
ALOGV("DirectOutputThread %p exiting", this);
ALOGV("Thread %p type %d exiting", this, mType);
return false;
}
@@ -3141,9 +3141,10 @@ bool AudioFlinger::DuplicatingThread::threadLoop()
if (exitPending()) break;
releaseWakeLock_l();
ALOGV("DuplicatingThread %p TID %d going to sleep", this, gettid());
// wait until we have something to do...
ALOGV("Thread %p type %d TID %d going to sleep", this, mType, gettid());
mWaitWorkCV.wait(mLock);
ALOGV("DuplicatingThread %p TID %d waking up", this, gettid());
ALOGV("Thread %p type %d TID %d waking up", this, mType, gettid());
acquireWakeLock_l();
checkSilentMode_l();
@@ -3227,6 +3228,7 @@ bool AudioFlinger::DuplicatingThread::threadLoop()
releaseWakeLock();
ALOGV("Thread %p type %d exiting", this, mType);
return false;
}