diff options
author | Yang Gao <yangg@google.com> | 2015-03-12 16:40:19 -0700 |
---|---|---|
committer | Yang Gao <yangg@google.com> | 2015-03-12 16:40:19 -0700 |
commit | 4999649653b9262d661eb833724ee28cefedb2bd (patch) | |
tree | 81fde27cf3ed59fa2400b892c31fb49873942d46 /src/cpp/server | |
parent | 179f8684dc87bfccf9b74968afe96fc371eb170e (diff) |
Rename to AsyncGeneric*
Diffstat (limited to 'src/cpp/server')
-rw-r--r-- | src/cpp/server/async_generic_service.cc (renamed from src/cpp/server/generic_service.cc) | 10 | ||||
-rw-r--r-- | src/cpp/server/server.cc | 10 | ||||
-rw-r--r-- | src/cpp/server/server_builder.cc | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/cpp/server/generic_service.cc b/src/cpp/server/async_generic_service.cc index 8ced775a67..67241fee7e 100644 --- a/src/cpp/server/generic_service.cc +++ b/src/cpp/server/async_generic_service.cc @@ -31,16 +31,16 @@ * */ -#include <grpc++/generic_service.h> +#include <grpc++/async_generic_service.h> #include <grpc++/server.h> namespace grpc { -void GenericService::RequestCall(GenericServerContext* ctx, - GenericServerReaderWriter* reader_writer, - CompletionQueue* cq, void* tag) { - server_->RequestGenericCall(ctx, reader_writer, cq, tag); +void AsyncGenericService::RequestCall( + GenericServerContext* ctx, GenericServerAsyncReaderWriter* reader_writer, + CompletionQueue* cq, void* tag) { + server_->RequestAsyncGenericCall(ctx, reader_writer, cq, tag); } } // namespace grpc diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index f72b8a30a6..cc632a7192 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -39,7 +39,7 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc++/completion_queue.h> -#include <grpc++/generic_service.h> +#include <grpc++/async_generic_service.h> #include <grpc++/impl/rpc_service_method.h> #include <grpc++/impl/service_type.h> #include <grpc++/server_context.h> @@ -228,7 +228,7 @@ bool Server::RegisterAsyncService(AsynchronousService* service) { return true; } -void Server::RegisterGenericService(GenericService* service) { +void Server::RegisterAsyncGenericService(AsyncGenericService* service) { GPR_ASSERT(service->server_ == nullptr && "Can only register an generic service against one server."); service->server_ = this; @@ -395,9 +395,9 @@ void Server::RequestAsyncCall(void* registered_method, ServerContext* context, new AsyncRequest(this, registered_method, context, request, stream, cq, tag); } -void Server::RequestGenericCall(GenericServerContext* context, - ServerAsyncStreamingInterface* stream, - CompletionQueue* cq, void* tag) { +void Server::RequestAsyncGenericCall(GenericServerContext* context, + ServerAsyncStreamingInterface* stream, + CompletionQueue* cq, void* tag) { new AsyncRequest(this, context, stream, cq, tag); } diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 083509e797..835596d393 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -52,10 +52,10 @@ void ServerBuilder::RegisterAsyncService(AsynchronousService* service) { async_services_.push_back(service); } -void ServerBuilder::RegisterGenericService(GenericService* service) { +void ServerBuilder::RegisterAsyncGenericService(AsyncGenericService* service) { if (generic_service_) { gpr_log(GPR_ERROR, - "Adding multiple GenericService is unsupported for now. " + "Adding multiple AsyncGenericService is unsupported for now. " "Dropping the service %p", service); return; } @@ -96,7 +96,7 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { } } if (generic_service_) { - server->RegisterGenericService(generic_service_); + server->RegisterAsyncGenericService(generic_service_); } for (auto& port : ports_) { int r = server->AddPort(port.addr, port.creds.get()); |