Changeset 86871 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

Timestamp:

Nov 12, 2020 10:15:18 AM (4 years ago)

Author:

vboxsync

Message:

Additions/VBoxClient: Big revamp of the internal service handling and termination fixes. A service now runs as part of a worker thread, while the main thread is used for initialization / shutdown and signal handling.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -733 +733 @@
  * it (guest property) is set.
  */
-static bool checkDRMClient()
+static bool checkDRMClient(void)
 {
    uint32_t uGuestPropSvcClientID;
@@ -745 +745 @@
 }
 
-static bool startDRMClient()
+static bool startDRMClient(void)
 {
     char* argv[] = {NULL};
@@ -755 +755 @@
     int rc = execve(szDRMClientPath, argv, env);
     if (rc == -1)
-        VBClLogFatalError("execve for % returns the following error %d %s\n", szDRMClientPath, errno, strerror(errno));
+        VBClLogFatalError("execve for '%s' returns the following error %d: %s\n", szDRMClientPath, errno, strerror(errno));
     /* This is reached only when execve fails. */
     return false;
 }
 
-static bool init()
-{
+/** @copydoc VBCLSERVICE::pfnInit */
+static int vbclSVGAInit(void)
+{
+    /* In 32-bit guests GAs build on our release machines causes an xserver hang.
+     * So for 32-bit GAs we use our DRM client. */
+#if ARCH_BITS == 32
+    /* igore rc */ startDRMClient();
+    return VERR_NOT_AVAILABLE;
+#endif
+
     /* If DRM client is already running don't start this service. */
     if (checkDRMClient())
     {
         VBClLogFatalError("DRM resizing is already running. Exiting this service\n");
-        return false;
+        return VERR_NOT_AVAILABLE;
     }
     if (isXwayland())
@@ -781 +789 @@
 }
 
-static void cleanup()
+/** @copydoc VBCLSERVICE::pfnStop */
+static void vbclSVGAStop(void)
 {
     if (mpMonitorPositions)
@@ -788 +797 @@
         mpMonitorPositions = NULL;
     }
-    stopX11MonitorThread();
+
+    stopX11MonitorThread(); /** @todo r=andy We ignore rc!? */
+
     if (x11Context.pRandLibraryHandle)
     {
@@ -1331 +1342 @@
 }
 
-static const char *getName()
-{
-    return "Display SVGA X11";
-}
-
-static const char *getPidFilePath()
-{
-    return ".vboxclient-display-svga-x11.pid";
-}
-
-static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
-{
-    RT_NOREF(ppInterface, fDaemonised);
-
-    /* In 32-bit guests GAs build on our release machines causes an xserver hang.
-     * So for 32-bit GAs we use our DRM client. */
-#if ARCH_BITS == 32
-    startDRMClient();
-    return VERR_NOT_AVAILABLE;
-#endif
-
-    if (!init())
-        return VERR_NOT_AVAILABLE;
+static int vbclSVGAWorker(bool volatile *pfShutdown)
+{
+    RT_NOREF(pfShutdown);
 
     /* Do not acknowledge the first event we query for to pick up old events,
@@ -1369 +1360 @@
     if (rc == VERR_RESOURCE_BUSY)  /* Someone else has already acquired it. */
         return VERR_RESOURCE_BUSY;
+
+    /* Let the main thread know that it can continue spawning services. */
+    RTThreadUserSignal(RTThreadSelf());
+
     for (;;)
     {
@@ -1442 +1437 @@
             VBClLogFatalError("Failure waiting for event, rc=%Rrc\n", rc);
     }
-    cleanup();
-}
-
-static struct VBCLSERVICE interface =
-{
-    getName,
-    getPidFilePath,
-    VBClServiceDefaultHandler, /* Init */
-    run,
-    VBClServiceDefaultCleanup
-}, *pInterface = &interface;
-
-struct VBCLSERVICE **VBClDisplaySVGAX11Service()
-{
-    return &pInterface;
-}
+}
+
+VBCLSERVICE g_SvcDisplaySVGA =
+{
+    "dp-svga-x11",                      /* szName */
+    "SVGA X11 display",                 /* pszDescription */
+    ".vboxclient-display-svga-x11.pid", /* pszPidFilePath */
+    NULL,                               /* pszUsage */
+    NULL,                               /* pszOptions */
+    NULL,                               /* pfnOption */
+    vbclSVGAInit,                       /* pfnInit */
+    vbclSVGAWorker,                     /* pfnWorker */
+    vbclSVGAStop,                       /* pfnStop*/
+    NULL                                /* pfnTerm */
+};
+