Merge branch 'c++api' of github.com:ctiller/grpc into c++api

pull/501/head
Craig Tiller 10 years ago
commit b84aab7922
  1. 3
      include/grpc++/impl/call.h
  2. 8
      src/cpp/common/call.cc

@ -74,9 +74,6 @@ class CallOpBuffer final : public CompletionQueueTag {
// Convert to an array of grpc_op elements // Convert to an array of grpc_op elements
void FillOps(grpc_op *ops, size_t *nops); 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() // Called by completion queue just prior to returning from Next() or Pluck()
void FinalizeResult(void *tag, bool *status) override; void FinalizeResult(void *tag, bool *status) override;

@ -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_) { if (write_buffer_) {
grpc_byte_buffer_destroy(write_buffer_); grpc_byte_buffer_destroy(write_buffer_);
write_buffer_ = nullptr; write_buffer_ = nullptr;
} }
} }
void CallOpBuffer::FinalizeResult(void *tag, bool *status) {
}
void CCallDeleter::operator()(grpc_call* c) { void CCallDeleter::operator()(grpc_call* c) {
grpc_call_destroy(c); grpc_call_destroy(c);
} }
@ -164,7 +161,6 @@ Call::Call(grpc_call* call, ChannelInterface* channel, CompletionQueue* cq)
void Call::PerformOps(CallOpBuffer* buffer) { void Call::PerformOps(CallOpBuffer* buffer) {
channel_->PerformOpsOnCall(buffer, this); channel_->PerformOpsOnCall(buffer, this);
buffer->ReleaseSendBuffer();
} }
} // namespace grpc } // namespace grpc

Loading…
Cancel
Save