Detangling target dependencies in rtc_base_approved.
The eventual goal is to allow PlatformThread to use
SequencedTaskChecker, but getting to that point will require
some more detangling.
Here are (roughly) the steps taken in this CL:
* Make constructormagic a separate target.
* Move atomicops and arraysize to separate targets
* Move platform_thread_types to a separate target
* Move criticalsection to a separate target
* Move thread_checker to separate target
* Make sequenced_task_checker not depend on base_approved
* Move ptr_util to a separate target
* Move scoped_ptr to ptr_util
* Make rtc_task_queue_api not depend on base_approved
* Make sequenced_task_checker depend on rtc_task_queue_api
* Move rtc::Event to its own target
* Move basictypes.h to constructormagic
* Move format_macros and stringize_macros into constructormagic
* Rename constructormagic target to... macromagic
* Move stringencode to stringutils
* New target for safe_conversions
* Move timeutils to a new target.
* Move logging to a new target.
* Move platform_thread to a new target.
* Make refcount a new target (refcount, refcountedobject, refcounter).
* Remove rtc_base_approved from deps of TQ
* Remove a circular dependency between event tracer and platform thread.
Further steps will probably be to factor TaskQueue::Current() to not
be a part of the TaskQueue class itself and have it declared+implemented
in a target that's lower level than TQ itself. SequencedTaskChecker can
then depend on that target and avoid the TQ dependency. Once we're there,
PlatformThread will be able to depend on SequencedTaskChecker.
Attempted but eventually removed from this CL:
* Make TQ a part of rtc_base_approved
* Remove direct dependencies on sequenced_task_checker.
* Profit.
A few include-what-you-use updates along the way.
Fix a few targets that were depending on rtc_task_queue_api
Change-Id: Iee79aa2e81d978444c51b3005db9df7dc12d92a9
Bug: webrtc:8957
Reviewed-on: https://webrtc-review.googlesource.com/58480
Commit-Queue: Tommi <tommi@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22487}diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 50e0b24..fbec98b 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -23,7 +23,6 @@
":rtc_base",
":rtc_base_approved",
":rtc_task_queue",
- ":sequenced_task_checker",
":weak_ptr",
]
if (is_android) {
@@ -85,13 +84,169 @@
rtc_source_set("rtc_base_approved") {
visibility = [ "*" ]
public_deps = [
+ ":atomicops",
+ ":criticalsection",
+ ":logging",
+ ":macromagic",
+ ":platform_thread",
+ ":platform_thread_types",
+ ":ptr_util",
+ ":refcount",
":rtc_base_approved_generic",
+ ":rtc_event",
+ ":safe_conversions",
+ ":stringutils",
+ ":thread_checker",
+ ":timeutils",
]
if (is_mac && !build_with_chromium) {
public_deps += [ ":rtc_base_approved_objc" ]
}
}
+rtc_source_set("macromagic") {
+ sources = [
+ "arraysize.h",
+ "basictypes.h",
+ "constructormagic.h",
+ "format_macros.h",
+ "stringize_macros.h",
+ "thread_annotations.h",
+ ]
+}
+
+rtc_source_set("platform_thread_types") {
+ sources = [
+ "platform_thread_types.cc",
+ "platform_thread_types.h",
+ ]
+}
+
+rtc_source_set("ptr_util") {
+ sources = [
+ "ptr_util.h",
+ "scoped_ref_ptr.h",
+ ]
+}
+
+rtc_source_set("refcount") {
+ sources = [
+ "refcount.h",
+ "refcountedobject.h",
+ "refcounter.h",
+ ]
+ deps = [
+ ":atomicops",
+ ":macromagic",
+ ]
+}
+
+rtc_source_set("criticalsection") {
+ sources = [
+ "criticalsection.cc",
+ "criticalsection.h",
+ ]
+ deps = [
+ ":atomicops",
+ ":checks",
+ ":macromagic",
+ ":platform_thread_types",
+ "..:typedefs",
+ ]
+}
+
+rtc_source_set("platform_thread") {
+ visibility = [
+ ":rtc_base_approved",
+ ":rtc_base_approved_generic",
+ ":rtc_task_queue_libevent",
+ ":rtc_task_queue_win",
+ ":sequenced_task_checker",
+ ]
+ sources = [
+ "platform_thread.cc",
+ "platform_thread.h",
+ ]
+ deps = [
+ ":atomicops",
+ ":checks",
+ ":macromagic",
+ ":platform_thread_types",
+ ":rtc_event",
+ ":thread_checker",
+ ":timeutils",
+ "..:typedefs",
+ ]
+}
+
+rtc_source_set("rtc_event") {
+ if (build_with_chromium) {
+ sources = [
+ "../../webrtc_overrides/rtc_base/event.cc",
+ "../../webrtc_overrides/rtc_base/event.h",
+ ]
+ } else {
+ sources = [
+ "event.cc",
+ "event.h",
+ ]
+ }
+
+ deps = [
+ ":checks",
+ ":macromagic",
+ ]
+}
+
+rtc_source_set("logging") {
+ deps = [
+ ":criticalsection",
+ ":macromagic",
+ ":platform_thread_types",
+ ":stringutils",
+ ":timeutils",
+ ]
+
+ if (build_with_chromium) {
+ # Dependency on chromium's logging (in //base).
+ deps += [ "//base:base" ]
+ sources = [
+ "../../webrtc_overrides/rtc_base/logging.cc",
+ "../../webrtc_overrides/rtc_base/logging.h",
+ ]
+ } else {
+ sources = [
+ "logging.cc",
+ "logging.h",
+ ]
+
+ # logging.h needs the deprecation header while downstream projects are
+ # removing code that depends on logging implementation details.
+ deps += [ ":deprecation" ]
+ }
+}
+
+rtc_source_set("thread_checker") {
+ sources = [
+ "thread_checker.h",
+ "thread_checker_impl.cc",
+ "thread_checker_impl.h",
+ ]
+ deps = [
+ ":checks",
+ ":criticalsection",
+ ":macromagic",
+ ":platform_thread_types",
+ "..:typedefs",
+ ]
+}
+
+rtc_source_set("atomicops") {
+ sources = [
+ "atomicops.h",
+ ]
+}
+
rtc_source_set("checks") {
sources = [
"checks.cc",
@@ -140,8 +295,31 @@
]
}
+rtc_source_set("safe_conversions") {
+ sources = [
+ "numerics/safe_conversions.h",
+ "numerics/safe_conversions_impl.h",
+ ]
+ deps = [
+ ":checks",
+ ]
+}
+
+rtc_source_set("timeutils") {
+ sources = [
+ "timeutils.cc",
+ "timeutils.h",
+ ]
+ deps = [
+ ":checks",
+ ":safe_conversions",
+ ]
+}
+
rtc_source_set("stringutils") {
sources = [
+ "stringencode.cc",
+ "stringencode.h",
"strings/string_builder.cc",
"strings/string_builder.h",
"stringutils.cc",
@@ -170,7 +348,6 @@
rtc_source_set("rtc_base_approved_generic") {
visibility = [
":rtc_base_approved",
- ":rtc_base_approved_objc",
":weak_ptr_unittests",
]
@@ -178,19 +355,29 @@
defines = []
libs = []
deps = [
+ ":atomicops",
":checks",
+ ":criticalsection",
+ ":logging",
+ ":macromagic",
+ ":platform_thread",
+ ":platform_thread_types",
+ ":ptr_util",
+ ":refcount",
+ ":rtc_event",
+ ":rtc_task_queue",
":safe_compare",
+ ":safe_conversions",
":stringutils",
+ ":thread_checker",
+ ":timeutils",
":type_traits",
"../:typedefs",
]
sources = [
- "arraysize.h",
- "atomicops.h",
"base64.cc",
"base64.h",
- "basictypes.h",
"bind.h",
"bitbuffer.cc",
"bitbuffer.h",
@@ -202,18 +389,14 @@
"bytebuffer.cc",
"bytebuffer.h",
"byteorder.h",
- "constructormagic.h",
"copyonwritebuffer.cc",
"copyonwritebuffer.h",
- "criticalsection.cc",
- "criticalsection.h",
"event_tracer.cc",
"event_tracer.h",
"file.cc",
"file.h",
"flags.cc",
"flags.h",
- "format_macros.h",
"function_view.h",
"ignore_wundef.h",
"location.cc",
@@ -222,18 +405,11 @@
"numerics/histogram_percentile_counter.h",
"numerics/mod_ops.h",
"numerics/moving_max_counter.h",
- "numerics/safe_conversions.h",
- "numerics/safe_conversions_impl.h",
"onetimeevent.h",
"pathutils.cc",
"pathutils.h",
"platform_file.cc",
"platform_file.h",
- "platform_thread.cc",
- "platform_thread.h",
- "platform_thread_types.cc",
- "platform_thread_types.h",
- "ptr_util.h",
"race_checker.cc",
"race_checker.h",
"random.cc",
@@ -242,25 +418,12 @@
"rate_statistics.h",
"ratetracker.cc",
"ratetracker.h",
- "refcount.h",
- "refcountedobject.h",
- "refcounter.h",
- "scoped_ref_ptr.h",
"string_to_number.cc",
"string_to_number.h",
- "stringencode.cc",
- "stringencode.h",
- "stringize_macros.h",
"swap_queue.h",
"template_util.h",
- "thread_annotations.h",
- "thread_checker.h",
- "thread_checker_impl.cc",
- "thread_checker_impl.h",
"timestampaligner.cc",
"timestampaligner.h",
- "timeutils.cc",
- "timeutils.h",
"trace_event.h",
"zero_memory.cc",
"zero_memory.h",
@@ -284,27 +447,6 @@
sources += [ "file_win.cc" ]
}
- if (build_with_chromium) {
- # Dependency on chromium's logging (in //base).
- deps += [ "//base:base" ]
- sources += [
- "../../webrtc_overrides/rtc_base/event.cc",
- "../../webrtc_overrides/rtc_base/event.h",
- "../../webrtc_overrides/rtc_base/logging.cc",
- "../../webrtc_overrides/rtc_base/logging.h",
- ]
- } else {
- sources += [
- "event.cc",
- "event.h",
- "logging.cc",
- "logging.h",
- ]
-
- # logging.h needs the deprecation header while downstream projects are
- # removing code that depends on logging implementation details.
- deps += [ ":deprecation" ]
- }
if (is_component_build && is_win) {
# Copy the VS runtime DLLs into the isolate so that they don't have to be
# preinstalled on the target machine. The debug runtimes have a "d" at
@@ -395,16 +537,14 @@
"logging_mac.mm",
]
deps = [
- ":rtc_base_approved_generic",
+ ":logging",
]
}
}
rtc_source_set("rtc_task_queue") {
visibility = [ "*" ]
- deps = [
- ":rtc_base_approved",
- ]
+ deps = []
public_deps = [
":rtc_task_queue_api",
]
@@ -421,47 +561,109 @@
# provided implementation should be used. An external implementation should
# depend on rtc_task_queue_api.
rtc_source_set("rtc_task_queue_api") {
+ # The visibility list is commented out so that we won't break external
+ # implementations, but left here to manually test as well as for sake of what
+ # targets we expect to depend on rtc_task_queue_api.
+ # visibility = [
+ # ":rtc_task_queue",
+ # ":rtc_task_queue_impl",
+ # ":sequenced_task_checker",
+ # ]
sources = [
"task_queue.h",
]
deps = [
- ":rtc_base_approved",
+ ":macromagic",
+ ":ptr_util",
]
}
-rtc_source_set("rtc_task_queue_impl") {
- visibility = [ "*" ]
- deps = [
- ":checks",
- ":rtc_base_approved",
- ":rtc_task_queue_api",
- ]
- if (rtc_build_libevent) {
- deps += [ "//base/third_party/libevent" ]
- }
- if (rtc_enable_libevent) {
+if (rtc_enable_libevent) {
+ rtc_source_set("rtc_task_queue_libevent") {
+ visibility = [ ":rtc_task_queue_impl" ]
sources = [
"task_queue_libevent.cc",
"task_queue_posix.cc",
"task_queue_posix.h",
]
+ deps = [
+ ":checks",
+ ":criticalsection",
+ ":logging",
+ ":platform_thread",
+ ":ptr_util",
+ ":refcount",
+ ":rtc_task_queue_api",
+ ":safe_conversions",
+ ":timeutils",
+ ]
+ if (rtc_build_libevent) {
+ deps += [ "//base/third_party/libevent" ]
+ }
+ }
+}
+
+if (is_mac || is_ios) {
+ rtc_source_set("rtc_task_queue_gcd") {
+ visibility = [ ":rtc_task_queue_impl" ]
+ sources = [
+ "task_queue_gcd.cc",
+ "task_queue_posix.cc",
+ "task_queue_posix.h",
+ ]
+ deps = [
+ ":checks",
+ ":logging",
+ ":ptr_util",
+ ":refcount",
+ ":rtc_task_queue_api",
+ ]
+ }
+}
+
+if (is_win) {
+ rtc_source_set("rtc_task_queue_win") {
+ visibility = [ ":rtc_task_queue_impl" ]
+ sources = [
+ "task_queue_win.cc",
+ ]
+ deps = [
+ ":checks",
+ ":criticalsection",
+ ":logging",
+ ":macromagic",
+ ":platform_thread",
+ ":ptr_util",
+ ":refcount",
+ ":rtc_event",
+ ":rtc_task_queue_api",
+ ":safe_conversions",
+ ":timeutils",
+ ]
+ }
+}
+
+rtc_source_set("rtc_task_queue_impl") {
+ visibility = [ "*" ]
+ if (rtc_enable_libevent) {
+ deps = [
+ ":rtc_task_queue_libevent",
+ ]
} else {
if (is_mac || is_ios) {
- sources = [
- "task_queue_gcd.cc",
- "task_queue_posix.cc",
- "task_queue_posix.h",
+ deps = [
+ ":rtc_task_queue_gcd",
]
}
if (is_win) {
- sources = [
- "task_queue_win.cc",
+ deps = [
+ ":rtc_task_queue_win",
]
}
}
}
-rtc_static_library("sequenced_task_checker") {
+rtc_source_set("sequenced_task_checker") {
sources = [
"sequenced_task_checker.h",
"sequenced_task_checker_impl.cc",
@@ -469,8 +671,10 @@
]
deps = [
":checks",
- ":rtc_base_approved",
+ ":criticalsection",
+ ":macromagic",
":rtc_task_queue",
+ ":thread_checker",
]
}
@@ -480,7 +684,8 @@
"weak_ptr.h",
]
deps = [
- ":rtc_base_approved",
+ ":ptr_util",
+ ":refcount",
":sequenced_task_checker",
]
}
@@ -869,7 +1074,6 @@
"nattypes.h",
"proxyserver.cc",
"proxyserver.h",
- "refcount.h",
"sigslottester.h",
"sigslottester.h.pump",
"testbase64.h",
@@ -1070,6 +1274,7 @@
":rtc_base_approved_generic",
":rtc_base_tests_main",
":rtc_base_tests_utils",
+ ":rtc_event",
":rtc_task_queue",
":weak_ptr",
"../test:test_support",