Revert "Add TaskQueueStdlib experiment."
This reverts commit 83db78e854ff35d57124f04aff9464c0862cd833.
Reason for revert: Some tests in Chromium's blink no longer compile because of the change in the signature of the CreateDefaultTaskQueueFactory() function.
Original change's description:
> Add TaskQueueStdlib experiment.
>
> Bug: webrtc:14389
> Change-Id: I23c6e0ae675748ec35a99c334104dd2654995a33
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265802
> Commit-Queue: Ali Tofigh <alito@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
> Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#37888}
Bug: webrtc:14389
Change-Id: If3e63d6b4ab9e838dc5020b88076a73fd29916e4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/272920
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Ali Tofigh <alito@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37902}
diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn
index 2406bc0..8daa01d 100644
--- a/api/task_queue/BUILD.gn
+++ b/api/task_queue/BUILD.gn
@@ -61,9 +61,7 @@
]
} else {
deps = [
- ":default_task_queue_factory",
":task_queue",
- "../../api:field_trials_view",
"../../api/units:time_delta",
"../../rtc_base:refcount",
"../../rtc_base:rtc_event",
@@ -83,26 +81,11 @@
poisonous = [ "default_task_queue" ]
}
sources = [ "default_task_queue_factory.h" ]
- deps = [
- ":task_queue",
- "../../api:field_trials_view",
- "../../rtc_base/memory:always_valid_pointer",
- ]
+ deps = [ ":task_queue" ]
if (rtc_enable_libevent) {
- if (is_android) {
- sources +=
- [ "default_task_queue_factory_stdlib_or_libevent_experiment.cc" ]
- deps += [
- "../../api/transport:field_trial_based_config",
- "../../rtc_base:logging",
- "../../rtc_base:rtc_task_queue_libevent",
- "../../rtc_base:rtc_task_queue_stdlib",
- ]
- } else {
- sources += [ "default_task_queue_factory_libevent.cc" ]
- deps += [ "../../rtc_base:rtc_task_queue_libevent" ]
- }
+ sources += [ "default_task_queue_factory_libevent.cc" ]
+ deps += [ "../../rtc_base:rtc_task_queue_libevent" ]
} else if (is_mac || is_ios) {
sources += [ "default_task_queue_factory_gcd.cc" ]
deps += [ "../../rtc_base:rtc_task_queue_gcd" ]
diff --git a/api/task_queue/default_task_queue_factory.h b/api/task_queue/default_task_queue_factory.h
index 1d2dbd7..ccdd1eb 100644
--- a/api/task_queue/default_task_queue_factory.h
+++ b/api/task_queue/default_task_queue_factory.h
@@ -12,13 +12,11 @@
#include <memory>
-#include "api/field_trials_view.h"
#include "api/task_queue/task_queue_factory.h"
namespace webrtc {
-std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory(
- const FieldTrialsView* field_trials = nullptr);
+std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory();
} // namespace webrtc
diff --git a/api/task_queue/default_task_queue_factory_gcd.cc b/api/task_queue/default_task_queue_factory_gcd.cc
index 391f09b..7e17b48 100644
--- a/api/task_queue/default_task_queue_factory_gcd.cc
+++ b/api/task_queue/default_task_queue_factory_gcd.cc
@@ -9,14 +9,12 @@
*/
#include <memory>
-#include "api/field_trials_view.h"
#include "api/task_queue/task_queue_factory.h"
#include "rtc_base/task_queue_gcd.h"
namespace webrtc {
-std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory(
- const FieldTrialsView* field_trials) {
+std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory() {
return CreateTaskQueueGcdFactory();
}
diff --git a/api/task_queue/default_task_queue_factory_libevent.cc b/api/task_queue/default_task_queue_factory_libevent.cc
index 89079f5..f2fb418 100644
--- a/api/task_queue/default_task_queue_factory_libevent.cc
+++ b/api/task_queue/default_task_queue_factory_libevent.cc
@@ -9,14 +9,12 @@
*/
#include <memory>
-#include "api/field_trials_view.h"
#include "api/task_queue/task_queue_factory.h"
#include "rtc_base/task_queue_libevent.h"
namespace webrtc {
-std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory(
- const FieldTrialsView* field_trials) {
+std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory() {
return CreateTaskQueueLibeventFactory();
}
diff --git a/api/task_queue/default_task_queue_factory_stdlib.cc b/api/task_queue/default_task_queue_factory_stdlib.cc
index 10cda7c..ca7d720 100644
--- a/api/task_queue/default_task_queue_factory_stdlib.cc
+++ b/api/task_queue/default_task_queue_factory_stdlib.cc
@@ -9,14 +9,12 @@
*/
#include <memory>
-#include "api/field_trials_view.h"
#include "api/task_queue/task_queue_factory.h"
#include "rtc_base/task_queue_stdlib.h"
namespace webrtc {
-std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory(
- const FieldTrialsView* field_trials) {
+std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory() {
return CreateTaskQueueStdlibFactory();
}
diff --git a/api/task_queue/default_task_queue_factory_stdlib_or_libevent_experiment.cc b/api/task_queue/default_task_queue_factory_stdlib_or_libevent_experiment.cc
deleted file mode 100644
index dc6e835..0000000
--- a/api/task_queue/default_task_queue_factory_stdlib_or_libevent_experiment.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <memory>
-
-#include "api/field_trials_view.h"
-#include "api/task_queue/task_queue_factory.h"
-#include "api/transport/field_trial_based_config.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/memory/always_valid_pointer.h"
-#include "rtc_base/task_queue_libevent.h"
-#include "rtc_base/task_queue_stdlib.h"
-
-namespace webrtc {
-
-std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory(
- const FieldTrialsView* field_trials_view) {
- AlwaysValidPointer<const FieldTrialsView, FieldTrialBasedConfig> field_trials(
- field_trials_view);
- if (field_trials->IsEnabled("WebRTC-TaskQueue-ReplaceLibeventWithStdlib")) {
- RTC_LOG(LS_INFO) << "WebRTC-TaskQueue-ReplaceLibeventWithStdlib: "
- << "using TaskQueueStdlibFactory.";
- return CreateTaskQueueStdlibFactory();
- }
-
- RTC_LOG(LS_INFO) << "WebRTC-TaskQueue-ReplaceLibeventWithStdlib: "
- << "using TaskQueueLibeventFactory.";
- return CreateTaskQueueLibeventFactory();
-}
-
-} // namespace webrtc
diff --git a/api/task_queue/default_task_queue_factory_win.cc b/api/task_queue/default_task_queue_factory_win.cc
index e3adc07..493ea66 100644
--- a/api/task_queue/default_task_queue_factory_win.cc
+++ b/api/task_queue/default_task_queue_factory_win.cc
@@ -9,14 +9,12 @@
*/
#include <memory>
-#include "api/field_trials_view.h"
#include "api/task_queue/task_queue_factory.h"
#include "rtc_base/task_queue_win.h"
namespace webrtc {
-std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory(
- const FieldTrialsView* field_trials) {
+std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory() {
return CreateTaskQueueWinFactory();
}
diff --git a/api/task_queue/task_queue_test.cc b/api/task_queue/task_queue_test.cc
index 0f6b1d0..69532d6 100644
--- a/api/task_queue/task_queue_test.cc
+++ b/api/task_queue/task_queue_test.cc
@@ -13,7 +13,6 @@
#include "absl/cleanup/cleanup.h"
#include "absl/strings/string_view.h"
-#include "api/task_queue/default_task_queue_factory.h"
#include "api/units/time_delta.h"
#include "rtc_base/event.h"
#include "rtc_base/ref_counter.h"
@@ -30,13 +29,13 @@
}
TEST_P(TaskQueueTest, Construct) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
auto queue = CreateTaskQueue(factory, "Construct");
EXPECT_FALSE(queue->IsCurrent());
}
TEST_P(TaskQueueTest, PostAndCheckCurrent) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
rtc::Event event;
auto queue = CreateTaskQueue(factory, "PostAndCheckCurrent");
@@ -54,7 +53,7 @@
}
TEST_P(TaskQueueTest, PostCustomTask) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
rtc::Event ran;
auto queue = CreateTaskQueue(factory, "PostCustomImplementation");
@@ -73,7 +72,7 @@
}
TEST_P(TaskQueueTest, PostDelayedZero) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
rtc::Event event;
auto queue = CreateTaskQueue(factory, "PostDelayedZero");
@@ -82,7 +81,7 @@
}
TEST_P(TaskQueueTest, PostFromQueue) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
rtc::Event event;
auto queue = CreateTaskQueue(factory, "PostFromQueue");
@@ -92,7 +91,7 @@
}
TEST_P(TaskQueueTest, PostDelayed) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
rtc::Event event;
auto queue =
CreateTaskQueue(factory, "PostDelayed", TaskQueueFactory::Priority::HIGH);
@@ -114,7 +113,7 @@
}
TEST_P(TaskQueueTest, PostMultipleDelayed) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
auto queue = CreateTaskQueue(factory, "PostMultipleDelayed");
std::vector<rtc::Event> events(100);
@@ -133,7 +132,7 @@
}
TEST_P(TaskQueueTest, PostDelayedAfterDestruct) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
rtc::Event run;
rtc::Event deleted;
auto queue = CreateTaskQueue(factory, "PostDelayedAfterDestruct");
@@ -148,7 +147,7 @@
}
TEST_P(TaskQueueTest, PostAndReuse) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
rtc::Event event;
auto post_queue = CreateTaskQueue(factory, "PostQueue");
auto reply_queue = CreateTaskQueue(factory, "ReplyQueue");
@@ -204,7 +203,7 @@
rtc::Event event_;
};
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
static constexpr int kTaskCount = 0xffff;
rtc::Event posting_done;
BlockingCounter all_destroyed(kTaskCount);
@@ -248,7 +247,7 @@
// unit test, run it under TSan or some other tool that is able to
// directly detect data races.
TEST_P(TaskQueueTest, PostTwoWithSharedUnprotectedState) {
- std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()(nullptr);
+ std::unique_ptr<webrtc::TaskQueueFactory> factory = GetParam()();
struct SharedState {
// First task will set this value to 1 and second will assert it.
int state = 0;
diff --git a/api/task_queue/task_queue_test.h b/api/task_queue/task_queue_test.h
index 214f950..e2e4730 100644
--- a/api/task_queue/task_queue_test.h
+++ b/api/task_queue/task_queue_test.h
@@ -13,7 +13,6 @@
#include <functional>
#include <memory>
-#include "api/field_trials_view.h"
#include "api/task_queue/task_queue_factory.h"
#include "test/gtest.h"
@@ -32,9 +31,9 @@
// INSTANTIATE_TEST_SUITE_P(My, TaskQueueTest, Values(CreateMyFactory));
//
// } // namespace
-class TaskQueueTest
- : public ::testing::TestWithParam<std::function<
- std::unique_ptr<TaskQueueFactory>(const FieldTrialsView*)>> {};
+class TaskQueueTest : public ::testing::TestWithParam<
+ std::function<std::unique_ptr<TaskQueueFactory>()>> {
+};
} // namespace webrtc