zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert back to using the task_queue_ for guarding access.

Browse Source 
This removes the SequenceChecker that was temporarily used while
the rtc::Thread TQ implementation was being fixed.

Bug: none
Change-Id: Iaa46e47371211ac0a97b2dcaf23cef12b43ee8ea
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175081
Commit-Queue: Tommi <tommi@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31256}
This commit is contained in:
Tommi
2020-05-14 13:28:29 +02:00
committed by Commit Bot
parent 97755813dd
commit 475006d4a3
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtc_base/task_utils/repeating_task.cc
View File

@ -21,13 +21,12 @@ RepeatingTaskBase::RepeatingTaskBase(TaskQueueBase* task_queue,
TimeDelta first_delay) TimeDelta first_delay)
: task_queue_(task_queue), : task_queue_(task_queue),
next_run_time_(Timestamp::Micros(rtc::TimeMicros()) + first_delay) { next_run_time_(Timestamp::Micros(rtc::TimeMicros()) + first_delay) {
sequence_checker_.Detach();
} }
RepeatingTaskBase::~RepeatingTaskBase() = default; RepeatingTaskBase::~RepeatingTaskBase() = default;
bool RepeatingTaskBase::Run() { bool RepeatingTaskBase::Run() {
RTC_DCHECK_RUN_ON(&sequence_checker_); RTC_DCHECK_RUN_ON(task_queue_);
// Return true to tell the TaskQueue to destruct this object. // Return true to tell the TaskQueue to destruct this object.
if (next_run_time_.IsPlusInfinity()) if (next_run_time_.IsPlusInfinity())
return true; return true;
@ -53,7 +52,7 @@ bool RepeatingTaskBase::Run() {
} }
void RepeatingTaskBase::Stop() { void RepeatingTaskBase::Stop() {
RTC_DCHECK_RUN_ON(&sequence_checker_); RTC_DCHECK_RUN_ON(task_queue_);
RTC_DCHECK(next_run_time_.IsFinite()); RTC_DCHECK(next_run_time_.IsFinite());
next_run_time_ = Timestamp::PlusInfinity(); next_run_time_ = Timestamp::PlusInfinity();
} }

10
rtc_base/task_utils/repeating_task.h
View File

@ -19,7 +19,6 @@
#include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_base.h"
#include "api/units/time_delta.h" #include "api/units/time_delta.h"
#include "api/units/timestamp.h" #include "api/units/timestamp.h"
#include "rtc_base/synchronization/sequence_checker.h"
namespace webrtc { namespace webrtc {
@ -41,14 +40,7 @@ class RepeatingTaskBase : public QueuedTask {
TaskQueueBase* const task_queue_; TaskQueueBase* const task_queue_;
// This is always finite, except for the special case where it's PlusInfinity // This is always finite, except for the special case where it's PlusInfinity
// to signal that the task should stop. // to signal that the task should stop.
Timestamp next_run_time_ RTC_GUARDED_BY(sequence_checker_); Timestamp next_run_time_ RTC_GUARDED_BY(task_queue_);
// We use a SequenceChecker to check for correct usage instead of using
// RTC_DCHECK_RUN_ON(task_queue_). This is to work around a compatibility
// issue with some TQ implementations such as rtc::Thread that don't
// consistently set themselves as the 'current' TQ when running tasks.
// The SequenceChecker detects those implementations differently but gives
// the same effect as far as thread safety goes.
SequenceChecker sequence_checker_;
}; };
// The template closure pattern is based on rtc::ClosureTask. // The template closure pattern is based on rtc::ClosureTask.