commit 0156752a66e5e8f00e7e49fd1aae35a6b8157cca
author Craig Tiller <craig.tiller@gmail.com> Wed Feb 11 21:08:49 2015 -0800
committer Craig Tiller <craig.tiller@gmail.com> Wed Feb 11 21:08:49 2015 -0800
tree b9ba6857ea36976c8c47407ef79dec03a76a679e
parent 504bd331aba5817c2753c4f447f40cc83fa4d907

Some streaming progress

src/cpp/client/client_unary_call.cc

diff --git a/src/cpp/client/client_unary_call.cc b/src/cpp/client/client_unary_call.cc
index 30bf2d0..bc0e837 100644
--- a/src/cpp/client/client_unary_call.cc
+++ b/src/cpp/client/client_unary_call.cc
@@ -51,11 +51,12 @@
   Status status;
   buf.AddSendInitialMetadata(context);
   buf.AddSendMessage(request);
-  buf.AddRecvMessage(result);
+  bool got_message;
+  buf.AddRecvMessage(result, &got_message);
   buf.AddClientSendClose();
   buf.AddClientRecvStatus(nullptr, &status);  // TODO metadata
   call.PerformOps(&buf);
-  GPR_ASSERT(cq.Pluck(&buf));
+  GPR_ASSERT(cq.Pluck(&buf) && (got_message || !status.IsOk()));
   return status;
 }
 

src/cpp/common/call.cc

diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc
index d90ef03..a20d4a0 100644
--- a/src/cpp/common/call.cc
+++ b/src/cpp/common/call.cc
@@ -58,6 +58,7 @@
   }
 
   recv_message_ = nullptr;
+  got_message_ = nullptr;
   if (recv_message_buf_) {
     grpc_byte_buffer_destroy(recv_message_buf_);
     recv_message_buf_ = nullptr;
@@ -128,8 +129,9 @@
   send_message_ = &message;
 }
 
-void CallOpBuffer::AddRecvMessage(google::protobuf::Message *message) {
+void CallOpBuffer::AddRecvMessage(google::protobuf::Message *message, bool* got_message) {
   recv_message_ = message;
+  got_message_ = got_message;
 }
 
 void CallOpBuffer::AddClientSendClose() {
@@ -239,10 +241,15 @@
     FillMetadataMap(&recv_initial_metadata_arr_, recv_initial_metadata_);
   }
   // Parse received message if any.
-  if (recv_message_ && recv_message_buf_) {
-    *status = DeserializeProto(recv_message_buf_, recv_message_);
-    grpc_byte_buffer_destroy(recv_message_buf_);
-    recv_message_buf_ = nullptr;
+  if (recv_message_) {
+    if (recv_message_buf_) {
+      *got_message_ = true;
+      *status = DeserializeProto(recv_message_buf_, recv_message_);
+      grpc_byte_buffer_destroy(recv_message_buf_);
+      recv_message_buf_ = nullptr;
+    } else {
+      *got_message_ = false;
+    }
   }
   // Parse received status.
   if (recv_status_) {

src/cpp/server/server.cc

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index be3d225..17b0543 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -177,9 +177,7 @@
       auto status = method_->handler()->RunHandler(
           MethodHandler::HandlerParameter(&call_, &ctx_, req.get(), res.get()));
       CallOpBuffer buf;
-      if (!ctx_.sent_initial_metadata_) {
-        buf.AddSendInitialMetadata(&ctx_.initial_metadata_);
-      }
+      ctx_.SendInitialMetadataIfNeeded(&buf);
       if (has_response_payload_) {
         buf.AddSendMessage(*res);
       }

src/cpp/server/server_context.cc

diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index 2bf4104..06eeb39 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -32,6 +32,7 @@
  */
 
 #include <grpc++/server_context.h>
+#include <grpc++/impl/call.h>
 #include <grpc/grpc.h>
 #include "src/cpp/util/time.h"
 
@@ -48,4 +49,11 @@
   }
 }
 
+void ServerContext::SendInitialMetadataIfNeeded(CallOpBuffer* buf) {
+  if (!sent_initial_metadata_) {
+    buf->AddSendInitialMetadata(&initial_metadata_);
+    sent_initial_metadata_ = true;
+  }
+}
+
 }  // namespace grpc