diff options
author | Craig Tiller <ctiller@google.com> | 2015-02-02 15:29:14 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-02-02 15:29:14 -0800 |
commit | 40d2a4307b8b1e6c794c0eeee6774ddf31e99c6b (patch) | |
tree | e2defbb84ec4858e1896e260b016894d5b4708b5 /src/cpp/client | |
parent | 566316f3a52f67e3b3806fcb052ab442bc7c4af9 (diff) | |
parent | 9b5da20897fac8fa215a4aa2e98ba892b417c0e2 (diff) |
Merge branch 'async-api-prep' of github.com:ctiller/grpc into async-api
Diffstat (limited to 'src/cpp/client')
-rw-r--r-- | src/cpp/client/channel.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index 19943ab8c6..3f39364bda 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -99,7 +99,7 @@ Status Channel::StartBlockingRpc(const RpcMethod &method, const google::protobuf::Message &request, google::protobuf::Message *result) { Status status; - grpc_call *call = grpc_channel_create_call( + grpc_call *call = grpc_channel_create_call_old( c_channel_, method.name(), target_.c_str(), context->RawDeadline()); context->set_call(call); @@ -115,8 +115,8 @@ Status Channel::StartBlockingRpc(const RpcMethod &method, // add_metadata from context // // invoke - GPR_ASSERT(grpc_call_invoke(call, cq, metadata_read_tag, finished_tag, - GRPC_WRITE_BUFFER_HINT) == GRPC_CALL_OK); + GPR_ASSERT(grpc_call_invoke_old(call, cq, metadata_read_tag, finished_tag, + GRPC_WRITE_BUFFER_HINT) == GRPC_CALL_OK); // write request grpc_byte_buffer *write_buffer = nullptr; bool success = SerializeProto(request, &write_buffer); @@ -127,8 +127,8 @@ Status Channel::StartBlockingRpc(const RpcMethod &method, GetFinalStatus(cq, finished_tag, nullptr); return status; } - GPR_ASSERT(grpc_call_start_write(call, write_buffer, write_tag, - GRPC_WRITE_BUFFER_HINT) == GRPC_CALL_OK); + GPR_ASSERT(grpc_call_start_write_old(call, write_buffer, write_tag, + GRPC_WRITE_BUFFER_HINT) == GRPC_CALL_OK); grpc_byte_buffer_destroy(write_buffer); ev = grpc_completion_queue_pluck(cq, write_tag, gpr_inf_future); @@ -139,7 +139,7 @@ Status Channel::StartBlockingRpc(const RpcMethod &method, return status; } // writes done - GPR_ASSERT(grpc_call_writes_done(call, halfclose_tag) == GRPC_CALL_OK); + GPR_ASSERT(grpc_call_writes_done_old(call, halfclose_tag) == GRPC_CALL_OK); ev = grpc_completion_queue_pluck(cq, halfclose_tag, gpr_inf_future); grpc_event_finish(ev); // start read metadata @@ -147,7 +147,7 @@ Status Channel::StartBlockingRpc(const RpcMethod &method, ev = grpc_completion_queue_pluck(cq, metadata_read_tag, gpr_inf_future); grpc_event_finish(ev); // start read - GPR_ASSERT(grpc_call_start_read(call, read_tag) == GRPC_CALL_OK); + GPR_ASSERT(grpc_call_start_read_old(call, read_tag) == GRPC_CALL_OK); ev = grpc_completion_queue_pluck(cq, read_tag, gpr_inf_future); if (ev->data.read) { if (!DeserializeProto(ev->data.read, result)) { @@ -168,7 +168,7 @@ StreamContextInterface *Channel::CreateStream( const RpcMethod &method, ClientContext *context, const google::protobuf::Message *request, google::protobuf::Message *result) { - grpc_call *call = grpc_channel_create_call( + grpc_call *call = grpc_channel_create_call_old( c_channel_, method.name(), target_.c_str(), context->RawDeadline()); context->set_call(call); grpc_completion_queue *cq = grpc_completion_queue_create(); |