diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-05-08 10:40:01 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-05-08 10:40:01 -0700 |
| commit | 6b54244a11c434c888929dc0c858cec776d48e0c (patch) | |
| tree | b6cab5aac3fb5747cf01f8693e4cdeeec4ab5959 /src/objective-c/GRPCClient/private | |
| parent | cc82be534e88327d9db791d5e7fb8752dd390a3e (diff) | |
Updated Objective C code to match completion queue changes
Diffstat (limited to 'src/objective-c/GRPCClient/private')
| -rw-r--r-- | src/objective-c/GRPCClient/private/.DS_Store | bin | 0 -> 12292 bytes | |||
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCCompletionQueue.h | 2 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCCompletionQueue.m | 11 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCWrappedCall.m | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/src/objective-c/GRPCClient/private/.DS_Store b/src/objective-c/GRPCClient/private/.DS_Store Binary files differnew file mode 100644 index 0000000000..59e0061ac1 --- /dev/null +++ b/src/objective-c/GRPCClient/private/.DS_Store diff --git a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.h b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.h index 25ca9bd119..603bf01939 100644 --- a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.h +++ b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.h @@ -34,7 +34,7 @@ #import <Foundation/Foundation.h> #include <grpc/grpc.h> -typedef void(^GRPCQueueCompletionHandler)(grpc_op_error error); +typedef void(^GRPCQueueCompletionHandler)(bool success); // This class lets one more easily use grpc_completion_queue. To use it, pass // the value of the unmanagedQueue property of an instance of this class to diff --git a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m index a0a10164b1..40aade4f9a 100644 --- a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m +++ b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m @@ -65,20 +65,17 @@ 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); GRPCQueueCompletionHandler handler; - switch (event->type) { + switch (event.type) { case GRPC_OP_COMPLETE: - handler = (__bridge_transfer GRPCQueueCompletionHandler)event->tag; - handler(event->data.op_complete); - grpc_event_finish(event); + handler = (__bridge_transfer GRPCQueueCompletionHandler)event.tag; + handler(event.success); break; case GRPC_QUEUE_SHUTDOWN: - grpc_event_finish(event); grpc_completion_queue_destroy(unmanagedQueue); return; default: - grpc_event_finish(event); [NSException raise:@"Unrecognized completion type" format:@""]; } }; diff --git a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m index 41ec1a18b6..9bc46930b4 100644 --- a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m +++ b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m @@ -296,8 +296,8 @@ [op getOp:&ops_array[i++]]; } grpc_call_error error = grpc_call_start_batch(_call, ops_array, nops, - (__bridge_retained void *)(^(grpc_op_error error){ - if (error != GRPC_OP_OK) { + (__bridge_retained void *)(^(bool success){ + if (!success) { if (errorHandler) { errorHandler(); } else { |