Skip to content
Snippets Groups Projects
Commit 652b7e98 authored by Vijay Pai's avatar Vijay Pai
Browse files

Revert "Remove dead members of server context"

This reverts commit 8c8588c7.
parent 82dd80ab
No related branches found
No related tags found
No related merge requests found
...@@ -78,6 +78,8 @@ class ServerContext { ...@@ -78,6 +78,8 @@ class ServerContext {
void AddInitialMetadata(const grpc::string& key, const grpc::string& value); void AddInitialMetadata(const grpc::string& key, const grpc::string& value);
void AddTrailingMetadata(const grpc::string& key, const grpc::string& value); void AddTrailingMetadata(const grpc::string& key, const grpc::string& value);
bool IsCancelled();
const std::multimap<grpc::string, grpc::string>& client_metadata() { const std::multimap<grpc::string, grpc::string>& client_metadata() {
return client_metadata_; return client_metadata_;
} }
...@@ -110,6 +112,7 @@ class ServerContext { ...@@ -110,6 +112,7 @@ class ServerContext {
std::chrono::system_clock::time_point deadline_; std::chrono::system_clock::time_point deadline_;
grpc_call* call_; grpc_call* call_;
CompletionQueue* cq_;
bool sent_initial_metadata_; bool sent_initial_metadata_;
std::multimap<grpc::string, grpc::string> client_metadata_; std::multimap<grpc::string, grpc::string> client_metadata_;
std::multimap<grpc::string, grpc::string> initial_metadata_; std::multimap<grpc::string, grpc::string> initial_metadata_;
......
...@@ -94,6 +94,7 @@ bool ServerContext::CompletionOp::FinalizeResult(void** tag, bool* status) { ...@@ -94,6 +94,7 @@ bool ServerContext::CompletionOp::FinalizeResult(void** tag, bool* status) {
ServerContext::ServerContext() ServerContext::ServerContext()
: completion_op_(nullptr), : completion_op_(nullptr),
call_(nullptr), call_(nullptr),
cq_(nullptr),
sent_initial_metadata_(false) {} sent_initial_metadata_(false) {}
ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata* metadata, ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata* metadata,
...@@ -101,6 +102,7 @@ ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata* metadata, ...@@ -101,6 +102,7 @@ ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata* metadata,
: completion_op_(nullptr), : completion_op_(nullptr),
deadline_(Timespec2Timepoint(deadline)), deadline_(Timespec2Timepoint(deadline)),
call_(nullptr), call_(nullptr),
cq_(nullptr),
sent_initial_metadata_(false) { sent_initial_metadata_(false) {
for (size_t i = 0; i < metadata_count; i++) { for (size_t i = 0; i < metadata_count; i++) {
client_metadata_.insert(std::make_pair( client_metadata_.insert(std::make_pair(
...@@ -135,4 +137,8 @@ void ServerContext::AddTrailingMetadata(const grpc::string& key, ...@@ -135,4 +137,8 @@ void ServerContext::AddTrailingMetadata(const grpc::string& key,
trailing_metadata_.insert(std::make_pair(key, value)); trailing_metadata_.insert(std::make_pair(key, value));
} }
bool ServerContext::IsCancelled() {
return completion_op_ && completion_op_->CheckCancelled(cq_);
}
} // namespace grpc } // namespace grpc
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment