updated cpp_generator.cc to be compatible with the latest grpc version (#4551)
* updateed cpp_generator.cc to be compatible with the latest grpc version * preserved the original license
This commit is contained in:
Yuri Finkelstein
Wouter van Oortmerssen
parent
c1901f2c01
commit
dd73b53e28
|
|
@ -34,6 +34,7 @@
|
|||
#include <map>
|
||||
|
||||
#include "src/compiler/cpp_generator.h"
|
||||
#include "flatbuffers/util.h"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
|
|
@ -127,8 +128,8 @@ grpc::string GetHeaderPrologue(grpc_generator::File *file,
|
|||
printer->Print(vars, "#ifndef GRPC_$filename_identifier$__INCLUDED\n");
|
||||
printer->Print(vars, "#define GRPC_$filename_identifier$__INCLUDED\n");
|
||||
printer->Print(vars, "\n");
|
||||
printer->Print(vars, file->additional_headers().c_str());
|
||||
printer->Print(vars, "#include \"$filename_base$$message_header_ext$\"\n");
|
||||
printer->Print(vars, file->additional_headers().c_str());
|
||||
printer->Print(vars, "\n");
|
||||
}
|
||||
return output;
|
||||
|
|
@ -183,25 +184,38 @@ void PrintHeaderClientMethodInterfaces(
|
|||
(*vars)["Request"] = method->input_type_name();
|
||||
(*vars)["Response"] = method->output_type_name();
|
||||
|
||||
struct {
|
||||
grpc::string prefix;
|
||||
grpc::string method_params; // extra arguments to method
|
||||
grpc::string raw_args; // extra arguments to raw version of method
|
||||
} async_prefixes[] = {{"Async", ", void* tag", ", tag"},
|
||||
{"PrepareAsync", "", ""}};
|
||||
|
||||
if (is_public) {
|
||||
if (method->NoStreaming()) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::Status $Method$(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, $Response$* response) = 0;\n");
|
||||
printer->Print(*vars,
|
||||
"std::unique_ptr< "
|
||||
"::grpc::ClientAsyncResponseReaderInterface< $Response$>> "
|
||||
"Async$Method$(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncResponseReaderInterface< $Response$>>("
|
||||
"Async$Method$Raw(context, request, cq));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< "
|
||||
"::grpc::ClientAsyncResponseReaderInterface< $Response$>> "
|
||||
"$AsyncPrefix$$Method$(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncResponseReaderInterface< $Response$>>("
|
||||
"$AsyncPrefix$$Method$Raw(context, request, cq));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
}
|
||||
} else if (ClientOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
|
|
@ -215,19 +229,27 @@ void PrintHeaderClientMethodInterfaces(
|
|||
"($Method$Raw(context, response));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncWriterInterface< $Request$>>"
|
||||
" Async$Method$(::grpc::ClientContext* context, $Response$* "
|
||||
"response, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncWriterInterface< $Request$>>("
|
||||
"Async$Method$Raw(context, response, cq, tag));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncWriterInterface< $Request$>>"
|
||||
" $AsyncPrefix$$Method$(::grpc::ClientContext* context, "
|
||||
"$Response$* "
|
||||
"response, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncWriterInterface< $Request$>>("
|
||||
"$AsyncPrefix$$Method$Raw(context, response, "
|
||||
"cq$AsyncRawArgs$));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
}
|
||||
} else if (ServerOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
|
|
@ -241,19 +263,26 @@ void PrintHeaderClientMethodInterfaces(
|
|||
"($Method$Raw(context, request));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncReaderInterface< $Response$>> "
|
||||
"Async$Method$("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncReaderInterface< $Response$>>("
|
||||
"Async$Method$Raw(context, request, cq, tag));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncReaderInterface< $Response$>> "
|
||||
"$AsyncPrefix$$Method$("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncReaderInterface< $Response$>>("
|
||||
"$AsyncPrefix$$Method$Raw(context, request, cq$AsyncRawArgs$));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
}
|
||||
} else if (method->BidiStreaming()) {
|
||||
printer->Print(*vars,
|
||||
"std::unique_ptr< ::grpc::ClientReaderWriterInterface< "
|
||||
|
|
@ -267,61 +296,88 @@ void PrintHeaderClientMethodInterfaces(
|
|||
"$Method$Raw(context));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< "
|
||||
"::grpc::ClientAsyncReaderWriterInterface< $Request$, $Response$>> "
|
||||
"Async$Method$(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncReaderWriterInterface< $Request$, $Response$>>("
|
||||
"Async$Method$Raw(context, cq, tag));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< "
|
||||
"::grpc::ClientAsyncReaderWriterInterface< $Request$, $Response$>> "
|
||||
"$AsyncPrefix$$Method$(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncReaderWriterInterface< $Request$, $Response$>>("
|
||||
"$AsyncPrefix$$Method$Raw(context, cq$AsyncRawArgs$));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (method->NoStreaming()) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::ClientAsyncResponseReaderInterface< $Response$>* "
|
||||
"Async$Method$Raw(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) = 0;\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::ClientAsyncResponseReaderInterface< $Response$>* "
|
||||
"$AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) = 0;\n");
|
||||
}
|
||||
} else if (ClientOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::ClientWriterInterface< $Request$>*"
|
||||
" $Method$Raw("
|
||||
"::grpc::ClientContext* context, $Response$* response) = 0;\n");
|
||||
printer->Print(*vars,
|
||||
"virtual ::grpc::ClientAsyncWriterInterface< $Request$>*"
|
||||
" Async$Method$Raw(::grpc::ClientContext* context, "
|
||||
"$Response$* response, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) = 0;\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::ClientAsyncWriterInterface< $Request$>*"
|
||||
" $AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, "
|
||||
"$Response$* response, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) = 0;\n");
|
||||
}
|
||||
} else if (ServerOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::ClientReaderInterface< $Response$>* $Method$Raw("
|
||||
"::grpc::ClientContext* context, const $Request$& request) = 0;\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::ClientAsyncReaderInterface< $Response$>* "
|
||||
"Async$Method$Raw("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) = 0;\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::ClientAsyncReaderInterface< $Response$>* "
|
||||
"$AsyncPrefix$$Method$Raw("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) = 0;\n");
|
||||
}
|
||||
} else if (method->BidiStreaming()) {
|
||||
printer->Print(*vars,
|
||||
"virtual ::grpc::ClientReaderWriterInterface< $Request$, "
|
||||
"$Response$>* "
|
||||
"$Method$Raw(::grpc::ClientContext* context) = 0;\n");
|
||||
printer->Print(*vars,
|
||||
"virtual ::grpc::ClientAsyncReaderWriterInterface< "
|
||||
"$Request$, $Response$>* "
|
||||
"Async$Method$Raw(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) = 0;\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"virtual ::grpc::ClientAsyncReaderWriterInterface< "
|
||||
"$Request$, $Response$>* "
|
||||
"$AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) = 0;\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -333,25 +389,36 @@ void PrintHeaderClientMethod(grpc_generator::Printer *printer,
|
|||
(*vars)["Method"] = method->name();
|
||||
(*vars)["Request"] = method->input_type_name();
|
||||
(*vars)["Response"] = method->output_type_name();
|
||||
struct {
|
||||
grpc::string prefix;
|
||||
grpc::string method_params; // extra arguments to method
|
||||
grpc::string raw_args; // extra arguments to raw version of method
|
||||
} async_prefixes[] = {{"Async", ", void* tag", ", tag"},
|
||||
{"PrepareAsync", "", ""}};
|
||||
|
||||
if (is_public) {
|
||||
if (method->NoStreaming()) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::Status $Method$(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, $Response$* response) override;\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncResponseReader< $Response$>> "
|
||||
"Async$Method$(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncResponseReader< $Response$>>("
|
||||
"Async$Method$Raw(context, request, cq));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncResponseReader< $Response$>> "
|
||||
"$AsyncPrefix$$Method$(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncResponseReader< $Response$>>("
|
||||
"$AsyncPrefix$$Method$Raw(context, request, cq));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
}
|
||||
} else if (ClientOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
|
|
@ -364,18 +431,25 @@ void PrintHeaderClientMethod(grpc_generator::Printer *printer,
|
|||
"($Method$Raw(context, response));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
printer->Print(*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncWriter< $Request$>>"
|
||||
" Async$Method$(::grpc::ClientContext* context, "
|
||||
"$Response$* response, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< ::grpc::ClientAsyncWriter< $Request$>>("
|
||||
"Async$Method$Raw(context, response, cq, tag));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncWriter< $Request$>>"
|
||||
" $AsyncPrefix$$Method$(::grpc::ClientContext* context, "
|
||||
"$Response$* response, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< ::grpc::ClientAsyncWriter< $Request$>>("
|
||||
"$AsyncPrefix$$Method$Raw(context, response, "
|
||||
"cq$AsyncRawArgs$));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
}
|
||||
} else if (ServerOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
|
|
@ -389,19 +463,25 @@ void PrintHeaderClientMethod(grpc_generator::Printer *printer,
|
|||
"($Method$Raw(context, request));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncReader< $Response$>> "
|
||||
"Async$Method$("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< ::grpc::ClientAsyncReader< $Response$>>("
|
||||
"Async$Method$Raw(context, request, cq, tag));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncReader< $Response$>> "
|
||||
"$AsyncPrefix$$Method$("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< ::grpc::ClientAsyncReader< $Response$>>("
|
||||
"$AsyncPrefix$$Method$Raw(context, request, cq$AsyncRawArgs$));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
}
|
||||
} else if (method->BidiStreaming()) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
|
|
@ -414,53 +494,85 @@ void PrintHeaderClientMethod(grpc_generator::Printer *printer,
|
|||
"$Method$Raw(context));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
printer->Print(*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncReaderWriter< "
|
||||
"$Request$, $Response$>> "
|
||||
"Async$Method$(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncReaderWriter< $Request$, $Response$>>("
|
||||
"Async$Method$Raw(context, cq, tag));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(*vars,
|
||||
"std::unique_ptr< ::grpc::ClientAsyncReaderWriter< "
|
||||
"$Request$, $Response$>> "
|
||||
"$AsyncPrefix$$Method$(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
*vars,
|
||||
"return std::unique_ptr< "
|
||||
"::grpc::ClientAsyncReaderWriter< $Request$, $Response$>>("
|
||||
"$AsyncPrefix$$Method$Raw(context, cq$AsyncRawArgs$));\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (method->NoStreaming()) {
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientAsyncResponseReader< $Response$>* "
|
||||
"Async$Method$Raw(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) override;\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::ClientAsyncResponseReader< $Response$>* "
|
||||
"$AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) override;\n");
|
||||
}
|
||||
} else if (ClientOnlyStreaming(method)) {
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientWriter< $Request$>* $Method$Raw("
|
||||
"::grpc::ClientContext* context, $Response$* response) "
|
||||
"override;\n");
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientAsyncWriter< $Request$>* Async$Method$Raw("
|
||||
"::grpc::ClientContext* context, $Response$* response, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) override;\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::ClientAsyncWriter< $Request$>* $AsyncPrefix$$Method$Raw("
|
||||
"::grpc::ClientContext* context, $Response$* response, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) override;\n");
|
||||
}
|
||||
} else if (ServerOnlyStreaming(method)) {
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientReader< $Response$>* $Method$Raw("
|
||||
"::grpc::ClientContext* context, const $Request$& request)"
|
||||
" override;\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::ClientAsyncReader< $Response$>* Async$Method$Raw("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) override;\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::ClientAsyncReader< $Response$>* $AsyncPrefix$$Method$Raw("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) override;\n");
|
||||
}
|
||||
} else if (method->BidiStreaming()) {
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientReaderWriter< $Request$, $Response$>* "
|
||||
"$Method$Raw(::grpc::ClientContext* context) override;\n");
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientAsyncReaderWriter< $Request$, $Response$>* "
|
||||
"Async$Method$Raw(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) override;\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncRawArgs"] = async_prefix.raw_args;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::ClientAsyncReaderWriter< $Request$, $Response$>* "
|
||||
"$AsyncPrefix$$Method$Raw(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) override;\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1095,6 +1207,13 @@ void PrintSourceClientMethod(grpc_generator::Printer *printer,
|
|||
(*vars)["Method"] = method->name();
|
||||
(*vars)["Request"] = method->input_type_name();
|
||||
(*vars)["Response"] = method->output_type_name();
|
||||
struct {
|
||||
grpc::string prefix;
|
||||
grpc::string start; // bool literal expressed as string
|
||||
grpc::string method_params; // extra arguments to method
|
||||
grpc::string create_args; // extra arguments to creator
|
||||
} async_prefixes[] = {{"Async", "true", ", void* tag", ", tag"},
|
||||
{"PrepareAsync", "false", "", ", nullptr"}};
|
||||
if (method->NoStreaming()) {
|
||||
printer->Print(*vars,
|
||||
"::grpc::Status $ns$$Service$::Stub::$Method$("
|
||||
|
|
@ -1105,19 +1224,24 @@ void PrintSourceClientMethod(grpc_generator::Printer *printer,
|
|||
"rpcmethod_$Method$_, "
|
||||
"context, request, response);\n"
|
||||
"}\n\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::ClientAsyncResponseReader< $Response$>* "
|
||||
"$ns$$Service$::Stub::Async$Method$Raw(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) {\n");
|
||||
printer->Print(*vars,
|
||||
" return "
|
||||
"::grpc::ClientAsyncResponseReader< $Response$>::Create("
|
||||
"channel_.get(), cq, "
|
||||
"rpcmethod_$Method$_, "
|
||||
"context, request);\n"
|
||||
"}\n\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncStart"] = async_prefix.start;
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientAsyncResponseReader< $Response$>* "
|
||||
"$ns$$Service$::Stub::$AsyncPrefix$$Method$Raw(::grpc::"
|
||||
"ClientContext* context, "
|
||||
"const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq) {\n");
|
||||
printer->Print(*vars,
|
||||
" return "
|
||||
"::grpc::ClientAsyncResponseReader< $Response$>::Create("
|
||||
"channel_.get(), cq, "
|
||||
"rpcmethod_$Method$_, "
|
||||
"context, request, $AsyncStart$);\n"
|
||||
"}\n\n");
|
||||
}
|
||||
} else if (ClientOnlyStreaming(method)) {
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientWriter< $Request$>* "
|
||||
|
|
@ -1129,17 +1253,24 @@ void PrintSourceClientMethod(grpc_generator::Printer *printer,
|
|||
"rpcmethod_$Method$_, "
|
||||
"context, response);\n"
|
||||
"}\n\n");
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientAsyncWriter< $Request$>* "
|
||||
"$ns$$Service$::Stub::Async$Method$Raw("
|
||||
"::grpc::ClientContext* context, $Response$* response, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Print(*vars,
|
||||
" return ::grpc::ClientAsyncWriter< $Request$>::Create("
|
||||
"channel_.get(), cq, "
|
||||
"rpcmethod_$Method$_, "
|
||||
"context, response, tag);\n"
|
||||
"}\n\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncStart"] = async_prefix.start;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncCreateArgs"] = async_prefix.create_args;
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientAsyncWriter< $Request$>* "
|
||||
"$ns$$Service$::Stub::$AsyncPrefix$$Method$Raw("
|
||||
"::grpc::ClientContext* context, $Response$* response, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Print(*vars,
|
||||
" return ::grpc::ClientAsyncWriter< $Request$>::Create("
|
||||
"channel_.get(), cq, "
|
||||
"rpcmethod_$Method$_, "
|
||||
"context, response, $AsyncStart$$AsyncCreateArgs$);\n"
|
||||
"}\n\n");
|
||||
}
|
||||
} else if (ServerOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
|
|
@ -1152,17 +1283,25 @@ void PrintSourceClientMethod(grpc_generator::Printer *printer,
|
|||
"rpcmethod_$Method$_, "
|
||||
"context, request);\n"
|
||||
"}\n\n");
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientAsyncReader< $Response$>* "
|
||||
"$ns$$Service$::Stub::Async$Method$Raw("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Print(*vars,
|
||||
" return ::grpc::ClientAsyncReader< $Response$>::Create("
|
||||
"channel_.get(), cq, "
|
||||
"rpcmethod_$Method$_, "
|
||||
"context, request, tag);\n"
|
||||
"}\n\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncStart"] = async_prefix.start;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncCreateArgs"] = async_prefix.create_args;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::ClientAsyncReader< $Response$>* "
|
||||
"$ns$$Service$::Stub::$AsyncPrefix$$Method$Raw("
|
||||
"::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Print(*vars,
|
||||
" return ::grpc::ClientAsyncReader< $Response$>::Create("
|
||||
"channel_.get(), cq, "
|
||||
"rpcmethod_$Method$_, "
|
||||
"context, request, $AsyncStart$$AsyncCreateArgs$);\n"
|
||||
"}\n\n");
|
||||
}
|
||||
} else if (method->BidiStreaming()) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
|
|
@ -1175,19 +1314,26 @@ void PrintSourceClientMethod(grpc_generator::Printer *printer,
|
|||
"rpcmethod_$Method$_, "
|
||||
"context);\n"
|
||||
"}\n\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"::grpc::ClientAsyncReaderWriter< $Request$, $Response$>* "
|
||||
"$ns$$Service$::Stub::Async$Method$Raw(::grpc::ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq, void* tag) {\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
" return "
|
||||
"::grpc::ClientAsyncReaderWriter< $Request$, $Response$>::Create("
|
||||
"channel_.get(), cq, "
|
||||
"rpcmethod_$Method$_, "
|
||||
"context, tag);\n"
|
||||
"}\n\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncStart"] = async_prefix.start;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["AsyncCreateArgs"] = async_prefix.create_args;
|
||||
printer->Print(*vars,
|
||||
"::grpc::ClientAsyncReaderWriter< $Request$, $Response$>* "
|
||||
"$ns$$Service$::Stub::$AsyncPrefix$$Method$Raw(::grpc::"
|
||||
"ClientContext* context, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$) {\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
" return "
|
||||
"::grpc::ClientAsyncReaderWriter< $Request$, $Response$>::Create("
|
||||
"channel_.get(), cq, "
|
||||
"rpcmethod_$Method$_, "
|
||||
"context, $AsyncStart$$AsyncCreateArgs$);\n"
|
||||
"}\n\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1478,50 +1624,83 @@ void PrintMockClientMethods(grpc_generator::Printer *printer,
|
|||
(*vars)["Request"] = method->input_type_name();
|
||||
(*vars)["Response"] = method->output_type_name();
|
||||
|
||||
struct {
|
||||
grpc::string prefix;
|
||||
grpc::string method_params; // extra arguments to method
|
||||
int extra_method_param_count;
|
||||
} async_prefixes[] = {{"Async", ", void* tag", 1}, {"PrepareAsync", "", 0}};
|
||||
|
||||
if (method->NoStreaming()) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"MOCK_METHOD3($Method$, ::grpc::Status(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, $Response$* response));\n");
|
||||
printer->Print(*vars,
|
||||
"MOCK_METHOD3(Async$Method$Raw, "
|
||||
"::grpc::ClientAsyncResponseReaderInterface< $Response$>*"
|
||||
"(::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq));\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
printer->Print(
|
||||
*vars,
|
||||
"MOCK_METHOD3($AsyncPrefix$$Method$Raw, "
|
||||
"::grpc::ClientAsyncResponseReaderInterface< $Response$>*"
|
||||
"(::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq));\n");
|
||||
}
|
||||
} else if (ClientOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"MOCK_METHOD2($Method$Raw, "
|
||||
"::grpc::ClientWriterInterface< $Request$>*"
|
||||
"(::grpc::ClientContext* context, $Response$* response));\n");
|
||||
printer->Print(*vars,
|
||||
"MOCK_METHOD4(Async$Method$Raw, "
|
||||
"::grpc::ClientAsyncWriterInterface< $Request$>*"
|
||||
"(::grpc::ClientContext* context, $Response$* response, "
|
||||
"::grpc::CompletionQueue* cq, void* tag));\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["MockArgs"] =
|
||||
flatbuffers::NumToString(3 + async_prefix.extra_method_param_count);
|
||||
printer->Print(*vars,
|
||||
"MOCK_METHOD$MockArgs$($AsyncPrefix$$Method$Raw, "
|
||||
"::grpc::ClientAsyncWriterInterface< $Request$>*"
|
||||
"(::grpc::ClientContext* context, $Response$* response, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$));\n");
|
||||
}
|
||||
} else if (ServerOnlyStreaming(method)) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"MOCK_METHOD2($Method$Raw, "
|
||||
"::grpc::ClientReaderInterface< $Response$>*"
|
||||
"(::grpc::ClientContext* context, const $Request$& request));\n");
|
||||
printer->Print(*vars,
|
||||
"MOCK_METHOD4(Async$Method$Raw, "
|
||||
"::grpc::ClientAsyncReaderInterface< $Response$>*"
|
||||
"(::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq, void* tag));\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["MockArgs"] =
|
||||
flatbuffers::NumToString(3 + async_prefix.extra_method_param_count);
|
||||
printer->Print(
|
||||
*vars,
|
||||
"MOCK_METHOD$MockArgs$($AsyncPrefix$$Method$Raw, "
|
||||
"::grpc::ClientAsyncReaderInterface< $Response$>*"
|
||||
"(::grpc::ClientContext* context, const $Request$& request, "
|
||||
"::grpc::CompletionQueue* cq$AsyncMethodParams$));\n");
|
||||
}
|
||||
} else if (method->BidiStreaming()) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
"MOCK_METHOD1($Method$Raw, "
|
||||
"::grpc::ClientReaderWriterInterface< $Request$, $Response$>*"
|
||||
"(::grpc::ClientContext* context));\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"MOCK_METHOD3(Async$Method$Raw, "
|
||||
"::grpc::ClientAsyncReaderWriterInterface<$Request$, $Response$>*"
|
||||
"(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, "
|
||||
"void* tag));\n");
|
||||
for (size_t i = 0; i < sizeof(async_prefixes)/sizeof(async_prefixes[0]); i ++) {
|
||||
auto& async_prefix = async_prefixes[i];
|
||||
(*vars)["AsyncPrefix"] = async_prefix.prefix;
|
||||
(*vars)["AsyncMethodParams"] = async_prefix.method_params;
|
||||
(*vars)["MockArgs"] =
|
||||
flatbuffers::NumToString(2 + async_prefix.extra_method_param_count);
|
||||
printer->Print(
|
||||
*vars,
|
||||
"MOCK_METHOD$MockArgs$($AsyncPrefix$$Method$Raw, "
|
||||
"::grpc::ClientAsyncReaderWriterInterface<$Request$, $Response$>*"
|
||||
"(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq"
|
||||
"$AsyncMethodParams$));\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue