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

Commit 74bb6d71 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Fix run once thread cancel race condition am: f3495593 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2557950



Change-Id: I0158f585d8e5b0693f7ce9fd0f167aad6fbd315c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 850c2914 f3495593

system/common/once_timer.cc

+26 −6
Original line number Diff line number Diff line
@@ -16,11 +16,14 @@ 


#include "once_timer.h"



#include <base/logging.h>



#include <memory>

#include <mutex>



#include "message_loop_thread.h"

#include "time_util.h"



#include <base/logging.h>



namespace bluetooth {



namespace common {
@@ -48,7 +51,12 @@ bool OnceTimer::Schedule(const base::WeakPtr<MessageLoopThread>& thread, 
  task_ = std::move(task);

  task_wrapper_.Reset(

      base::BindOnce(&OnceTimer::RunTask, base::Unretained(this)));

  {

    std::unique_lock<decltype(message_loop_thread_write_mutex_)> lock(

        message_loop_thread_write_mutex_);

    message_loop_thread_ = thread;

  }



  delay_ = delay;

  uint64_t time_until_next_us = time_next_task_us - time_get_os_boottime_us();

  if (!thread->DoInThreadDelayed(
@@ -62,7 +70,11 @@ bool OnceTimer::Schedule(const base::WeakPtr<MessageLoopThread>& thread, 
               << ": failed to post task to message loop for thread " << *thread

               << ", from " << from_here.ToString();

    task_wrapper_.Cancel();

    {

      std::unique_lock<decltype(message_loop_thread_write_mutex_)> lock(

          message_loop_thread_write_mutex_);

      message_loop_thread_ = nullptr;

    }

    delay_ = {};

    return false;

  }
@@ -102,8 +114,12 @@ void OnceTimer::CancelHelper(std::promise<void> promise) { 


// This runs on message loop thread

void OnceTimer::CancelClosure(std::promise<void> promise) {

  message_loop_thread_ = nullptr;

  task_wrapper_.Cancel();

  {

    std::unique_lock<decltype(message_loop_thread_write_mutex_)> lock(

        message_loop_thread_write_mutex_);

    message_loop_thread_ = nullptr;

  }

  delay_ = base::TimeDelta();

  promise.set_value();

}
@@ -127,8 +143,12 @@ void OnceTimer::RunTask() { 


  task_wrapper_.Cancel();

  std::move(task_).Run();

  {

    std::unique_lock<decltype(message_loop_thread_write_mutex_)> lock(

        message_loop_thread_write_mutex_);

    message_loop_thread_ = nullptr;

  }

}



}  // namespace common

system/common/once_timer.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ class OnceTimer final { 
  bool IsScheduled() const;



 private:

  mutable std::mutex message_loop_thread_write_mutex_;

  base::WeakPtr<MessageLoopThread> message_loop_thread_;

  base::CancelableOnceClosure task_wrapper_;

  base::OnceClosure task_;