stdlib: implement _stdlib_pthread_join in terms of Windows threading

Implement `_stdlib_pthread_join` in terms of windows threading.
Additionally, rename it to `_stdlib_thread_join`.

Author: compnerd

stdlib/private/StdlibUnittest/RaceTest.swift

@@ -626,14 +626,14 @@ public func runRaceTest<RT : RaceTestWithPerTrialData>(
 
   // 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/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift

@@ -21,6 +21,7 @@ import Darwin
 import Glibc
 #elseif os(Windows)
 import MSVCRT
+import WinSDK
 #endif
 
 /// An abstract base class to encapsulate the context necessary to invoke
@@ -110,10 +111,26 @@ public func _stdlib_thread_create_block<Argument, Result>(
 }
 
 /// Block-based wrapper for `pthread_join`.
-public func _stdlib_pthread_join<Result>(
-  _ thread: pthread_t,
+public func _stdlib_thread_join<Result>(
+  _ thread: ThreadHandle,
   _ resultType: Result.Type
 ) -> (CInt, Result?) {
+#if os(Windows)
+  // TODO(compnerd) modularize rpc.h for INFINITE (0xffffffff)
+  let result = WaitForSingleObject(thread, 0xffffffff);
+  // TODO(compnerd) modularize WinBase.h for WAIT_OBJECT_0 (0)
+  if result == 0 {
+    let threadResult: DWORD = 0
+    GetExitCodeThread(thread, &threadResult)
+    CloseHandle(thread)
+
+    return (result,
+            UnsafeMutablePointer<DWORD>(&threadResult)
+                .withMemoryRebound(to: Result.self, capacity: 1){ $0.pointee })
+  } else {
+    return (result, nil)
+  }
+#else
   var threadResultRawPtr: UnsafeMutableRawPointer?
   let result = pthread_join(thread, &threadResultRawPtr)
   if result == 0 {
@@ -126,6 +143,7 @@ public func _stdlib_pthread_join<Result>(
   } else {
     return (result, nil)
   }
+#endif
 }
 
 public class _stdlib_Barrier {

test/Interpreter/enforce_exclusive_access.swift

@@ -125,7 +125,7 @@ ExclusiveAccessTestSuite.test("PerThreadEnforcement") {
       return ()
     }, ())
 
-    _ = _stdlib_pthread_join(otherThread!, Void.self)
+    _ = _stdlib_thread_join(otherThread!, Void.self)
   }
 }
 

validation-test/stdlib/StringSlicesConcurrentAppend.swift

@@ -101,8 +101,8 @@ StringTestSuite.test("SliceConcurrentAppend") {
   expectEqual(0, createRet1)
   expectEqual(0, createRet2)
 
-  let (joinRet1, _) = _stdlib_pthread_join(tid1!, Void.self)
-  let (joinRet2, _) = _stdlib_pthread_join(tid2!, Void.self)
+  let (joinRet1, _) = _stdlib_thread_join(tid1!, Void.self)
+  let (joinRet2, _) = _stdlib_thread_join(tid2!, Void.self)
 
   expectEqual(0, joinRet1)
   expectEqual(0, joinRet2)