Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d590964 authored by Simon Wilson's avatar Simon Wilson
Browse files

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
parent c67d0575

services/audioflinger/FastMixer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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) {

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;