Changeset 92212 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Nov 4, 2021 5:50:52 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148044

Message:

Additions: Linux: VBoxDRMClient: add PID file check on start, bugref:9637, ticketref:19373.

File:

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

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

@@ -196 +196 @@
      * e.g. from before a guest reboot. */
     bool fAck = false;
+
+    /** The name and handle of the PID file. */
+    static const char szPidFile[RTPATH_MAX] = "/var/run/VBoxDRMClient";
+    RTFILE hPidFile;
+
+    /* Check PID file before attempting to initialize anything. */
+    rc = VbglR3PidFile(szPidFile, &hPidFile);
+    if (rc == VERR_FILE_LOCK_VIOLATION)
+    {
+        VBClLogInfo("VBoxDRMClient: already running, exiting\n");
+        return RTEXITCODE_SUCCESS;
+    }
+    else if (RT_FAILURE(rc))
+    {
+        VBClLogError("VBoxDRMClient: unable to lock PID file (%Rrc), exiting\n", rc);
+        return RTEXITCODE_FAILURE;
+    }
+
     drmConnect(&drmContext);
     if (drmContext.hDevice == NIL_RTFILE)
@@ -279 +297 @@
             VBClLogFatalError("Failure waiting for event, rc=%Rrc\n", rc);
     }
+
+    /* ToDo: this code never executed since we do not have yet a clean way to exit
+     * main event loop above. */
+    VBClLogInfo("VBoxDRMClient: releasing PID file lock\n");
+    VbglR3ClosePidFile(szPidFile, hPidFile);
+
     return 0;
 }