Merge pull request #2501 from jcanizales/gpr-inf-future

Fix C library gpr_inf_future breakage
pull/2529/head
Michael Lumish 9 years ago
commit 03f0bd6786
  1. 3
      src/objective-c/GRPCClient/private/GRPCCompletionQueue.m
  2. 7
      src/objective-c/GRPCClient/private/GRPCWrappedCall.m

@ -65,7 +65,8 @@
dispatch_async(gDefaultConcurrentQueue, ^{ dispatch_async(gDefaultConcurrentQueue, ^{
while (YES) { while (YES) {
// The following call blocks until an event is available. // The following call blocks until an event is available.
grpc_event event = grpc_completion_queue_next(unmanagedQueue, gpr_inf_future); grpc_event event = grpc_completion_queue_next(unmanagedQueue,
gpr_inf_future(GPR_CLOCK_REALTIME));
GRPCQueueCompletionHandler handler; GRPCQueueCompletionHandler handler;
switch (event.type) { switch (event.type) {
case GRPC_OP_COMPLETE: case GRPC_OP_COMPLETE:

@ -246,8 +246,11 @@
if (!_queue) { if (!_queue) {
return nil; return nil;
} }
_call = grpc_channel_create_call(channel.unmanagedChannel, _queue.unmanagedQueue, _call = grpc_channel_create_call(channel.unmanagedChannel,
path.UTF8String, host.UTF8String, gpr_inf_future); _queue.unmanagedQueue,
path.UTF8String,
host.UTF8String,
gpr_inf_future(GPR_CLOCK_REALTIME));
if (_call == NULL) { if (_call == NULL) {
return nil; return nil;
} }

Loading…
Cancel
Save