Break srvs. into rsmi & admin srvs. Add VerifyConnection api.

Change-Id: I67567264c37e31f3409062a14e56eba4801cd944


[ROCm/rdc commit: dc6f6f3e9a]

projects/rdc/server/src/rdc_admin_service.cc

@@ -0,0 +1,49 @@
+
+/*
+Copyright (c) 2019 - present Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+#include <assert.h>
+#include <grpcpp/grpcpp.h>
+#include <unistd.h>
+
+#include <iostream>
+#include <sstream>
+#include <memory>
+#include <string>
+#include <csignal>
+
+#include "rdc.grpc.pb.h"  // NOLINT
+#include "rdc/rdc_admin_service.h"
+
+RDCAdminServiceImpl::RDCAdminServiceImpl() {
+}
+
+RDCAdminServiceImpl::~RDCAdminServiceImpl() {
+}
+::grpc::Status
+RDCAdminServiceImpl::VerifyConnection(::grpc::ServerContext* context,
+                            const rdc::VerifyConnectionRequest* request,
+                              rdc::VerifyConnectionResponse* reply) {
+  (void)context;  // Quiet warning for now
+
+  reply->set_echo_magic_num(request->magic_num());
+  return ::grpc::Status::OK;
+}

projects/rdc/server/src/rdc_rsmi_service.cc

@@ -61,15 +61,6 @@ RsmiServiceImpl::Initialize(uint64_t rsmi_init_flags) {
   }
   return rsmi_ret;
 }
-::grpc::Status
-RsmiServiceImpl::VerifyConnection(::grpc::ServerContext* context,
-                            const rdc::VerifyConnectionRequest* request,
-                              rdc::VerifyConnectionResponse* reply) {
-  (void)context;  // Quiet warning for now
-  std::string prefix("Hello ");
-  reply->set_message(prefix + request->name());
-  return ::grpc::Status::OK;
-}
 
 ::grpc::Status
 RsmiServiceImpl::GetNumDevices(::grpc::ServerContext* context,

projects/rdc/server/src/rdc_server_main.cc

@@ -36,7 +36,7 @@ THE SOFTWARE.
 
 #include "rdc.grpc.pb.h"  // NOLINT
 #include "rocm_smi/rocm_smi.h"
-#include "rdc/rdc_main.h"
+#include "rdc/rdc_server_main.h"
 #include "rdc/rdc_rsmi_service.h"
 
 static bool sShutDownServer = false;
@@ -46,7 +46,7 @@ static const char *kRDCDHomeDir = "/";
 static const char *kDaemonLockFile = "/var/run/rdcd.lock";
 
 RDCServer::RDCServer() : server_address_("0.0.0.0:50051"),
-                                                      rsmi_service_(nullptr) {
+                         rsmi_service_(nullptr), rdc_admin_service_(nullptr) {
 }
 
 RDCServer::~RDCServer() {
@@ -66,6 +66,10 @@ RDCServer::Run() {
 
   // Register services as the instances through which we'll communicate with
   // clients. These are synchronous services.
+  if (start_rdc_admin_service()) {
+    rdc_admin_service_ = new RDCAdminServiceImpl();
+    builder.RegisterService(rdc_admin_service_);
+  }
 
   if (start_rsmi_service()) {
     rsmi_service_ = new RsmiServiceImpl();
@@ -125,6 +129,11 @@ RDCServer::ShutDown(void) {
     delete rsmi_service_;
     rsmi_service_ = nullptr;
   }
+
+  if (rdc_admin_service_) {
+    delete rdc_admin_service_;
+    rdc_admin_service_ = nullptr;
+  }
 }
 
 static void * ProcessSignalLoop(void *server_ptr) {
@@ -268,6 +277,8 @@ int main(int argc, char** argv) {
 
   // TODO(cfreehil): Eventually, set these by reading a config file
   rdc_server.set_start_rsmi_service(true);
+  rdc_server.set_start_rdc_admin_service(true);
+
   // rdc_server.set_secure_communications(false);
   // rdc_server.set_address("0.0.0.0:50051")