Changeset 90053 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Jul 6, 2021 10:46:54 AM (3 years ago)

Author:

vboxsync

Message:

Additions: X11: main: update service termination code, bugref:10032.

This commit attempts to call service pfnStop() callback first and
only then pfnTerm(). This is needed for graceful service termination
procedure.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/main.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -119 +119 @@
     if (RT_FAILURE(rc))
         VBClLogFatalError("Failure while acquiring the global critical section, rc=%Rrc\n", rc);
-    if (   g_Service.pDesc
-        && g_Service.pDesc->pfnTerm)
-        g_Service.pDesc->pfnTerm();
+
+    /* Try to gracefuly terminate a service. Service needs
+     * to be stopped first and then terminated. */
+    if (g_Service.pDesc)
+    {
+        if (g_Service.pDesc->pfnStop)
+            g_Service.pDesc->pfnStop();
+
+        if (g_Service.pDesc->pfnTerm)
+            g_Service.pDesc->pfnTerm();
+    }
+
     if (g_szPidFile[0] && g_hPidFile)
         VbglR3ClosePidFile(g_szPidFile, g_hPidFile);