Merge pull request #169 from MrMage/sem-wait-indefinitely

Replace calls to `DispatchSemaphore.wait(timeout: DispatchTime.distantFuture)` with just `.wait()`

Examples/Echo/EchoProvider.swift

@@ -34,7 +34,7 @@ class EchoProvider: Echo_EchoProvider {
       response.text = "Swift echo expand (\(i)): \(part)"
       let sem = DispatchSemaphore(value: 0)
       try session.send(response) { _ in sem.signal() }
-      _ = sem.wait(timeout: DispatchTime.distantFuture)
+      _ = sem.wait()
       i += 1
     }
   }
@@ -68,7 +68,7 @@ class EchoProvider: Echo_EchoProvider {
         count += 1
         let sem = DispatchSemaphore(value: 0)
         try session.send(response) { _ in sem.signal() }
-        _ = sem.wait(timeout: DispatchTime.distantFuture)
+        _ = sem.wait()
       } catch ServerError.endOfStream {
         break
       } catch (let error) {

Examples/Echo/PackageManager/Sources/main.swift

@@ -78,7 +78,7 @@ Group {
     }
     // This blocks to keep the main thread from finishing while the server runs,
     // but the server never exits. Kill the process to stop it.
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
     // This suppresses a "variable echoServer was written to, but never read" warning.
     _ = echoServer
     // And this ensures that echoServer doesn't get deallocated right after it is created.
@@ -118,7 +118,7 @@ Group {
         running = false
       }
     }
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
     if let statusCode = callResult?.statusCode {
       print("expand completed with code \(statusCode)")
     }
@@ -149,7 +149,7 @@ Group {
     collectCall.waitForSendOperationsToFinish()
     let responseMessage = try collectCall.closeAndReceive()
     print("collect received: \(responseMessage.text)")
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
     if let statusCode = callResult?.statusCode {
       print("collect completed with code \(statusCode)")
     }
@@ -193,7 +193,7 @@ Group {
       }
     }
 
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
 
     if let statusCode = callResult?.statusCode {
       print("update completed with code \(statusCode)")

Examples/Google/NaturalLanguage/Sources/main.swift

@@ -64,7 +64,7 @@ if let provider = DefaultTokenProvider(scopes: scopes) {
     }
     sem.signal()
   }
-  _ = sem.wait(timeout: DispatchTime.distantFuture)
+  _ = sem.wait()
 } else {
   print("Unable to create default token provider.")
 }

Examples/Simple/PackageManager/main.swift

@@ -57,7 +57,7 @@ func client() throws {
       }
       sem.signal()
     }
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
   }
   print("Done")
 }
@@ -119,7 +119,7 @@ func server() throws {
     print("Server Stopped")
   }
 
-  _ = sem.wait(timeout: DispatchTime.distantFuture)
+  _ = sem.wait()
 }
 
 Group {

Sources/gRPC/GenCodeSupport/ClientCallBidirectionalStreaming.swift

@@ -59,7 +59,7 @@ open class ClientCallBidirectionalStreamingBase<InputType: Message, OutputType:
         returnError = error
         sem.signal()
       }
-      _ = sem.wait(timeout: DispatchTime.distantFuture)
+      _ = sem.wait()
     }
     if let returnError = returnError {
       throw returnError
@@ -81,7 +81,7 @@ open class ClientCallBidirectionalStreamingBase<InputType: Message, OutputType:
     try closeSend {
       sem.signal()
     }
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
   }
   
   public func waitForSendOperationsToFinish() {

Sources/gRPC/GenCodeSupport/ClientCallClientStreaming.swift

@@ -62,7 +62,7 @@ open class ClientCallClientStreamingBase<InputType: Message, OutputType: Message
         returnError = error
         sem.signal()
       }
-      _ = sem.wait(timeout: DispatchTime.distantFuture)
+      _ = sem.wait()
     } catch (let error) {
       throw error
     }

Sources/gRPC/GenCodeSupport/ClientCallServerStreaming.swift

@@ -60,7 +60,7 @@ open class ClientCallServerStreamingBase<InputType: Message, OutputType: Message
         returnError = error
         sem.signal()
       }
-      _ = sem.wait(timeout: DispatchTime.distantFuture)
+      _ = sem.wait()
     }
     if let returnError = returnError {
       throw returnError

Sources/gRPC/GenCodeSupport/ClientCallUnary.swift

@@ -32,7 +32,7 @@ open class ClientCallUnaryBase<InputType: Message, OutputType: Message>: ClientC
       returnCallResult = callResult
       sem.signal()
     }
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
     if let returnResponse = returnResponse {
       return returnResponse
     } else {

Sources/gRPC/GenCodeSupport/ServerSessionBidirectionalStreaming.swift

@@ -42,7 +42,7 @@ open class ServerSessionBidirectionalStreamingBase<InputType: Message, OutputTyp
       }
       sem.signal()
     }
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
     if let requestMessage = requestMessage {
       return requestMessage
     } else {
@@ -59,7 +59,7 @@ open class ServerSessionBidirectionalStreamingBase<InputType: Message, OutputTyp
     try handler.sendStatus(statusCode: statusCode,
                            statusMessage: statusMessage,
                            trailingMetadata: trailingMetadata) { _ in sem.signal() }
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
   }
 
   public func run(queue: DispatchQueue) throws {

Sources/gRPC/GenCodeSupport/ServerSessionClientStreaming.swift

@@ -38,7 +38,7 @@ open class ServerSessionClientStreamingBase<InputType: Message, OutputType: Mess
       }
       sem.signal()
     }
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
     if requestMessage == nil {
       throw ServerError.endOfStream
     }

Tests/gRPCTests/GRPCTests.swift

@@ -118,7 +118,7 @@ func runTest(useSSL: Bool) {
   server.stop()
 
   // wait until the server has shut down
-  _ = serverRunningSemaphore.wait(timeout: DispatchTime.distantFuture)
+  _ = serverRunningSemaphore.wait()
 }
 
 func verify_metadata(_ metadata: Metadata, expected: [String: String], file: StaticString = #file, line: UInt = #line) {
@@ -175,7 +175,7 @@ func runClient(useSSL: Bool) throws {
       sem.signal()
     }
     // wait for the call to complete
-    _ = sem.wait(timeout: DispatchTime.distantFuture)
+    _ = sem.wait()
   }
 }
 
@@ -209,5 +209,5 @@ func runServer(server: Server) throws {
     sem.signal()
   }
   // wait for the server to exit
-  _ = sem.wait(timeout: DispatchTime.distantFuture)
+  _ = sem.wait()
 }