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

Use DefaultTaskQueueFactory instead of Global in test RealTimeController

Browse Source 
Bug: webrtc:10284
Change-Id: I1c285078a9aae42ca811144f42066980a7b155fd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132782
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27672}
This commit is contained in:
Danil Chapovalov
2019-04-12 19:25:06 +02:00
committed by Commit Bot
parent 899280c485
commit 28de7cfd64
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/time_controller/BUILD.gn
View File

@ -21,7 +21,7 @@ if (rtc_include_tests) {
deps = [ deps = [
"../../api/task_queue", "../../api/task_queue",
"../../api/task_queue:global_task_queue_factory", "../../api/task_queue:default_task_queue_factory",
"../../api/units:time_delta", "../../api/units:time_delta",
"../../api/units:timestamp", "../../api/units:timestamp",
"../../modules:module_api", "../../modules:module_api",

9
test/time_controller/real_time_controller.cc
View File

@ -9,19 +9,20 @@
*/ */
#include "test/time_controller/real_time_controller.h" #include "test/time_controller/real_time_controller.h"
#include "api/task_queue/global_task_queue_factory.h" #include "api/task_queue/default_task_queue_factory.h"
#include "rtc_base/event.h"
#include "rtc_base/task_utils/to_queued_task.h"
#include "system_wrappers/include/sleep.h" #include "system_wrappers/include/sleep.h"
namespace webrtc { namespace webrtc {
RealTimeController::RealTimeController()
: task_queue_factory_(CreateDefaultTaskQueueFactory()) {}
Clock* RealTimeController::GetClock() { Clock* RealTimeController::GetClock() {
return Clock::GetRealTimeClock(); return Clock::GetRealTimeClock();
} }
TaskQueueFactory* RealTimeController::GetTaskQueueFactory() { TaskQueueFactory* RealTimeController::GetTaskQueueFactory() {
return &GlobalTaskQueueFactory(); return task_queue_factory_.get();
} }
std::unique_ptr<ProcessThread> RealTimeController::CreateProcessThread( std::unique_ptr<ProcessThread> RealTimeController::CreateProcessThread(

10
test/time_controller/real_time_controller.h
View File

@ -10,19 +10,29 @@
#ifndef TEST_TIME_CONTROLLER_REAL_TIME_CONTROLLER_H_ #ifndef TEST_TIME_CONTROLLER_REAL_TIME_CONTROLLER_H_
#define TEST_TIME_CONTROLLER_REAL_TIME_CONTROLLER_H_ #define TEST_TIME_CONTROLLER_REAL_TIME_CONTROLLER_H_
#include <functional>
#include <memory> #include <memory>
#include "api/task_queue/task_queue_factory.h"
#include "api/units/time_delta.h"
#include "modules/utility/include/process_thread.h"
#include "system_wrappers/include/clock.h"
#include "test/time_controller/time_controller.h" #include "test/time_controller/time_controller.h"
namespace webrtc { namespace webrtc {
class RealTimeController : public TimeController { class RealTimeController : public TimeController {
public: public:
RealTimeController();
Clock* GetClock() override; Clock* GetClock() override;
TaskQueueFactory* GetTaskQueueFactory() override; TaskQueueFactory* GetTaskQueueFactory() override;
std::unique_ptr<ProcessThread> CreateProcessThread( std::unique_ptr<ProcessThread> CreateProcessThread(
const char* thread_name) override; const char* thread_name) override;
void Sleep(TimeDelta duration) override; void Sleep(TimeDelta duration) override;
void InvokeWithControlledYield(std::function<void()> closure) override; void InvokeWithControlledYield(std::function<void()> closure) override;
private:
std::unique_ptr<TaskQueueFactory> task_queue_factory_;
}; };
RealTimeController* GlobalRealTimeController(); RealTimeController* GlobalRealTimeController();