Change interface name in .proto file

Change-Id: Icac22f7764d58c354d7c83cc1a0c4870fbe4a5b3
Signed-off-by: jh9216.park <jh9216.park@samsung.com>

diff --git a/benchmark/server/grpc/CMakeLists.txt b/benchmark/server/grpc/CMakeLists.txt
index 067c56bb56c8c486c88003bca678bf8942d5a7f6..2d2b16a808260ca8aaa30b3db36035cd7d452724 100644 (file)
--- a/benchmark/server/grpc/CMakeLists.txt
+++ b/benchmark/server/grpc/CMakeLists.txt
@@ -18,8 +18,6 @@ ADD_CUSTOM_COMMAND(
         "${hw_proto}"
       DEPENDS "${hw_proto}")
 
-#include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} BENCHMARK_SERVER_GRPC_SRCS)
 ADD_EXECUTABLE(${TARGET_BENCHMARK_SERVER_GRPC}
   ${hw_proto_srcs}

diff --git a/benchmark/server/grpc/grpc_bench_server.cc b/benchmark/server/grpc/grpc_bench_server.cc
index ab8edb1dbdcd860cafb7a2c1b8c448764c51f2b3..dca5eb842e43f44a4ace6a7a18c2cd35a627ae74 100644 (file)
--- a/benchmark/server/grpc/grpc_bench_server.cc
+++ b/benchmark/server/grpc/grpc_bench_server.cc
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -10,14 +26,14 @@ using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerContext;
 using grpc::Status;
-using grpcbench::Greeter;
-using grpcbench::HelloReply;
-using grpcbench::HelloRequest;
-
-class GreeterServiceImpl final : public Greeter::Service {
-  Status SayHello(ServerContext* context, const HelloRequest* request,
-                  HelloReply* reply) override {
-    reply->set_message(0);
+using grpcbench::Benchmark;
+using grpcbench::TestReply;
+using grpcbench::TestRequest;
+
+class BenchmarkServiceImpl final : public Benchmark::Service {
+  Status Test(ServerContext* context, const TestRequest* request,
+      TestReply* reply) override {
+    reply->set_ret(0);
     return Status::OK;
   }
 };
@@ -25,9 +41,9 @@ class GreeterServiceImpl final : public Greeter::Service {
 int main(int argc, char** argv) {
   std::string server_address("unix:///tmp/test.socket");
 
-  GreeterServiceImpl service;
-
+  BenchmarkServiceImpl service;
   ServerBuilder builder;
+
   builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
   builder.RegisterService(&service);
   std::unique_ptr<Server> server(builder.BuildAndStart());
@@ -36,4 +52,4 @@ int main(int argc, char** argv) {
   server->Wait();
 
   return 0;
-}
\ No newline at end of file
+}

diff --git a/benchmark/server/grpc/grpcbench.proto b/benchmark/server/grpc/grpcbench.proto
index 797e3799aab8d6febc334615305a29bd7c24cd2a..57f72710ae6d22518af8e2783c761adc818d97dd 100644 (file)
--- a/benchmark/server/grpc/grpcbench.proto
+++ b/benchmark/server/grpc/grpcbench.proto
@@ -3,17 +3,16 @@ syntax = "proto3";
 package grpcbench;
 
 // The greeting service definition.
-service Greeter {
-  // Sends a greeting
-  rpc SayHello (HelloRequest) returns (HelloReply) {}
+service Benchmark {
+  rpc Test (TestRequest) returns (TestReply) {}
 }
 
 // The request message containing the user's name.
-message HelloRequest {
-  string name = 1;
+message TestRequest {
+  string data = 1;
 }
 
 // The response message containing the greetings
-message HelloReply {
-  int32 message = 1;
+message TestReply {
+  int32 ret = 1;
 }

diff --git a/benchmark/tool/grpc-proxy.cc b/benchmark/tool/grpc-proxy.cc
index de41800e3f31f05153229270f5fdaa28b2a6572d..d2a675d099a7b17808f53f84681e2d719b601289 100644 (file)
--- a/benchmark/tool/grpc-proxy.cc
+++ b/benchmark/tool/grpc-proxy.cc
@@ -26,19 +26,19 @@ void GrpcProxy::Connect() {
   std::string target_str("unix:///tmp/test.socket");
   channel_ = grpc::CreateChannel(target_str,
       grpc::InsecureChannelCredentials());
-  stub_ = grpcbench::Greeter::NewStub(channel_);
+  stub_ = grpcbench::Benchmark::NewStub(channel_);
 }
 
 int GrpcProxy::Test(std::string data) const {
-  grpcbench::HelloRequest request;
-  request.set_name(data);
+  grpcbench::TestRequest request;
+  request.set_data(data);
 
   grpc::ClientContext context;
-  grpcbench::HelloReply response;
+  grpcbench::TestReply response;
 
-  grpc::Status status = stub_->SayHello(&context, request, &response);
+  grpc::Status status = stub_->Test(&context, request, &response);
   if (status.ok()) {
-    int ret = response.message();
+    int ret = response.ret();
     return ret;
   }
 

diff --git a/benchmark/tool/grpc-proxy.hh b/benchmark/tool/grpc-proxy.hh
index a9357eb8d1080593b0bc16ebecb0e305aa880472..53801529aad6865a91c7db37a86ecf170947e119 100644 (file)
--- a/benchmark/tool/grpc-proxy.hh
+++ b/benchmark/tool/grpc-proxy.hh
@@ -34,7 +34,7 @@ class GrpcProxy {
   int Test(std::string data) const;
 
  private:
-  std::unique_ptr<grpcbench::Greeter::Stub> stub_;
+  std::unique_ptr<grpcbench::Benchmark::Stub> stub_;
   std::shared_ptr<grpc::Channel> channel_;
 };
 

diff --git a/benchmark/tool/grpcbench.proto b/benchmark/tool/grpcbench.proto
index 797e3799aab8d6febc334615305a29bd7c24cd2a..57f72710ae6d22518af8e2783c761adc818d97dd 100644 (file)
--- a/benchmark/tool/grpcbench.proto
+++ b/benchmark/tool/grpcbench.proto
@@ -3,17 +3,16 @@ syntax = "proto3";
 package grpcbench;
 
 // The greeting service definition.
-service Greeter {
-  // Sends a greeting
-  rpc SayHello (HelloRequest) returns (HelloReply) {}
+service Benchmark {
+  rpc Test (TestRequest) returns (TestReply) {}
 }
 
 // The request message containing the user's name.
-message HelloRequest {
-  string name = 1;
+message TestRequest {
+  string data = 1;
 }
 
 // The response message containing the greetings
-message HelloReply {
-  int32 message = 1;
+message TestReply {
+  int32 ret = 1;
 }