aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-11 10:49:57 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-11 10:49:57 -0800
commit6bd9b764873ec358d5713cd6ede813c1fdc3ae06 (patch)
treea4ba677d505a50cc5e8300da07658ca5d88d35ee
parent7de8b49ca05ac86a5bc61cc7d81260913c4dbf89 (diff)
parenta52ea7bd1cdcbd007fadc0650fe5d49ae9bf7d46 (diff)
Merge pull request #6 from yang-g/c++api
Release write buffer in FinalizeResult
-rw-r--r--include/grpc++/impl/call.h3
-rw-r--r--src/cpp/common/call.cc8
2 files changed, 2 insertions, 9 deletions
diff --git a/include/grpc++/impl/call.h b/include/grpc++/impl/call.h
index edc6555b0c..139604a531 100644
--- a/include/grpc++/impl/call.h
+++ b/include/grpc++/impl/call.h
@@ -73,9 +73,6 @@ class CallOpBuffer final : public CompletionQueueTag {
// Convert to an array of grpc_op elements
void FillOps(grpc_op *ops, size_t *nops);
- // Release send buffers.
- void ReleaseSendBuffer();
-
// Called by completion queue just prior to returning from Next() or Pluck()
void FinalizeResult(void *tag, bool *status) override;
diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc
index 1aa79d4615..5a6656900e 100644
--- a/src/cpp/common/call.cc
+++ b/src/cpp/common/call.cc
@@ -144,17 +144,14 @@ void CallOpBuffer::FillOps(grpc_op *ops, size_t *nops) {
}
}
-void CallOpBuffer::ReleaseSendBuffer() {
+void CallOpBuffer::FinalizeResult(void *tag, bool *status) {
+ // Release send buffers
if (write_buffer_) {
grpc_byte_buffer_destroy(write_buffer_);
write_buffer_ = nullptr;
}
}
-void CallOpBuffer::FinalizeResult(void *tag, bool *status) {
-
-}
-
void CCallDeleter::operator()(grpc_call* c) {
grpc_call_destroy(c);
}
@@ -164,7 +161,6 @@ Call::Call(grpc_call* call, ChannelInterface* channel, CompletionQueue* cq)
void Call::PerformOps(CallOpBuffer* buffer) {
channel_->PerformOpsOnCall(buffer, this);
- buffer->ReleaseSendBuffer();
}
} // namespace grpc