diff options
Diffstat (limited to 'contrib/protoc-bnet')
| -rw-r--r-- | contrib/protoc-bnet/BnetFileGenerator.cpp | 8 | ||||
| -rw-r--r-- | contrib/protoc-bnet/BnetServiceGenerator.cpp | 32 |
2 files changed, 24 insertions, 16 deletions
diff --git a/contrib/protoc-bnet/BnetFileGenerator.cpp b/contrib/protoc-bnet/BnetFileGenerator.cpp index 912a3d75a78..1afe3edbd25 100644 --- a/contrib/protoc-bnet/BnetFileGenerator.cpp +++ b/contrib/protoc-bnet/BnetFileGenerator.cpp @@ -354,16 +354,14 @@ void BnetFileGenerator::GenerateSource(pb::io::Printer* printer) printer->Print("#include \"Log.h\"\n"); if (file_->service_count() > 0) + { + printer->Print("#include \"Errors.h\"\n"); printer->Print("#include \"BattlenetRpcErrorCodes.h\"\n"); + } printer->Print( "// @@protoc_insertion_point(includes)\n"); - printer->Print("\n// Fix stupid windows.h included from Log.h->Common.h\n"); - printer->Print("#ifdef SendMessage\n"); - printer->Print("#undef SendMessage\n"); - printer->Print("#endif\n"); - GenerateNamespaceOpeners(printer); if (pbcpp::HasDescriptorMethods(file_)) diff --git a/contrib/protoc-bnet/BnetServiceGenerator.cpp b/contrib/protoc-bnet/BnetServiceGenerator.cpp index 29afb07b23e..4dadfda1e78 100644 --- a/contrib/protoc-bnet/BnetServiceGenerator.cpp +++ b/contrib/protoc-bnet/BnetServiceGenerator.cpp @@ -117,7 +117,7 @@ void BnetServiceGenerator::GenerateServerMethodSignatures(pb::io::Printer* print sub_vars["output_type"] = pbcpp::ClassName(method->output_type(), true); if (method->output_type()->name() != "NO_RESPONSE") - printer->Print(sub_vars, "virtual uint32 Handle$name$($input_type$ const* request, $output_type$* response);\n"); + printer->Print(sub_vars, "virtual uint32 Handle$name$($input_type$ const* request, $output_type$* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);\n"); else printer->Print(sub_vars, "virtual uint32 Handle$name$($input_type$ const* request);\n"); } @@ -191,7 +191,7 @@ void BnetServiceGenerator::GenerateClientMethodImplementations(pb::io::Printer* else { printer->Print(sub_vars, - "void $classname$::$name$($input_type$ const* request) { \n" + "void $classname$::$name$($input_type$ const* request) {\n" " TC_LOG_DEBUG(\"service.protobuf\", \"%s Server called client method $full_name$($input_type_name${ %s })\",\n" " GetCallerInfo().c_str(), request->ShortDebugString().c_str());\n" " SendRequest(service_hash_, $method_id$, request);\n" @@ -214,6 +214,7 @@ void BnetServiceGenerator::GenerateServerCallMethod(pb::io::Printer* printer) continue; std::map<std::string, std::string> sub_vars; + sub_vars["classname"] = vars_["classname"]; sub_vars["name"] = method->name(); sub_vars["full_name"] = descriptor_->name() + "." + method->name(); sub_vars["method_id"] = pb::SimpleItoa(method->options().GetExtension(Battlenet::method_id)); @@ -230,20 +231,29 @@ void BnetServiceGenerator::GenerateServerCallMethod(pb::io::Printer* printer) " SendResponse(service_hash_, $method_id$, token, ERROR_RPC_MALFORMED_REQUEST);\n" " return;\n" " }\n" - "\n" ); if (method->output_type()->name() != "NO_RESPONSE") { printer->Print(sub_vars, + " TC_LOG_DEBUG(\"service.protobuf\", \"%s Client called server method $full_name$($input_type_name${ %s }).\",\n" + " GetCallerInfo().c_str(), request.ShortDebugString().c_str());\n" + " std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = [token](ServiceBase* service, uint32 status, ::google::protobuf::Message const* response)\n" + " {\n" + " ASSERT(response->GetDescriptor() == $output_type$::descriptor());\n" + " $classname$* self = static_cast<$classname$*>(service);\n" + " TC_LOG_DEBUG(\"service.protobuf\", \"%s Client called server method $full_name$() returned $output_type_name${ %s } status %u.\",\n" + " self->GetCallerInfo().c_str(), response->ShortDebugString().c_str(), status);\n" + " if (!status)\n" + " self->SendResponse(self->service_hash_, $method_id$, token, response);\n" + " else\n" + " self->SendResponse(self->service_hash_, $method_id$, token, status);\n" + " };\n" " $output_type$ response;\n" - " uint32 status = Handle$name$(&request, &response);\n" - " TC_LOG_DEBUG(\"service.protobuf\", \"%s Client called server method $full_name$($input_type_name${ %s }) returned $output_type_name${ %s } status %u.\",\n" - " GetCallerInfo().c_str(), request.ShortDebugString().c_str(), response.ShortDebugString().c_str(), status);\n" - " if (!status)\n" - " SendResponse(service_hash_, $method_id$, token, &response);\n" - " else\n" - " SendResponse(service_hash_, $method_id$, token, status);\n"); + " uint32 status = Handle$name$(&request, &response, continuation);\n" + " if (continuation)\n" + " continuation(this, status, &response);\n" + ); } else { @@ -287,7 +297,7 @@ void BnetServiceGenerator::GenerateServerImplementations(pb::io::Printer* printe if (method->output_type()->name() != "NO_RESPONSE") { - printer->Print(sub_vars, "uint32 $classname$::Handle$name$($input_type$ const* request, $output_type$* response) {\n" + printer->Print(sub_vars, "uint32 $classname$::Handle$name$($input_type$ const* request, $output_type$* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {\n" " TC_LOG_ERROR(\"service.protobuf\", \"%s Client tried to call not implemented method $full_name$({ %s })\",\n" " GetCallerInfo().c_str(), request->ShortDebugString().c_str());\n" " return ERROR_RPC_NOT_IMPLEMENTED;\n" |