浏览代码

Rename "waitForCompletion" to "wait" (jconverse@)

Tim Burks 9 年之前
父节点
当前提交
83132c48e6
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 3 3
      Packages/gRPC/Sources/CompletionQueue.swift
  2. 2 2
      Packages/gRPC/Sources/Server.swift

+ 3 - 3
Packages/gRPC/Sources/CompletionQueue.swift

@@ -55,7 +55,7 @@ public enum CompletionType {
   }
 }
 
-public struct CompletionEvent {
+public struct CompletionQueueEvent {
   public var type: CompletionType
   public var success: Int32
   public var tag: Int64
@@ -89,9 +89,9 @@ class CompletionQueue {
   ///
   /// - Parameter timeout: a timeout value in seconds
   /// - Returns: a grpc_completion_type code indicating the result of waiting
-  public func waitForCompletion(timeout: Double) -> CompletionEvent {
+  public func wait(timeout: Double) -> CompletionQueueEvent {
     let event = cgrpc_completion_queue_get_next_event(underlyingCompletionQueue, timeout);
-    return CompletionEvent(event)
+    return CompletionQueueEvent(event)
   }
 
   /// Run a completion queue

+ 2 - 2
Packages/gRPC/Sources/Server.swift

@@ -84,7 +84,7 @@ public class Server {
           break
         }
         // blocks
-        let event = self.completionQueue.waitForCompletion(timeout:600)
+        let event = self.completionQueue.wait(timeout:600)
         if (event.type == .complete) {
           if event.tag == 101 {
             // run the handler and remove it when it finishes
@@ -128,7 +128,7 @@ public class Server {
     if (call_error != .ok) {
       return (call_error, .complete, nil)
     } else {
-      let event = self.completionQueue.waitForCompletion(timeout:timeout)
+      let event = self.completionQueue.wait(timeout:timeout)
       if (event.type == .complete) {
         handler.completionQueue.run() {
           self.handlers.remove(handler)