port PrivatePthreadExtras to all targets

Author: compnerd

stdlib/private/CMakeLists.txt

@@ -3,13 +3,13 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
 endif()
 
 if(SWIFT_BUILD_SDK_OVERLAY)
-  # SwiftPrivatePthreadExtras makes use of Darwin/Glibc, which is part of the
-  # SDK overlay. It can't be built separately from the SDK overlay.
   add_subdirectory(StdlibUnittest)
   add_subdirectory(StdlibUnicodeUnittest)
   add_subdirectory(StdlibCollectionUnittest)
   add_subdirectory(SwiftPrivateLibcExtras)
-  add_subdirectory(SwiftPrivatePthreadExtras)
+  # SwiftPrivateThreadExtras makes use of Darwin/glibc/MSVCRT, which is part of the
+  # SDK overlay. It can't be built separately from the SDK overlay.
+  add_subdirectory(SwiftPrivateThreadExtras)
 
   if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     add_subdirectory(StdlibUnittestFoundationExtras)

stdlib/private/StdlibUnittest/CMakeLists.txt

@@ -33,7 +33,7 @@ add_swift_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STD
   TypeIndexed.swift
   GetOSVersion.mm
 
-  SWIFT_MODULE_DEPENDS SwiftPrivate SwiftPrivatePthreadExtras SwiftPrivateLibcExtras
+  SWIFT_MODULE_DEPENDS SwiftPrivate SwiftPrivateThreadExtras SwiftPrivateLibcExtras
   SWIFT_MODULE_DEPENDS_IOS Darwin Foundation
   SWIFT_MODULE_DEPENDS_OSX Darwin Foundation
   SWIFT_MODULE_DEPENDS_TVOS Darwin Foundation

stdlib/private/StdlibUnittest/RaceTest.swift

@@ -38,7 +38,7 @@
 
 import SwiftPrivate
 import SwiftPrivateLibcExtras
-import SwiftPrivatePthreadExtras
+import SwiftPrivateThreadExtras
 #if os(macOS) || os(iOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
@@ -394,7 +394,7 @@ class _RaceTestSharedState<RT : RaceTestWithPerTrialData> {
   var racingThreadCount: Int
   var stopNow = _stdlib_AtomicInt(0)
 
-  var trialBarrier: _stdlib_Barrier
+  var trialBarrier: _stdlib_thread_barrier
   var trialSpinBarrier: _stdlib_AtomicInt = _stdlib_AtomicInt()
 
   var raceData: [RT.RaceData] = []
@@ -404,7 +404,10 @@ class _RaceTestSharedState<RT : RaceTestWithPerTrialData> {
 
   init(racingThreadCount: Int) {
     self.racingThreadCount = racingThreadCount
-    self.trialBarrier = _stdlib_Barrier(threadCount: racingThreadCount + 1)
+    guard let barrier = _stdlib_thread_barrier(threadCount: racingThreadCount + 1) else {
+      fatalError("")
+    }
+    self.trialBarrier = barrier
 
     self.workerStates.reserveCapacity(racingThreadCount)
     for _ in 0..<racingThreadCount {
@@ -600,43 +603,40 @@ public func runRaceTest<RT : RaceTestWithPerTrialData>(
     _ = timeoutReached.fetchAndAdd(1)
   }
 
-  var testTids = [pthread_t]()
-  var alarmTid: pthread_t
+  var testTids = [_stdlib_thread_t]()
+  var alarmTid: _stdlib_thread_t
 
   // Create the master thread.
   do {
-    let (ret, tid) = _stdlib_pthread_create_block(
-      nil, masterThreadBody, ())
+    let (ret, tid) = _stdlib_thread_create_block(masterThreadBody, ())
     expectEqual(0, ret)
     testTids.append(tid!)
   }
 
   // Create racing threads.
   for i in 0..<racingThreadCount {
-    let (ret, tid) = _stdlib_pthread_create_block(
-      nil, racingThreadBody, i)
+    let (ret, tid) = _stdlib_thread_create_block(racingThreadBody, i)
     expectEqual(0, ret)
     testTids.append(tid!)
   }
 
   // Create the alarm thread that enforces the timeout.
   do {
-    let (ret, tid) = _stdlib_pthread_create_block(
-      nil, alarmThreadBody, ())
+    let (ret, tid) = _stdlib_thread_create_block(alarmThreadBody, ())
     expectEqual(0, ret)
     alarmTid = tid!
   }
 
   // Join all testing threads.
   for tid in testTids {
-    let (ret, _) = _stdlib_pthread_join(tid, Void.self)
+    let (ret, _) = _stdlib_thread_join(tid, Void.self)
     expectEqual(0, ret)
   }
 
   // Tell the alarm thread to stop if it hasn't already, then join it.
   do {
     alarmTimer.wake()
-    let (ret, _) = _stdlib_pthread_join(alarmTid, Void.self)
+    let (ret, _) = _stdlib_thread_join(alarmTid, Void.self)
     expectEqual(0, ret)
   }
 

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

@@ -15,13 +15,15 @@ from gyb_stdlib_unittest_support import TRACE, stackTrace, trace
 }%
 
 import SwiftPrivate
-import SwiftPrivatePthreadExtras
+import SwiftPrivateThreadExtras
 import SwiftPrivateLibcExtras
 
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc
+#elseif os(Windows)
+import MSVCRT
 #endif
 
 #if _runtime(_ObjC)