Changeset 92653 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 30, 2021 5:28:01 PM (3 years ago)

Author:

vboxsync

Message:

Additions: Linux: VBoxDRMClient: run resize task in a thread, bugref:10134.

File:

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

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

@@ -48 +48 @@
 #include <iprt/initterm.h>
 #include <iprt/message.h>
+#include <iprt/thread.h>
+#include <iprt/asm.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <limits.h>
+#include <signal.h>
 
 #ifdef RT_OS_LINUX
@@ -77 +80 @@
  *  context structure. */
 #define VMW_MAX_HEADS                   (32)
+
+/** Name of DRM resize thread. */
+#define DRM_RESIZE_THREAD_NAME          "DrmResizeThread"
+
+/* Time in milliseconds to wait for host events. */
+#define DRM_HOST_EVENT_RX_TIMEOUT_MS    (500)
 
 /** DRM version structure. */
@@ -119 +128 @@
 /** Path to the PID file. */
 static const char g_szPidFile[RTPATH_MAX] = "/var/run/VBoxDRMClient";
+
+/** Global flag which is triggered when service requested to shutdown. */
+static bool volatile g_fShutdown;
 
 /**
@@ -415 +427 @@
 }
 
-
-static void drmMainLoop(RTFILE hDevice)
+/** Worker thread for resize task. */
+static DECLCALLBACK(int) drmResizeWorker(RTTHREAD ThreadSelf, void *pvUser)
 {
     int rc;
+    RTFILE hDevice = (RTFILE)pvUser;
+
+    RT_NOREF1(ThreadSelf);
+
+    AssertReturn(hDevice, VERR_INVALID_PARAMETER);
 
     for (;;)
@@ -472 +489 @@
         do
         {
-            rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, RT_INDEFINITE_WAIT, &events);
-        } while (rc == VERR_INTERRUPTED);
-        if (RT_FAILURE(rc))
+            rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, DRM_HOST_EVENT_RX_TIMEOUT_MS, &events);
+        } while (rc == VERR_TIMEOUT && !ASMAtomicReadBool(&g_fShutdown));
+
+        if (ASMAtomicReadBool(&g_fShutdown))
+        {
+            VBClLogInfo("VBoxDRMClient: exitting resize thread: shutdown requested\n");
+            break;
+        }
+        else if (RT_FAILURE(rc))
+        {
             VBClLogFatalError("Failure waiting for event, rc=%Rrc\n", rc);
-    }
+        }
+    }
+
+    return 0;
+}
+
+static void drmRequestShutdown(int sig)
+{
+    RT_NOREF1(sig);
+
+    ASMAtomicWriteBool(&g_fShutdown, true);
 }
 
@@ -483 +517 @@
     RTFILE hDevice = NIL_RTFILE;
     RTFILE hPidFile;
+
+    RTTHREAD drmResizeThread;
+    int rcDrmResizeThread = 0;
 
     int rc = RTR3InitExe(argc, &argv, 0);
@@ -523 +560 @@
     hDevice = drmOpenVmwgfx();
     if (hDevice == NIL_RTFILE)
-        return VERR_OPEN_FAILED;
+        return RTEXITCODE_FAILURE;
 
     rc = VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
@@ -529 +566 @@
     {
         VBClLogFatalError("Failed to request display change events, rc=%Rrc\n", rc);
-        return VERR_INVALID_HANDLE;
+        return RTEXITCODE_FAILURE;
     }
     rc = VbglR3AcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, false);
     if (rc == VERR_RESOURCE_BUSY)  /* Someone else has already acquired it. */
     {
-        return VERR_RESOURCE_BUSY;
+        return RTEXITCODE_FAILURE;
     }
     if (RT_FAILURE(rc))
     {
         VBClLogFatalError("Failed to register resizing support, rc=%Rrc\n", rc);
-        return VERR_INVALID_HANDLE;
-    }
-
-    drmMainLoop(hDevice);
-
-    /** @todo this code never executed since we do not have yet a clean way to exit
-     * main event loop above. */
+        return RTEXITCODE_FAILURE;
+    }
+
+    /* Setup signals: gracefully terminate on SIGINT, SIGTERM. */
+    if (   signal(SIGINT, drmRequestShutdown) == SIG_ERR
+        || signal(SIGTERM, drmRequestShutdown) == SIG_ERR)
+    {
+        VBClLogError("VBoxDRMClient: unable to setup signals\n");
+        return RTEXITCODE_FAILURE;
+    }
+
+    /* Attempt to start DRM resize task. */
+    rc = RTThreadCreate(&drmResizeThread, drmResizeWorker, (void *)hDevice, 0,
+                        RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, DRM_RESIZE_THREAD_NAME);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTThreadWait(drmResizeThread, RT_INDEFINITE_WAIT, &rcDrmResizeThread);
+        VBClLogInfo("VBoxDRMClient: %s thread exitted with status %Rrc\n", DRM_RESIZE_THREAD_NAME, rcDrmResizeThread);
+        rc |= rcDrmResizeThread;
+    }
 
     RTFileClose(hDevice);
@@ -552 +602 @@
     VbglR3ClosePidFile(g_szPidFile, hPidFile);
 
-    return 0;
-}
+    return rc == 0 ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+}