Revert "[Basic] Introduce a Condition wrapper."

At least one of the tests is timing out.

This reverts commit 42309df.

Author: jrose-apple

Sources/Basic/Condition.swift

@@ -12,7 +12,8 @@ import Foundation
 
 // FIXME: Temporary compatibility shims.
 #if !os(macOS)
-private typealias NSLock = Foundation.Lock
+public typealias NSLock = Foundation.Lock
+public typealias NSCondition = Foundation.Condition
 #endif
 
 /// A simple lock wrapper.
@@ -30,3 +31,12 @@ public struct Lock {
         return try body()
     }
 }
+
+public extension NSCondition {
+    /// A helper method to execute the given body while condition is locked.
+    public func whileLocked<T>(_ body: @noescape () throws -> T) rethrows -> T {
+        lock()
+        defer { unlock() }
+        return try body()
+    }
+}

Sources/Basic/Lock.swift

@@ -8,19 +8,22 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
+import Foundation
+
 /// This class can be used as a shared queue between multiple threads providing
 /// thread safe APIs.
 public final class SynchronizedQueue<Element> {
+
     /// Storage for queued elements.
     private var storage: [Element]
 
     /// Condition variable to block the thread trying dequeue and queue is empty.
-    private var notEmptyCondition: Condition
+    private var notEmptyCondition: NSCondition
 
     /// Create a default instance of queue.
     public init() {
         storage = []
-        notEmptyCondition = Condition()
+        notEmptyCondition = NSCondition()
     }
 
     /// Safely enqueue an element to end of the queue and signals a thread blocked on dequeue.

Sources/Basic/SynchronizedQueue.swift

@@ -20,15 +20,15 @@ final public class Thread {
     private var thread: ThreadImpl!
 
     /// Condition variable to support blocking other threads using join when this thread has not finished executing.
-    private var finishedCondition: Condition
+    private var finishedCondition: NSCondition
 
     /// A boolean variable to track if this thread has finished executing its task.
     private var finished: Bool
 
     /// Creates an instance of thread class with closure to be executed when start() is called.
     public init(task: @escaping () -> Void) {
         finished = false
-        finishedCondition = Condition()
+        finishedCondition = NSCondition()
 
         // Wrap the task with condition notifying any other threads blocked due to this thread.
         // Capture self weakly to avoid reference cycle. In case Thread is deinited before the task

Sources/Basic/Thread.swift

@@ -8,11 +8,13 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
+import Foundation
 import XCTest
 
 import Basic
 
 class SyncronizedQueueTests: XCTestCase {
+
     func testSingleProducerConsumer() {
         let queue = SynchronizedQueue<Int?>()
         let queueElements = Set(0..<10)
@@ -90,7 +92,7 @@ class SyncronizedQueueTests: XCTestCase {
 
         var consumed = Set<Int>()
 
-        let canProduceCondition = Condition()
+        let canProduceCondition = NSCondition()
         // Initially we should be able to produce.
         var canProduce = true
 

Tests/BasicTests/ConditionTests.swift

@@ -51,19 +51,19 @@ class ThreadTests: XCTestCase {
     }
 
     func testNotDeinitBeforeExecutingTask() {
-        let finishedCondition = Condition()
+        let finishedCondition = NSCondition()
         var finished = false
 
         Thread {
             finished = true
             finishedCondition.signal()
         }.start()
 
-        finishedCondition.whileLocked{
-            while !finished {
-                finishedCondition.wait()
-            }
+        finishedCondition.lock()
+        while !finished {
+            finishedCondition.wait()
         }
+        finishedCondition.unlock()
 
         XCTAssertTrue(finished)
     }

Tests/BasicTests/SynchronizedQueueTests.swift

@@ -15,7 +15,6 @@ public func allTests() -> [XCTestCaseEntry] {
     return [
         testCase(ByteStringTests.allTests),
         testCase(CollectionAlgorithmsTests.allTests),
-        testCase(ConditionTests.allTests),
         testCase(FileAccessTests.allTests),
         testCase(FileSystemTests.allTests),
         testCase(GraphAlgorithmsTests.allTests),