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

Revert "Using simulated rtc::Thread for peer connection scenario tests."

Browse Source 
This reverts commit b70c5c5ce97e7dcf2e1d8453f5ea0639d4b60453.

Reason for revert: Interferes with other tests in same binary.

Original change's description:
> Using simulated rtc::Thread for peer connection scenario tests.
> 
> Bug: webrtc:11255
> Change-Id: I5d29e997a7209ffc64595082358cca9b2115d07a
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165689
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30258}

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

Change-Id: If2e60edae264a4bb0dee3abf66ba2078fd85f493
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:11255
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166045
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30259}
This commit is contained in:
Sebastian Jansson
2020-01-15 10:09:54 +00:00
committed by Commit Bot
parent b70c5c5ce9
commit f1173f46e5
20 changed files with 33 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/time_controller/simulated_time_controller.h
View File

@ -60,10 +60,6 @@ class SimulatedTimeControllerImpl : public TaskQueueFactory,
void YieldExecution() override;
// Create process thread with the name |thread_name|.
std::unique_ptr<ProcessThread> CreateProcessThread(const char* thread_name);
// Create thread using provided |socket_server|.
std::unique_ptr<rtc::Thread> CreateThread(
const std::string& name,
std::unique_ptr<rtc::SocketServer> socket_server);
// Runs all runners in |runners_| that has tasks or modules ready for
// execution.
@ -79,7 +75,6 @@ class SimulatedTimeControllerImpl : public TaskQueueFactory,
private:
const rtc::PlatformThreadId thread_id_;
std::unique_ptr<rtc::Thread> dummy_thread_ = rtc::Thread::Create();
rtc::CriticalSection time_lock_;
Timestamp current_time_ RTC_GUARDED_BY(time_lock_);
rtc::CriticalSection lock_;
@ -124,9 +119,6 @@ class GlobalSimulatedTimeController : public TimeController {
TaskQueueFactory* GetTaskQueueFactory() override;
std::unique_ptr<ProcessThread> CreateProcessThread(
const char* thread_name) override;
std::unique_ptr<rtc::Thread> CreateThread(
const std::string& name,
std::unique_ptr<rtc::SocketServer> socket_server) override;
void AdvanceTime(TimeDelta duration) override;