diff options
author | 2017-04-25 12:15:53 -0700 | |
---|---|---|
committer | 2017-04-25 12:15:53 -0700 | |
commit | 3049462b75ac557348243601896ed68ca8145522 (patch) | |
tree | 213389dd32b961b25f3833738201e857ce7ae2e3 /src/node/ext/completion_queue.cc | |
parent | 627e2a5abd2e4146c85625e98083a95846ad57e8 (diff) | |
parent | 79759fea1abd09102d38af3e13a84b69e898124b (diff) |
Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv
Diffstat (limited to 'src/node/ext/completion_queue.cc')
-rw-r--r-- | src/node/ext/completion_queue.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/node/ext/completion_queue.cc b/src/node/ext/completion_queue.cc index 0f6f7da460..9b60911d1e 100644 --- a/src/node/ext/completion_queue.cc +++ b/src/node/ext/completion_queue.cc @@ -33,10 +33,10 @@ #ifdef GRPC_UV -#include <uv.h> +#include <grpc/grpc.h> #include <node.h> +#include <uv.h> #include <v8.h> -#include <grpc/grpc.h> #include "call.h" #include "completion_queue.h" @@ -57,8 +57,8 @@ void drain_completion_queue(uv_prepare_t *handle) { grpc_event event; (void)handle; do { - event = grpc_completion_queue_next( - queue, gpr_inf_past(GPR_CLOCK_MONOTONIC), NULL); + event = grpc_completion_queue_next(queue, gpr_inf_past(GPR_CLOCK_MONOTONIC), + NULL); if (event.type == GRPC_OP_COMPLETE) { const char *error_message; @@ -77,9 +77,7 @@ void drain_completion_queue(uv_prepare_t *handle) { } while (event.type != GRPC_QUEUE_TIMEOUT); } -grpc_completion_queue *GetCompletionQueue() { - return queue; -} +grpc_completion_queue *GetCompletionQueue() { return queue; } void CompletionQueueNext() { if (pending_batches == 0) { @@ -90,7 +88,7 @@ void CompletionQueueNext() { } void CompletionQueueInit(Local<Object> exports) { - queue = grpc_completion_queue_create(NULL); + queue = grpc_completion_queue_create_for_next(NULL); uv_prepare_init(uv_default_loop(), &prepare); pending_batches = 0; } |