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

Revert "Migrate test/time_controller to webrtc::Mutex."

Browse Source 
This reverts commit 52fd96fb731d9a911bd064a9718d96fef0bd5b24.

Reason for revert: previously undetected lock recursions happening in downstream project.

Original change's description:
> Migrate test/time_controller to webrtc::Mutex.
> 
> Bug: webrtc:11567
> Change-Id: I26fb07bf84ed197ce667290aa0bf4816bc9c5c06
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178818
> Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> Commit-Queue: Markus Handell <handellm@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31660}

TBR=srte@webrtc.org,handellm@webrtc.org

Change-Id: Icccfa32ac21412bc46f75ac7aca76641f5593096
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:11567
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178872
Reviewed-by: Markus Handell <handellm@webrtc.org>
Commit-Queue: Markus Handell <handellm@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31668}
This commit is contained in:
Markus Handell
2020-07-08 10:16:48 +00:00
committed by Commit Bot
parent bd49463a9c
commit 122fadc608
9 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/time_controller/simulated_process_thread.h
View File

@ -16,7 +16,6 @@
#include <memory>
#include <vector>
#include "rtc_base/synchronization/mutex.h"
#include "test/time_controller/simulated_time_controller.h"
namespace webrtc {
@ -30,7 +29,7 @@ class SimulatedProcessThread : public ProcessThread,
void RunReady(Timestamp at_time) override;
Timestamp GetNextRunTime() const override {
MutexLock lock(&lock_);
rtc::CritScope lock(&lock_);
return next_run_time_;
}
@ -56,7 +55,7 @@ class SimulatedProcessThread : public ProcessThread,
sim_time_impl::SimulatedTimeControllerImpl* const handler_;
// Using char* to be debugger friendly.
char* name_;
mutable Mutex lock_;
rtc::CriticalSection lock_;
Timestamp next_run_time_ RTC_GUARDED_BY(lock_) = Timestamp::PlusInfinity();
std::deque<std::unique_ptr<QueuedTask>> queue_;