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

Commit 342d467b authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Update AudioFlinger to use templated unique_lock" into main

parents 914e5f61 f462c6cc

services/audioflinger/IAfThread.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -402,7 +402,7 @@ public: 
    // the Thread is not busy releasing the Tracks, during which the Thread mutex

    // the Thread is not busy releasing the Tracks, during which the Thread mutex

    // may be temporarily unlocked.  Some Track methods will use this method to

    // may be temporarily unlocked.  Some Track methods will use this method to

    // avoid races.

    // avoid races.

    virtual void waitWhileThreadBusy_l(audio_utils::unique_lock& ul)

    virtual void waitWhileThreadBusy_l(audio_utils::unique_lock<audio_utils::mutex>& ul)

            REQUIRES(mutex()) = 0;

            REQUIRES(mutex()) = 0;





    // The ThreadloopExecutor is used to defer functors or dtors

    // The ThreadloopExecutor is used to defer functors or dtors

services/audioflinger/Threads.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -623,7 +623,8 @@ protected: 
     * ThreadBase_Mutex during this time.  No other mutex is held.

     * ThreadBase_Mutex during this time.  No other mutex is held.

     */

     */





    void waitWhileThreadBusy_l(audio_utils::unique_lock& ul) final REQUIRES(mutex()) {

    void waitWhileThreadBusy_l(audio_utils::unique_lock<audio_utils::mutex>& ul)

            final REQUIRES(mutex()) {

        // the wait returns immediately if the predicate is satisfied.

        // the wait returns immediately if the predicate is satisfied.

        mThreadBusyCv.wait(ul, [&]{ return mThreadBusy == false;});

        mThreadBusyCv.wait(ul, [&]{ return mThreadBusy == false;});

    }

    }