Merge pull request #1493 from ctiller/churn-churn-churn-the-api-gently-down-the-stream

Completion queue binding for new requests API change

1 files changed, 59 insertions, 44 deletions

diff --git a/src/compiler/cpp_generator.cc b/src/compiler/cpp_generator.cc
index 084db17a30..acac1475f7 100644
--- a/src/compiler/cpp_generator.cc
+++ b/src/compiler/cpp_generator.cc
@@ -120,6 +120,7 @@ grpc::string GetHeaderIncludes(const grpc::protobuf::FileDescriptor *file,
       "class CompletionQueue;\n"
       "class ChannelInterface;\n"
       "class RpcService;\n"
+      "class ServerCompletionQueue;\n"
       "class ServerContext;\n"
       "}  // namespace grpc\n\n";
 
@@ -499,30 +500,37 @@ void PrintHeaderServerMethodAsync(
   (*vars)["Response"] =
       grpc_cpp_generator::ClassName(method->output_type(), true);
   if (NoStreaming(method)) {
-    printer->Print(*vars,
-                   "void Request$Method$("
-                   "::grpc::ServerContext* context, $Request$* request, "
-                   "::grpc::ServerAsyncResponseWriter< $Response$>* response, "
-                   "::grpc::CompletionQueue* cq, void *tag);\n");
+    printer->Print(
+        *vars,
+        "void Request$Method$("
+        "::grpc::ServerContext* context, $Request$* request, "
+        "::grpc::ServerAsyncResponseWriter< $Response$>* response, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag);\n");
   } else if (ClientOnlyStreaming(method)) {
-    printer->Print(*vars,
-                   "void Request$Method$("
-                   "::grpc::ServerContext* context, "
-                   "::grpc::ServerAsyncReader< $Response$, $Request$>* reader, "
-                   "::grpc::CompletionQueue* cq, void *tag);\n");
+    printer->Print(
+        *vars,
+        "void Request$Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerAsyncReader< $Response$, $Request$>* reader, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag);\n");
   } else if (ServerOnlyStreaming(method)) {
-    printer->Print(*vars,
-                   "void Request$Method$("
-                   "::grpc::ServerContext* context, $Request$* request, "
-                   "::grpc::ServerAsyncWriter< $Response$>* writer, "
-                   "::grpc::CompletionQueue* cq, void *tag);\n");
+    printer->Print(
+        *vars,
+        "void Request$Method$("
+        "::grpc::ServerContext* context, $Request$* request, "
+        "::grpc::ServerAsyncWriter< $Response$>* writer, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag);\n");
   } else if (BidiStreaming(method)) {
     printer->Print(
         *vars,
         "void Request$Method$("
         "::grpc::ServerContext* context, "
         "::grpc::ServerAsyncReaderWriter< $Response$, $Request$>* stream, "
-        "::grpc::CompletionQueue* cq, void *tag);\n");
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag);\n");
   }
 }
 
@@ -603,7 +611,7 @@ void PrintHeaderService(grpc::protobuf::io::Printer *printer,
       " public:\n");
   printer->Indent();
   (*vars)["MethodCount"] = as_string(service->method_count());
-  printer->Print("explicit AsyncService(::grpc::CompletionQueue* cq);\n");
+  printer->Print("explicit AsyncService();\n");
   printer->Print("~AsyncService() {};\n");
   for (int i = 0; i < service->method_count(); ++i) {
     PrintHeaderServerMethodAsync(printer, service->method(i), vars);
@@ -878,36 +886,43 @@ void PrintSourceServerAsyncMethod(
   (*vars)["Response"] =
       grpc_cpp_generator::ClassName(method->output_type(), true);
   if (NoStreaming(method)) {
-    printer->Print(*vars,
-                   "void $ns$$Service$::AsyncService::Request$Method$("
-                   "::grpc::ServerContext* context, "
-                   "$Request$* request, "
-                   "::grpc::ServerAsyncResponseWriter< $Response$>* response, "
-                   "::grpc::CompletionQueue* cq, void* tag) {\n");
+    printer->Print(
+        *vars,
+        "void $ns$$Service$::AsyncService::Request$Method$("
+        "::grpc::ServerContext* context, "
+        "$Request$* request, "
+        "::grpc::ServerAsyncResponseWriter< $Response$>* response, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n");
     printer->Print(*vars,
                    "  AsynchronousService::RequestAsyncUnary($Idx$, context, "
-                   "request, response, cq, tag);\n");
+                   "request, response, new_call_cq, notification_cq, tag);\n");
     printer->Print("}\n\n");
   } else if (ClientOnlyStreaming(method)) {
-    printer->Print(*vars,
-                   "void $ns$$Service$::AsyncService::Request$Method$("
-                   "::grpc::ServerContext* context, "
-                   "::grpc::ServerAsyncReader< $Response$, $Request$>* reader, "
-                   "::grpc::CompletionQueue* cq, void* tag) {\n");
+    printer->Print(
+        *vars,
+        "void $ns$$Service$::AsyncService::Request$Method$("
+        "::grpc::ServerContext* context, "
+        "::grpc::ServerAsyncReader< $Response$, $Request$>* reader, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n");
     printer->Print(*vars,
                    "  AsynchronousService::RequestClientStreaming($Idx$, "
-                   "context, reader, cq, tag);\n");
+                   "context, reader, new_call_cq, notification_cq, tag);\n");
     printer->Print("}\n\n");
   } else if (ServerOnlyStreaming(method)) {
-    printer->Print(*vars,
-                   "void $ns$$Service$::AsyncService::Request$Method$("
-                   "::grpc::ServerContext* context, "
-                   "$Request$* request, "
-                   "::grpc::ServerAsyncWriter< $Response$>* writer, "
-                   "::grpc::CompletionQueue* cq, void* tag) {\n");
-    printer->Print(*vars,
-                   "  AsynchronousService::RequestServerStreaming($Idx$, "
-                   "context, request, writer, cq, tag);\n");
+    printer->Print(
+        *vars,
+        "void $ns$$Service$::AsyncService::Request$Method$("
+        "::grpc::ServerContext* context, "
+        "$Request$* request, "
+        "::grpc::ServerAsyncWriter< $Response$>* writer, "
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n");
+    printer->Print(
+        *vars,
+        "  AsynchronousService::RequestServerStreaming($Idx$, "
+        "context, request, writer, new_call_cq, notification_cq, tag);\n");
     printer->Print("}\n\n");
   } else if (BidiStreaming(method)) {
     printer->Print(
@@ -915,10 +930,11 @@ void PrintSourceServerAsyncMethod(
         "void $ns$$Service$::AsyncService::Request$Method$("
         "::grpc::ServerContext* context, "
         "::grpc::ServerAsyncReaderWriter< $Response$, $Request$>* stream, "
-        "::grpc::CompletionQueue* cq, void *tag) {\n");
+        "::grpc::CompletionQueue* new_call_cq, "
+        "::grpc::ServerCompletionQueue* notification_cq, void *tag) {\n");
     printer->Print(*vars,
                    "  AsynchronousService::RequestBidiStreaming($Idx$, "
-                   "context, stream, cq, tag);\n");
+                   "context, stream, new_call_cq, notification_cq, tag);\n");
     printer->Print("}\n\n");
   }
 }
@@ -980,9 +996,8 @@ void PrintSourceService(grpc::protobuf::io::Printer *printer,
 
   (*vars)["MethodCount"] = as_string(service->method_count());
   printer->Print(*vars,
-                 "$ns$$Service$::AsyncService::AsyncService(::grpc::"
-                 "CompletionQueue* cq) : "
-                 "::grpc::AsynchronousService(cq, "
+                 "$ns$$Service$::AsyncService::AsyncService() : "
+                 "::grpc::AsynchronousService("
                  "$prefix$$Service$_method_names, $MethodCount$) "
                  "{}\n\n");