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

Commit 23e78269 authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Fix flaky GNSS VTS 

In the original code, vector::erase() would invalidate iterators so we
should move the thread object into the std::async() for the blocking
operation.

Bug: 344250967
Test: atest VtsHalGnssTargetTest
Change-Id: I4cc82131bb070a37cb6ed9dbe9d7cccc7ab5ee89
parent 29e5340a

gnss/aidl/default/GnssMeasurementInterface.cpp

+10 −7
Original line number Diff line number Diff line
@@ -146,15 +146,18 @@ void GnssMeasurementInterface::stop() { 
    mIsActive = false;

    mGnss->setGnssMeasurementEnabled(false);

    mThreadBlocker.notify();

    for (auto iter = mThreads.begin(); iter != mThreads.end(); ++iter) {

    for (auto iter = mThreads.begin(); iter != mThreads.end();) {

        if (iter->joinable()) {

            mFutures.push_back(std::async(std::launch::async, [this, iter] {

                iter->join();

                mThreads.erase(iter);

            // Store the thread object by value

            std::thread threadToMove = std::move(*iter);



            mFutures.push_back(std::async(std::launch::async,

                                          [threadToMove = std::move(threadToMove)]() mutable {

                                              ALOGD("joining thread");

                                              threadToMove.join();

                                          }));

        } else {

            mThreads.erase(iter);

        }

        iter = mThreads.erase(iter);

    }

}

gnss/aidl/default/GnssNavigationMessageInterface.cpp

+10 −7
Original line number Diff line number Diff line
@@ -90,15 +90,18 @@ void GnssNavigationMessageInterface::stop() { 
    ALOGD("stop");

    mIsActive = false;

    mThreadBlocker.notify();

    for (auto iter = mThreads.begin(); iter != mThreads.end(); ++iter) {

    for (auto iter = mThreads.begin(); iter != mThreads.end();) {

        if (iter->joinable()) {

            mFutures.push_back(std::async(std::launch::async, [this, iter] {

                iter->join();

                mThreads.erase(iter);

            // Store the thread object by value

            std::thread threadToMove = std::move(*iter);



            mFutures.push_back(std::async(std::launch::async,

                                          [threadToMove = std::move(threadToMove)]() mutable {

                                              ALOGD("joining thread");

                                              threadToMove.join();

                                          }));

        } else {

            mThreads.erase(iter);

        }

        iter = mThreads.erase(iter);

    }

}