From 02c6d3fb4d3d21b507594fbc34a1f6f2ca6f820c Mon Sep 17 00:00:00 2001
From: Chris Freehill <Chris.Freehill@amd.com>
Date: Mon, 6 Jan 2020 20:32:55 -0600
Subject: [PATCH] Add use of namespaces

Change-Id: I962eb808b3b874d1c3bf4cb418bf36952f88e3e2
---
 docs/RDC_Manual.pdf                    | Bin 68078 -> 68078 bytes
 server/include/rdc/rdc_admin_service.h |  10 ++++++++--
 server/include/rdc/rdc_rsmi_service.h  |   6 ++++++
 server/include/rdc/rdc_server_main.h   |   4 ++--
 server/src/rdc_admin_service.cc        |  10 ++++++++--
 server/src/rdc_rsmi_service.cc         |   6 ++++++
 server/src/rdc_server_main.cc          |   4 ++--
 7 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/docs/RDC_Manual.pdf b/docs/RDC_Manual.pdf
index b2523025d97c0733b551250862807c846bb13353..e6471f7c5c85a22a879e7d884a211db736e51307 100644
GIT binary patch
delta 106
zcmaDindRMNmJOM|*^CT~jf@Q@=l_<4GB;29eVxbI+1%N{(b3S=#L>*s(ACAn#M#2Y
b$jH#b)!EU-)zHz<PQiwdlI?3a7@Zga2$>!D

delta 106
zcmaDindRMNmJOM|*$fR#EKH0i=l_<4GB;29eVxbIz}Usr+0xa;(9y-x*x1Fy(b37o
b%+b}=&A{B))WzAwPQiwdlI?3a7@ZgaAzB`a

diff --git a/server/include/rdc/rdc_admin_service.h b/server/include/rdc/rdc_admin_service.h
index c0f8d0c1ce..251824a20d 100755
--- a/server/include/rdc/rdc_admin_service.h
+++ b/server/include/rdc/rdc_admin_service.h
@@ -26,14 +26,20 @@ THE SOFTWARE.
 #include "rocm_smi/rocm_smi.h"
 #include "rdc/rdc_admin_service.h"
 
+namespace amd {
+namespace rdc {
+
 class RDCAdminServiceImpl final : public ::rdc::RdcAdmin::Service {
  public:
     RDCAdminServiceImpl();
     ~RDCAdminServiceImpl();
     ::grpc::Status VerifyConnection(::grpc::ServerContext* context,
-                                const rdc::VerifyConnectionRequest* request,
-                              rdc::VerifyConnectionResponse* reply) override;
+                                const ::rdc::VerifyConnectionRequest* request,
+                              ::rdc::VerifyConnectionResponse* reply) override;
  private:
 };
 
+} // namespace rdc
+} // namespace amd
+
 #endif  // SERVER_INCLUDE_RDC_RDC_ADMIN_SERVICE_H_
diff --git a/server/include/rdc/rdc_rsmi_service.h b/server/include/rdc/rdc_rsmi_service.h
index a420cfe311..4ef2778701 100755
--- a/server/include/rdc/rdc_rsmi_service.h
+++ b/server/include/rdc/rdc_rsmi_service.h
@@ -26,6 +26,9 @@ THE SOFTWARE.
 #include "rocm_smi/rocm_smi.h"
 #include "rdc/rdc_rsmi_service.h"
 
+namespace amd {
+namespace rdc {
+
 class RsmiServiceImpl final : public ::rdc::Rsmi::Service {
  public:
     RsmiServiceImpl();
@@ -47,4 +50,7 @@ class RsmiServiceImpl final : public ::rdc::Rsmi::Service {
     bool rsmi_initialized_;
 };
 
+}  // rdc
+}  // amd
+
 #endif  // SERVER_INCLUDE_RDC_RDC_RSMI_SERVICE_H_
diff --git a/server/include/rdc/rdc_server_main.h b/server/include/rdc/rdc_server_main.h
index 5af7a32e0b..85d3015f59 100755
--- a/server/include/rdc/rdc_server_main.h
+++ b/server/include/rdc/rdc_server_main.h
@@ -53,10 +53,10 @@ class RDCServer {
     std::unique_ptr<::grpc::Server> server_;
 
     bool start_rsmi_service_;
-    RsmiServiceImpl *rsmi_service_;
+    amd::rdc::RsmiServiceImpl *rsmi_service_;
 
     bool start_rdc_admin_service_;
-    RDCAdminServiceImpl *rdc_admin_service_;
+    amd::rdc::RDCAdminServiceImpl *rdc_admin_service_;
 };
 
 #endif  // SERVER_INCLUDE_RDC_RDC_SERVER_MAIN_H_
diff --git a/server/src/rdc_admin_service.cc b/server/src/rdc_admin_service.cc
index af4e3aa917..30b3d2020e 100755
--- a/server/src/rdc_admin_service.cc
+++ b/server/src/rdc_admin_service.cc
@@ -33,6 +33,9 @@ THE SOFTWARE.
 #include "rdc.grpc.pb.h"  // NOLINT
 #include "rdc/rdc_admin_service.h"
 
+namespace amd {
+namespace rdc {
+
 RDCAdminServiceImpl::RDCAdminServiceImpl() {
 }
 
@@ -40,10 +43,13 @@ RDCAdminServiceImpl::~RDCAdminServiceImpl() {
 }
 ::grpc::Status
 RDCAdminServiceImpl::VerifyConnection(::grpc::ServerContext* context,
-                            const rdc::VerifyConnectionRequest* request,
-                              rdc::VerifyConnectionResponse* reply) {
+                            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;
 }
+
+}  // rdc
+}  // amd
diff --git a/server/src/rdc_rsmi_service.cc b/server/src/rdc_rsmi_service.cc
index 1c75a22ee5..f588b1f8c2 100755
--- a/server/src/rdc_rsmi_service.cc
+++ b/server/src/rdc_rsmi_service.cc
@@ -32,6 +32,9 @@ THE SOFTWARE.
 #include "rocm_smi/rocm_smi.h"
 #include "rdc/rdc_rsmi_service.h"
 
+namespace amd {
+namespace rdc {
+
 RsmiServiceImpl::RsmiServiceImpl():rsmi_initialized_(false) {
 }
 
@@ -127,3 +130,6 @@ void RunServer() {
   }
   server->Wait();
 }
+
+}  // namespace rdc
+}  // namespace amd
diff --git a/server/src/rdc_server_main.cc b/server/src/rdc_server_main.cc
index ba2333d32a..0a5b95143b 100755
--- a/server/src/rdc_server_main.cc
+++ b/server/src/rdc_server_main.cc
@@ -67,12 +67,12 @@ 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();
+    rdc_admin_service_ = new amd::rdc::RDCAdminServiceImpl();
     builder.RegisterService(rdc_admin_service_);
   }
 
   if (start_rsmi_service()) {
-    rsmi_service_ = new RsmiServiceImpl();
+    rsmi_service_ = new amd::rdc::RsmiServiceImpl();
     builder.RegisterService(rsmi_service_);
 
     // TODO(cfreehil): pass flags from cnfg file