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

Commit 1206a125 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "SoundPool: Fix StreamManager JavaThread shutdown" into rvc-dev am:...

Merge "SoundPool: Fix StreamManager JavaThread shutdown" into rvc-dev am: e68ae63e am: 260d0592 am: de291c93

Change-Id: I04efa0af2f5708ea6c34d07e9e15a461be2f7d6d
parents 2382b9bf de291c93
Loading
Loading
Loading
Loading
+8 −1
Original line number Original line Diff line number Diff line
@@ -52,6 +52,12 @@ public:


    JavaThread(JavaThread &&) = delete; // uses "this" ptr, not moveable.
    JavaThread(JavaThread &&) = delete; // uses "this" ptr, not moveable.


    ~JavaThread() {
        join(); // manually block until the future is ready as std::future
                // destructor doesn't block unless it comes from std::async
                // and it is the last reference to shared state.
    }

    void join() const {
    void join() const {
        mFuture.wait();
        mFuture.wait();
    }
    }
@@ -64,8 +70,9 @@ private:
    static int staticFunction(void *data) {
    static int staticFunction(void *data) {
        JavaThread *jt = static_cast<JavaThread *>(data);
        JavaThread *jt = static_cast<JavaThread *>(data);
        jt->mF();
        jt->mF();
        jt->mIsClosed = true;
        jt->mPromise.set_value();
        jt->mPromise.set_value();
        jt->mIsClosed = true;  // publicly inform that we are closed
                               // after we have accessed all variables.
        return 0;
        return 0;
    }
    }