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

Commit b2e8954c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio: Remove timeout from waits on event flags in HAL driver threads"

parents b8769344 e8674569

audio/2.0/default/StreamIn.cpp

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ bool ReadThread::threadLoop() { 
    while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {

        // TODO: Remove manual event flag handling once blocking MQ is implemented. b/33815422

        uint32_t efState = 0;

        mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL), &efState, NS_PER_SEC);

        mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL), &efState);

        if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL))) {

            continue;  // Nothing to do.

        }

audio/2.0/default/StreamOut.cpp

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ bool WriteThread::threadLoop() { 
    while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {

        // TODO: Remove manual event flag handling once blocking MQ is implemented. b/33815422

        uint32_t efState = 0;

        mEfGroup->wait(

                static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY), &efState, NS_PER_SEC);

        mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY), &efState);

        if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY))) {

            continue;  // Nothing to do.

        }

audio/effect/2.0/default/Effect.cpp

+1 −4
Original line number Diff line number Diff line
@@ -77,10 +77,7 @@ bool ProcessThread::threadLoop() { 
    // as the Thread uses mutexes, and this can lead to priority inversion.

    while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {

        uint32_t efState = 0;

        mEfGroup->wait(

                static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL),

                &efState,

                NS_PER_SEC);

        mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL), &efState);

        if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL))

                || (efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_QUIT))) {

            continue;  // Nothing to do or time to quit.