diff options
author | Vijay Pai <vpai@google.com> | 2018-02-05 13:08:44 -0800 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2018-02-05 13:08:44 -0800 |
commit | dcd5ef3ad8b964ec487c96aeea4f1323193815ed (patch) | |
tree | d587cefd3b0a46aa37239b2bc75dc4c74dfd02cd | |
parent | 2fd6e8cf5e8316bc1ef242321ff539dd62549470 (diff) |
Deprecate GenericStub()::Call for multi-threaded use
-rw-r--r-- | include/grpc++/generic/generic_stub.h | 19 | ||||
-rw-r--r-- | test/cpp/end2end/generic_end2end_test.cc | 6 |
2 files changed, 14 insertions, 11 deletions
diff --git a/include/grpc++/generic/generic_stub.h b/include/grpc++/generic/generic_stub.h index d5064318cf..e72826bdc1 100644 --- a/include/grpc++/generic/generic_stub.h +++ b/include/grpc++/generic/generic_stub.h @@ -37,15 +37,6 @@ class GenericStub final { explicit GenericStub(std::shared_ptr<ChannelInterface> channel) : channel_(channel) {} - /// Begin a call to a named method \a method using \a context. - /// A tag \a tag will be delivered to \a cq when the call has been started - /// (i.e, initial metadata has been sent). - /// The return value only indicates whether or not registration of the call - /// succeeded (i.e. the call won't proceed if the return value is nullptr). - std::unique_ptr<GenericClientAsyncReaderWriter> Call( - ClientContext* context, const grpc::string& method, CompletionQueue* cq, - void* tag); - /// Setup a call to a named method \a method using \a context, but don't /// start it. Let it be started explicitly with StartCall and a tag. /// The return value only indicates whether or not registration of the call @@ -61,6 +52,16 @@ class GenericStub final { ClientContext* context, const grpc::string& method, const ByteBuffer& request, CompletionQueue* cq); + /// DEPRECATED for multi-threaded use + /// Begin a call to a named method \a method using \a context. + /// A tag \a tag will be delivered to \a cq when the call has been started + /// (i.e, initial metadata has been sent). + /// The return value only indicates whether or not registration of the call + /// succeeded (i.e. the call won't proceed if the return value is nullptr). + std::unique_ptr<GenericClientAsyncReaderWriter> Call( + ClientContext* context, const grpc::string& method, CompletionQueue* cq, + void* tag); + private: std::shared_ptr<ChannelInterface> channel_; }; diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index bf432844cb..ba2608982a 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -125,7 +125,8 @@ class GenericEnd2endTest : public ::testing::Test { } std::unique_ptr<GenericClientAsyncReaderWriter> call = - generic_stub_->Call(&cli_ctx, kMethodName, &cli_cq_, tag(1)); + generic_stub_->PrepareCall(&cli_ctx, kMethodName, &cli_cq_); + call->StartCall(tag(1)); client_ok(1); std::unique_ptr<ByteBuffer> send_buffer = SerializeToByteBuffer(&send_request); @@ -271,7 +272,8 @@ TEST_F(GenericEnd2endTest, SimpleBidiStreaming) { cli_ctx.set_compression_algorithm(GRPC_COMPRESS_MESSAGE_GZIP); send_request.set_message("Hello"); std::unique_ptr<GenericClientAsyncReaderWriter> cli_stream = - generic_stub_->Call(&cli_ctx, kMethodName, &cli_cq_, tag(1)); + generic_stub_->PrepareCall(&cli_ctx, kMethodName, &cli_cq_); + cli_stream->StartCall(tag(1)); client_ok(1); generic_service_.RequestCall(&srv_ctx, &srv_stream, srv_cq_.get(), |