Run gRPC service independently

Author: elviscapiaq

capture_service/server.h

@@ -18,5 +18,6 @@ limitations under the License.
 
 namespace Dive
 {
-int server_main();
-}
+void StopServer();
+int  server_main();
+}  // namespace Dive

capture_service/service.cc

@@ -132,6 +132,22 @@ grpc::Status DiveServiceImpl::DownloadFile(grpc::ServerContext             *cont
     return grpc::Status::OK;
 }
 
+std::unique_ptr<grpc::Server> &GetServer()
+{
+    static std::unique_ptr<grpc::Server> server = nullptr;
+    return server;
+}
+
+void StopServer()
+{
+    auto &server = GetServer();
+    if (server)
+    {
+        LOGI("StopServer at service.cc");
+        server->Shutdown();
+    }
+}
+
 void RunServer(uint16_t port)
 {
     std::string     server_address = absl::StrFormat("0.0.0.0:%d", port);
@@ -142,7 +158,8 @@ void RunServer(uint16_t port)
     builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
 
     builder.RegisterService(&service);
-    std::unique_ptr<grpc::Server> server(builder.BuildAndStart());
+    auto &server = GetServer();
+    server = builder.BuildAndStart();
     LOGI("Server listening on %s", server_address.c_str());
     server->Wait();
 }

layer/layer_common.cc

@@ -77,4 +77,20 @@ ServerRunner &GetServerRunner()
     return runner;
 }
 
+Server::Server()
+{
+    server_thread = std::thread(Dive::server_main);
+}
+
+void Server::StopServer()
+{
+    Dive::StopServer();
+    if (server_thread.joinable())
+    {
+        server_thread.join();
+    }
+}
+
+Server server;
+
 }  // namespace DiveLayer

layer/layer_common.h

@@ -42,4 +42,13 @@ class ServerRunner
 
 ServerRunner &GetServerRunner();
 
+struct Server
+{
+    std::thread server_thread;
+    Server();
+    void StopServer();
+};
+
+extern Server server;
+
 }  // namespace DiveLayer

layer/openxr_layer.cc

@@ -56,12 +56,6 @@ struct XrSessionData
 {
     XrSession                session;
     XrGeneratedDispatchTable dispatch_table;
-    ServerRunner            &server;
-
-    XrSessionData() :
-        server(GetServerRunner())
-    {
-    }
 };
 
 static thread_local XrInstanceData *last_used_xr_instance_data = nullptr;
@@ -190,7 +184,7 @@ XRAPI_ATTR XrResult XRAPI_CALL ApiDiveLayerXrDestroyInstance(XrInstance instance
 
     LOGD("ApiDiveLayerXrDestroyInstance\n");
     XrResult result = XR_SUCCESS;
-
+    server.StopServer();
     auto sess_data = GetXrInstanceLayerData(DataKey(instance));
     if (sess_data)
     {

layer/vk_layer_base.cc

@@ -43,12 +43,6 @@ struct InstanceData
 {
     VkInstance            instance;
     InstanceDispatchTable dispatch_table;
-    ServerRunner         &server;
-
-    InstanceData() :
-        server(GetServerRunner())
-    {
-    }
 };
 
 struct DeviceData
@@ -515,6 +509,10 @@ extern "C"
             return (PFN_vkVoidFunction)&DiveInterceptEnumerateInstanceExtensionProperties;
         if (0 == strcmp(func, "vkCreateInstance"))
             return (PFN_vkVoidFunction)&DiveInterceptCreateInstance;
+        if (0 == strcmp(func, "vkDestroyInstance"))
+        {
+            LOGI("vkDestroyInstance");
+        }
         if (inst == VK_NULL_HANDLE)
             return NULL;