Move locking and TLS back in to a singlular library and adjust a few signatures

Author: phausler

stdlib/public/Observation/CMakeLists.txt

@@ -10,5 +10,4 @@
 #
 #===----------------------------------------------------------------------===#
 
-add_subdirectory(Sources/_ObservationRuntime)
 add_subdirectory(Sources/Observation)

stdlib/public/Observation/Sources/Observation/CMakeLists.txt

@@ -14,6 +14,8 @@ set(SWIFT_OBSERVATION_SWIFT_FLAGS)
 
 add_swift_target_library(swiftObservation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   ImmediateTransactionModel.swift
+  Locking.cpp
+  Locking.swift
   MemberKeyPaths.swift
   Observable.swift
   ObservationRegistrar.swift
@@ -23,9 +25,10 @@ add_swift_target_library(swiftObservation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS
   ObservationTransactionModel.swift
   ObservedChanges.swift
   Observer.swift
+  ThreadLocal.cpp
+  ThreadLocal.swift
 
   SWIFT_COMPILE_FLAGS
     ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
     ${SWIFT_OBSERVATION_SWIFT_FLAGS}
-  SWIFT_MODULE_DEPENDS _ObservationRuntime
   INSTALL_IN_COMPONENT stdlib)

stdlib/public/Observation/Sources/Observation/ImmediateTransactionModel.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @available(SwiftStdlib 5.9, *)
 struct ImmediateObservationTransactionModel: ObservationTransactionModel {

stdlib/public/Observation/Sources/_ObservationRuntime/Locking.cpp renamed to stdlib/public/Observation/Sources/Observation/Locking.cpp

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @_silgen_name("_swift_observation_lock_size")
 func _lockSize() -> Int
@@ -24,7 +23,7 @@ func _lockLock(_: UnsafeRawPointer)
 func _lockUnlock(_: UnsafeRawPointer)
 
 @available(SwiftStdlib 5.9, *)
-public struct ManagedCriticalState<State> {
+struct ManagedCriticalState<State> {
   final private class LockedBuffer: ManagedBuffer<State, UInt8> { }
 
   private let buffer: ManagedBuffer<State, UInt8>
@@ -33,16 +32,14 @@ public struct ManagedCriticalState<State> {
     self.buffer = buffer
   }
 
-  public init(_ initial: State) {
-    self.init(LockedBuffer.create(minimumCapacity: _swift_observation_lock_size()) { buffer in
+  init(_ initial: State) {
+    self.init(LockedBuffer.create(minimumCapacity: _lockSize()) { buffer in
       buffer.withUnsafeMutablePointerToElements { _lockInit(UnsafeRawPointer($0)) }
       return initial
     })
   }
 
-  @_transparent
-  @inlinable
-  public func withCriticalRegion<R>(
+  func withCriticalRegion<R>(
     _ critical: (inout State) throws -> R
   ) rethrows -> R {
     try buffer.withUnsafeMutablePointers { header, lock in
@@ -54,7 +51,7 @@ public struct ManagedCriticalState<State> {
 }
 
 @available(SwiftStdlib 5.9, *)
-public protocol Deinitializable {
+protocol Deinitializable {
   func deinitialize()
 }
 
@@ -65,32 +62,31 @@ extension ManagedCriticalState where State: Deinitializable {
     deinit {
       withUnsafeMutablePointers { header, lock in
         header.pointee.deinitialize()
-        Lock.deinitialize(lock)
       }
     }
   }
 
-  public init(managing initial: State) {
-    self.init(DeinitializingLockedBuffer.create(minimumCapacity: _swift_observation_lock_size()) { buffer in
+  init(managing initial: State) {
+    self.init(DeinitializingLockedBuffer.create(minimumCapacity: _lockSize()) { buffer in
       buffer.withUnsafeMutablePointerToElements { _lockInit(UnsafeRawPointer($0)) }
       return initial
     })
   }
 }
 
 @available(SwiftStdlib 5.9, *)
-public extension ManagedCriticalState: @unchecked Sendable where State: Sendable { }
+extension ManagedCriticalState: @unchecked Sendable where State: Sendable { }
 
 @available(SwiftStdlib 5.9, *)
 extension ManagedCriticalState: Hashable {
-  public static func == (
+  static func == (
     lhs: ManagedCriticalState<State>, 
     rhs: ManagedCriticalState<State>
   ) -> Bool {
     lhs.buffer === rhs.buffer
   }
 
-  public func hash(into hasher: inout Hasher) {
+  func hash(into hasher: inout Hasher) {
     hasher.combine(ObjectIdentifier(buffer))
   }
 }

stdlib/public/Observation/Sources/_ObservationRuntime/Locking.swift renamed to stdlib/public/Observation/Sources/Observation/Locking.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @available(SwiftStdlib 5.9, *)
 @frozen

stdlib/public/Observation/Sources/Observation/MemberKeyPaths.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @available(SwiftStdlib 5.9, *)
 public protocol Observable: Identifiable {
@@ -58,8 +57,3 @@ extension Observable {
     return [keyPath]
   }
 }
-
-
-
-
-

stdlib/public/Observation/Sources/Observation/Observable.swift

@@ -9,8 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
-@_implementationOnly import _ObservationRuntime
 
 @available(SwiftStdlib 5.9, *)
 public struct ObservationRegistar<Subject: Observable>: @unchecked Sendable {

stdlib/public/Observation/Sources/Observation/ObservationRegistrar.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @available(SwiftStdlib 5.9, *)
 public struct ObservationToken: Hashable, Sendable {

stdlib/public/Observation/Sources/Observation/ObservationToken.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @available(SwiftStdlib 5.9, *)
 protocol ObservationTrackingEntry {

stdlib/public/Observation/Sources/Observation/ObservationTracking.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @available(SwiftStdlib 5.9, *)
 public struct ObservationTransaction<Subject: Observable>: Hashable, Identifiable {

stdlib/public/Observation/Sources/Observation/ObservationTransaction.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @available(SwiftStdlib 5.9, *)
 public protocol ObservationTransactionModel {

stdlib/public/Observation/Sources/Observation/ObservationTransactionModel.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 import _Concurrency
 
 @available(SwiftStdlib 5.9, *)

stdlib/public/Observation/Sources/Observation/ObservedChanges.swift

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @available(SwiftStdlib 5.9, *)
 public protocol Observer<Subject> {

stdlib/public/Observation/Sources/Observation/Observer.swift

@@ -87,19 +87,21 @@ void *_swift_observation_tls_get(uint64_t key) {
 #if SWIFT_TLS_PTHREAD_DIRECT
   return _pthread_getspecific_direct((unsigned long)key);
 #elif SWIFT_TLS_PTHREAD
-  return pthread_get_specific((pthread_key_t)key);
+  return pthread_getspecific((pthread_key_t)key);
 #elif SWIFT_TLS_FLS
+  assert(key & ~0xffffffff == 0);
   return FlsGetValue((DWORD)key);
 #endif
 }
 
 extern "C" SWIFT_CC(swift)
-_swift_observation_tls_set(uint64_t key, void *value) {
+void _swift_observation_tls_set(uint64_t key, void *value) {
 #if SWIFT_TLS_PTHREAD_DIRECT
-  return _pthread_setspecific_direct((unsigned long)key, value);
+  _pthread_setspecific_direct((unsigned long)key, value);
 #elif SWIFT_TLS_PTHREAD
-  return pthread_set_specific((pthread_key_t)key, value);
+  pthread_setspecific((pthread_key_t)key, value);
 #elif SWIFT_TLS_FLS
-  return FlsSetValue((DWORD)key, value);
+  assert(key & ~0xffffffff == 0);
+  FlsSetValue((DWORD)key, value);
 #endif
 }

stdlib/public/Observation/Sources/_ObservationRuntime/ThreadLocal.cpp renamed to stdlib/public/Observation/Sources/Observation/ThreadLocal.cpp

@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Swift
 
 @_silgen_name("_swift_observation_tracking_key")
 func _trackingKey() -> UInt64
@@ -24,19 +23,20 @@ func _tlsGet(_ key: UInt64) -> UnsafeMutableRawPointer?
 func _tlsSet(_ key: UInt64, _ value: UnsafeMutableRawPointer?)
 
 @available(SwiftStdlib 5.9, *)
-public struct ThreadLocal {
-  public struct Key {
+struct ThreadLocal {
+  struct Key {
     var raw: UInt64
 
     init(raw: UInt64) {
       self.raw = raw
     }
+
+    static let trackingKey = Key(raw: _trackingKey())
+    static let transactionKey = Key(raw: _transactionKey())
   }
 
-  public static let trackingKey = ThreadLocal.Key(raw: _trackingKey())
-  public static let transactionKey = ThreadLocal.Key(raw: _transactionKey())
 
-  public static subscript(_ key: Key) -> UnsafeMutableRawPointer? {
+  static subscript(_ key: Key) -> UnsafeMutableRawPointer? {
     get {
       return _tlsGet(key.raw)
     }