From a7cac78516057512d62cdae8fc5fdf9e2f90a136 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 2 Feb 2015 10:16:30 -0800 Subject: Prepare for the new batch call API. Rename all core API functions that are on their way to deprecation with an _old tag across all wrappings. --- src/cpp/client/channel.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/cpp/client') diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index c8b2bb2cf6..5822e3015f 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); grpc_event *ev; @@ -114,8 +114,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); @@ -126,8 +126,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); @@ -138,7 +138,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 @@ -146,7 +146,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)) { @@ -167,7 +167,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(); -- cgit v1.2.3