New channel pool design

1 files changed, 11 insertions, 20 deletions

diff --git a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m
index ae7f07f119..5c402250cc 100644
--- a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m
+++ b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m
@@ -238,7 +238,7 @@
 
 @implementation GRPCWrappedCall {
   GRPCCompletionQueue *_queue;
-  GRPCChannel *_channel;
+  GRPCPooledChannel *_channel;
   grpc_call *_call;
 }
 
@@ -257,21 +257,15 @@
     // consuming too many threads and having contention of multiple calls in a single completion
     // queue. Currently we use a singleton queue.
     _queue = [GRPCCompletionQueue completionQueue];
-    BOOL disconnected = NO;
-    do {
-      _channel = [[GRPCChannelPool sharedInstance] channelWithHost:host callOptions:callOptions];
-      if (_channel == nil) {
-        NSAssert(_channel != nil, @"Failed to get a channel for the host.");
-        NSLog(@"Failed to get a channel for the host.");
-        return nil;
-      }
-      _call = [_channel unmanagedCallWithPath:path
-                              completionQueue:_queue
-                                  callOptions:callOptions
-                                 disconnected:&disconnected];
-      // Try create another channel if the current channel is disconnected (due to idleness or
-      // connectivity monitor disconnection).
-    } while (_call == NULL && disconnected);
+    _channel = [[GRPCChannelPool sharedInstance] channelWithHost:host callOptions:callOptions];
+    if (_channel == nil) {
+      NSAssert(_channel != nil, @"Failed to get a channel for the host.");
+      NSLog(@"Failed to get a channel for the host.");
+      return nil;
+    }
+    _call = [_channel unmanagedCallWithPath:path
+                            completionQueue:_queue
+                                callOptions:callOptions];
     if (_call == nil) {
       NSAssert(_channel != nil, @"Failed to get a channel for the host.");
       NSLog(@"Failed to create a call.");
@@ -326,10 +320,7 @@
 }
 
 - (void)dealloc {
-  if (_call) {
-    grpc_call_unref(_call);
-  }
-  [_channel unref];
+  [_channel unrefUnmanagedCall:_call];
   _channel = nil;
 }