averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build: Remove concurrency tracing option

Browse Source 
Stripping out the logic behind enabling concurrency tracing
independently of the rest of the standard library tracing. It's not
clear that there is a use-case where we want one without the other.
This commit is contained in:
Evan Wilde
2025-12-03 14:03:40 -08:00
parent c1efd8f9d2
commit 1c3541e926
6 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stdlib/cmake/modules/AddSwiftStdlib.cmake
View File

@@ -491,10 +491,6 @@ function(_add_target_variant_c_compile_flags)
list(APPEND result "-DSWIFT_STDLIB_TRACING")
endif()
if(SWIFT_STDLIB_CONCURRENCY_TRACING)
list(APPEND result "-DSWIFT_STDLIB_CONCURRENCY_TRACING")
endif()
if(SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES)
list(APPEND result "-DSWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES")
endif()

9
stdlib/cmake/modules/StdlibOptions.cmake
View File

@@ -254,22 +254,15 @@ set(SWIFT_STDLIB_ENABLE_LTO OFF CACHE STRING "Build Swift stdlib with LTO. One
if("${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_DARWIN_PLATFORMS)
set(SWIFT_STDLIB_TRACING_default TRUE)
set(SWIFT_STDLIB_CONCURRENCY_TRACING_default TRUE)
else()
set(SWIFT_STDLIB_TRACING_default FALSE)
set(SWIFT_STDLIB_CONCURRENCY_TRACING_default FALSE)
endif()
option(SWIFT_STDLIB_TRACING
"Enable tracing in the runtime; assumes the presence of os_log(3)
"Enable tracing in swiftCore and swift_Concurrency; assumes the presence of os_log(3)
and the os_signpost(3) API."
"${SWIFT_STDLIB_TRACING_default}")
option(SWIFT_STDLIB_CONCURRENCY_TRACING
"Enable concurrency tracing in the runtime; assumes the presence of os_log(3)
and the os_signpost(3) API."
"${SWIFT_STDLIB_CONCURRENCY_TRACING_default}")
option(SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES
"Use relative protocol witness tables"
FALSE)

2
stdlib/public/Concurrency/CMakeLists.txt
View File

@@ -285,7 +285,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP OFF)
set(SWIFT_CONCURRENCY_USES_DISPATCH FALSE)
set(SWIFT_STDLIB_SINGLE_THREADED_CONCURRENCY TRUE)
set(SWIFT_STDLIB_CONCURRENCY_TRACING FALSE)
set(SWIFT_STDLIB_TRACING FALSE)
set(SWIFT_STDLIB_HAS_ENVIRON FALSE)
set(SWIFT_STDLIB_HAS_ASL FALSE)
list(APPEND LLVM_OPTIONAL_SOURCES ExecutorImpl.cpp)

7
utils/build-script-impl
View File

@@ -1992,13 +1992,6 @@ for host in "${ALL_HOSTS[@]}"; do
)
fi
if [[ "${SWIFT_STDLIB_CONCURRENCY_TRACING}" ]] ; then
cmake_options=(
"${cmake_options[@]}"
-DSWIFT_STDLIB_CONCURRENCY_TRACING:BOOL=$(true_false "${SWIFT_STDLIB_CONCURRENCY_TRACING}")
)
fi
if [[ "${SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES}" ]] ; then
cmake_options=(
"${cmake_options[@]}"

2
utils/swift_build_support/swift_build_support/products/minimalstdlib.py
View File

@@ -121,8 +121,6 @@ class MinimalStdlib(cmake_product.CMakeProduct):
'SWIFT_RUNTIME_STATIC_IMAGE_INSPECTION:BOOL', 'FALSE')
self.cmake_options.define('SWIFT_STDLIB_BUILD_PRIVATE:BOOL', 'TRUE')
self.cmake_options.define('SWIFT_STDLIB_TRACING:BOOL', 'FALSE')
self.cmake_options.define(
'SWIFT_STDLIB_CONCURRENCY_TRACING:BOOL', 'FALSE')
self.cmake_options.define(
'SWIFT_STDLIB_DISABLE_INSTANTIATION_CACHES:BOOL', 'TRUE')
self.cmake_options.define(

1
utils/swift_build_support/swift_build_support/products/wasmstdlib.py
View File

@@ -152,7 +152,6 @@ class WasmStdlib(cmake_product.CMakeProduct):
self.cmake_options.define('SWIFT_STDLIB_STABLE_ABI:BOOL', 'TRUE')
self.cmake_options.define('SWIFT_STDLIB_TRACING:BOOL', 'FALSE')
self.cmake_options.define('SWIFT_STDLIB_HAS_ASLR:BOOL', 'FALSE')
self.cmake_options.define('SWIFT_STDLIB_CONCURRENCY_TRACING:BOOL', 'FALSE')
self.cmake_options.define(
'SWIFT_STDLIB_INSTALL_PARENT_MODULE_FOR_SHIMS:BOOL', 'FALSE')
self.cmake_options.define('SWIFT_RUNTIME_CRASH_REPORTER_CLIENT:BOOL', 'FALSE')