natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an expectation and fix a ServerContext bug

This commit is contained in:
Vijay Pai 2019-02-25 00:48:11 -08:00
parent 5f8fe7d5cc
commit 8feb16171a
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cpp/server/server_context.cc
View File

@ -138,7 +138,7 @@ class ServerContext::CompletionOp final : public internal::CallOpSetInterface {
}
internal::Call call_;
internal::ServerReactor* reactor_;
internal::ServerReactor* const reactor_;
bool has_tag_;
void* tag_;
void* core_cq_tag_;
@ -200,12 +200,17 @@ bool ServerContext::CompletionOp::FinalizeResult(void** tag, bool* status) {
cancelled_ = 1;
}
if (cancelled_ && (reactor_ != nullptr)) {
// Decide whether to call the cancel callback before releasing the lock
bool call_cancel = (cancelled_ != 0);
// Release the lock since we are going to be calling a callback and
// interceptors now
lock.unlock();
if (call_cancel && (reactor_ != nullptr)) {
reactor_->OnCancel();
}
/* Release the lock since we are going to be running through interceptors now
*/
lock.unlock();
/* Add interception point and run through interceptors */
interceptor_methods_.AddInterceptionHookPoint(
experimental::InterceptionHookPoints::POST_RECV_CLOSE);

15
test/cpp/end2end/test_service_impl.cc
View File

@ -583,7 +583,10 @@ CallbackTestServiceImpl::RequestStream() {
StartRead(&request_);
}
void OnDone() override { delete this; }
void OnCancel() override { FinishOnce(Status::CANCELLED); }
void OnCancel() override {
EXPECT_TRUE(ctx_->IsCancelled());
FinishOnce(Status::CANCELLED);
}
void OnReadDone(bool ok) override {
if (ok) {
response_->mutable_message()->append(request_.message());
@ -666,7 +669,10 @@ CallbackTestServiceImpl::ResponseStream() {
}
}
void OnDone() override { delete this; }
void OnCancel() override { FinishOnce(Status::CANCELLED); }
void OnCancel() override {
EXPECT_TRUE(ctx_->IsCancelled());
FinishOnce(Status::CANCELLED);
}
void OnWriteDone(bool ok) override {
if (num_msgs_sent_ < server_responses_to_send_) {
NextWrite();
@ -749,7 +755,10 @@ CallbackTestServiceImpl::BidiStream() {
StartRead(&request_);
}
void OnDone() override { delete this; }
void OnCancel() override { FinishOnce(Status::CANCELLED); }
void OnCancel() override {
EXPECT_TRUE(ctx_->IsCancelled());
FinishOnce(Status::CANCELLED);
}
void OnReadDone(bool ok) override {
if (ok) {
num_msgs_read_++;