diff options
| author |  Michael Lumish <mlumish@google.com> | 2015-07-20 09:59:00 -0700 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2015-07-20 09:59:00 -0700 |
| commit | 03f0bd678625ca8c27d9d8f8f6982486896c13b9 (patch) | |
| tree | 8f55dc0873c1ecc44ec7fac90b52b55b3350f60a /src/objective-c/GRPCClient | |
| parent | baf2ab0c30c680aadcdf90e8f202eb321ea692d7 (diff) | |
| parent | 570e9417b62fd85e1aa50e873c93ebe0ff2a0d5a (diff) | |
Merge pull request #2501 from jcanizales/gpr-inf-future
Fix C library gpr_inf_future breakage
Diffstat (limited to 'src/objective-c/GRPCClient')
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCCompletionQueue.m | 3 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCWrappedCall.m | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m index 40aade4f9a..12535c9616 100644 --- a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m +++ b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m @@ -65,7 +65,8 @@ dispatch_async(gDefaultConcurrentQueue, ^{ while (YES) { // 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; switch (event.type) { case GRPC_OP_COMPLETE: diff --git a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m index 45f10f5d63..1db63df77f 100644 --- a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m +++ b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m @@ -246,8 +246,11 @@ if (!_queue) { return nil; } - _call = grpc_channel_create_call(channel.unmanagedChannel, _queue.unmanagedQueue, - path.UTF8String, host.UTF8String, gpr_inf_future); + _call = grpc_channel_create_call(channel.unmanagedChannel, + _queue.unmanagedQueue, + path.UTF8String, + host.UTF8String, + gpr_inf_future(GPR_CLOCK_REALTIME)); if (_call == NULL) { return nil; } |