From 7a90bc9265782788675af577c7b1c56e5d5be709 Mon Sep 17 00:00:00 2001 From: Simon Wilson Date: Thu, 29 Nov 2012 15:18:50 -0800 Subject: [PATCH] Use ATRACE macros instead of Tracer statics ATRACE_BEGIN and ATRACE_END have replaced the static Tracer::traceBegin and Tracer::traceEnd functions, so use them instead. Fixes compilation errors when tracing is enabled. Change-Id: I4d1147d2f76afcdf113e9986f0544cb848802b15 --- services/audioflinger/FastMixer.cpp | 4 ++-- services/audioflinger/Threads.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 3c8a256a60..2160ea3c7f 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -425,11 +425,11 @@ bool FastMixer::threadLoop() // but this code should be modified to handle both non-blocking and blocking sinks dumpState->mWriteSequence++; #if defined(ATRACE_TAG) && (ATRACE_TAG != ATRACE_TAG_NEVER) - Tracer::traceBegin(ATRACE_TAG, "write"); + ATRACE_BEGIN("write"); #endif ssize_t framesWritten = outputSink->write(mixBuffer, frameCount); #if defined(ATRACE_TAG) && (ATRACE_TAG != ATRACE_TAG_NEVER) - Tracer::traceEnd(ATRACE_TAG); + ATRACE_END(); #endif dumpState->mWriteSequence++; if (framesWritten >= 0) { diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 1ceb850c96..6cada0a7f0 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1653,7 +1653,7 @@ void AudioFlinger::PlaybackThread::threadLoop_write() #define mBitShift 2 // FIXME size_t count = mixBufferSize >> mBitShift; #if defined(ATRACE_TAG) && (ATRACE_TAG != ATRACE_TAG_NEVER) - Tracer::traceBegin(ATRACE_TAG, "write"); + ATRACE_BEGIN("write"); #endif // update the setpoint when AudioFlinger::mScreenState changes uint32_t screenState = AudioFlinger::mScreenState; @@ -1667,7 +1667,7 @@ void AudioFlinger::PlaybackThread::threadLoop_write() } ssize_t framesWritten = mNormalSink->write(mMixBuffer, count); #if defined(ATRACE_TAG) && (ATRACE_TAG != ATRACE_TAG_NEVER) - Tracer::traceEnd(ATRACE_TAG); + ATRACE_END(); #endif if (framesWritten > 0) { bytesWritten = framesWritten << mBitShift; -- 2.11.0