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

Commit f3990f2c authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Improve resistance to leaks for ConfigEvent 

A Vector of pointers is risky, as there is no ownership (and the
ThreadBase destructor was not deleting them, so if there were any left
over at end it would leak).  Replaced by a Vector of values.

Change-Id: Iddde72dc30134adfcf724dec26cbe0a742509b8c
parent eebeceec

services/audioflinger/AudioFlinger.cpp

+6 −7
Original line number Diff line number Diff line
@@ -1062,9 +1062,9 @@ void AudioFlinger::ThreadBase::sendConfigEvent(int event, int param) 
// sendConfigEvent_l() must be called with ThreadBase::mLock held

void AudioFlinger::ThreadBase::sendConfigEvent_l(int event, int param)

{

    ConfigEvent *configEvent = new ConfigEvent();

    configEvent->mEvent = event;

    configEvent->mParam = param;

    ConfigEvent configEvent;

    configEvent.mEvent = event;

    configEvent.mParam = param;

    mConfigEvents.add(configEvent);

    ALOGV("sendConfigEvent() num events %d event %d, param %d", mConfigEvents.size(), event, param);

    mWaitWorkCV.signal();
@@ -1075,15 +1075,14 @@ void AudioFlinger::ThreadBase::processConfigEvents() 
    mLock.lock();

    while(!mConfigEvents.isEmpty()) {

        ALOGV("processConfigEvents() remaining events %d", mConfigEvents.size());

        ConfigEvent *configEvent = mConfigEvents[0];

        ConfigEvent configEvent = mConfigEvents[0];

        mConfigEvents.removeAt(0);

        // release mLock before locking AudioFlinger mLock: lock order is always

        // AudioFlinger then ThreadBase to avoid cross deadlock

        mLock.unlock();

        mAudioFlinger->mLock.lock();

        audioConfigChanged_l(configEvent->mEvent, configEvent->mParam);

        audioConfigChanged_l(configEvent.mEvent, configEvent.mParam);

        mAudioFlinger->mLock.unlock();

        delete configEvent;

        mLock.lock();

    }

    mLock.unlock();
@@ -1130,7 +1129,7 @@ status_t AudioFlinger::ThreadBase::dumpBase(int fd, const Vector<String16>& args 
    snprintf(buffer, SIZE, " Index event param\n");

    result.append(buffer);

    for (size_t i = 0; i < mConfigEvents.size(); i++) {

        snprintf(buffer, SIZE, " %02d    %02d    %d\n", i, mConfigEvents[i]->mEvent, mConfigEvents[i]->mParam);

        snprintf(buffer, SIZE, " %02d    %02d    %d\n", i, mConfigEvents[i].mEvent, mConfigEvents[i].mParam);

        result.append(buffer);

    }

    result.append("\n");

services/audioflinger/AudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ private: 
                    Condition               mParamCond;

                    Vector<String8>         mNewParameters;

                    status_t                mParamStatus;

                    Vector<ConfigEvent *>   mConfigEvents;

                    Vector<ConfigEvent>     mConfigEvents;

                    bool                    mStandby;

                    int                     mId;

                    bool                    mExiting;