From fd88dcaf5537839a30e4f958a01c311f3e876c26 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 1 Nov 2018 11:58:46 -0700 Subject: Add cancellation notification --- src/cpp/client/client_context.cc | 7 ++++--- src/cpp/server/server_context.cc | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 8cdcddca87..d5eb029a24 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -111,9 +111,10 @@ void ClientContext::set_compression_algorithm( void ClientContext::TryCancel() { std::unique_lock lock(mu_); if (call_) { - // for(size_t i = 0; i < rpc_info_.interceptors_.size(); i++) { - // rpc_info_.RunInterceptor(, 0); - //} + internal::CancelInterceptorBatchMethods cancel_methods; + for (size_t i = 0; i < rpc_info_.interceptors_.size(); i++) { + rpc_info_.RunInterceptor(&cancel_methods, i); + } grpc_call_cancel(call_, nullptr); } else { call_canceled_ = true; diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 995e787785..e61fec9966 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -275,6 +275,12 @@ void ServerContext::AddTrailingMetadata(const grpc::string& key, } void ServerContext::TryCancel() const { + internal::CancelInterceptorBatchMethods cancel_methods; + if (rpc_info_) { + for (size_t i = 0; i < rpc_info_->interceptors_.size(); i++) { + rpc_info_->RunInterceptor(&cancel_methods, i); + } + } grpc_call_error err = grpc_call_cancel_with_status( call_, GRPC_STATUS_CANCELLED, "Cancelled on the server side", nullptr); if (err != GRPC_CALL_OK) { -- cgit v1.2.3