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

Timestamp:

Dec 4, 2015 4:26:50 PM (9 years ago)

Author:

vboxsync

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

104521

Message:

bugref:8153: vboxvideo: ABI issues / software rendering on Linux guests: add a new service to VBoxClient to test whether accelerated 3D pass-through is currently available by trying to connect to the HGCM service and signalling success or failure in the process exit code. Add generic HGCM connect and disconnect functionality to VBoxGuestR3Lib to support this. Add the concept of non-daemon services to VBoxClient as we do not need to daemonise or create a pid-file for this quick test.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxClient.h (modified) (1 diff)
• check3d.cpp (added)
• main.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -67 +67 @@
         seamless-x11.cpp \
         display.cpp \
-        hostversion.cpp
+        hostversion.cpp \
+        check3d.cpp
  VBoxClient_LIBS += \
         Xext Xmu

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -78 +78 @@
 extern struct VBCLSERVICE **VBClGetDragAndDropService();
 #endif /* VBOX_WITH_DRAG_AND_DROP */
+extern struct VBCLSERVICE **VBClCheck3DService();
 
 #endif /* !___vboxclient_vboxclient_h */

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

@@ -53 +53 @@
 /** The name of our pidfile.  It is global for the benefit of the cleanup
  * routine. */
-static char g_szPidFile[RTPATH_MAX];
+static char g_szPidFile[RTPATH_MAX] = "";
 /** The file handle of our pidfile.  It is global for the benefit of the
  * cleanup routine. */
@@ -165 +165 @@
              "--checkhostversion|"
 #endif
-             "--seamless [-d|--nodaemon]\n", pcszFileName);
+             "--seamless|check3d [-d|--nodaemon]\n", pcszFileName);
     RTPrintf("Starts the VirtualBox X Window System guest services.\n\n");
     RTPrintf("Options:\n");
@@ -176 +176 @@
     RTPrintf("  --checkhostversion starts the host version notifier service\n");
 #endif
+    RTPrintf("  --check3d          tests whether 3D pass-through is enabled\n");
     RTPrintf("  --seamless         starts the seamless windows service\n");
     RTPrintf("  -d, --nodaemon     continues running as a system service\n");
@@ -260 +261 @@
         }
 #endif /* VBOX_WITH_DRAG_AND_DROP */
+        else if (!strcmp(argv[i], "--check3d"))
+        {
+            if (g_pService)
+                break;
+            g_pService = VBClCheck3DService();
+        }
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
         {
@@ -287 +294 @@
     if (RT_FAILURE(rc))
         VBClFatalError(("Initialising critical section: %Rrc\n", rc));
-    rc = RTPathUserHome(g_szPidFile, sizeof(g_szPidFile));
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Getting home directory for pid-file: %Rrc\n", rc));
-    rc = RTPathAppend(g_szPidFile, sizeof(g_szPidFile),
-                      (*g_pService)->getPidFilePath());
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Creating pid-file path: %Rrc\n", rc));
-    if (fDaemonise)
-        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */, fRespawn, &cRespawn);
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Daemonizing: %Rrc\n", rc));
-    if (g_szPidFile[0])
-        rc = VbglR3PidFile(g_szPidFile, &g_hPidFile);
-    if (rc == VERR_FILE_LOCK_VIOLATION)  /* Already running. */
-        return 0;
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Creating pid-file: %Rrc\n", rc));
+    if ((*g_pService)->getPidFilePath)
+    {
+        rc = RTPathUserHome(g_szPidFile, sizeof(g_szPidFile));
+        if (RT_FAILURE(rc))
+            VBClFatalError(("Getting home directory for pid-file: %Rrc\n", rc));
+        rc = RTPathAppend(g_szPidFile, sizeof(g_szPidFile),
+                          (*g_pService)->getPidFilePath());
+        if (RT_FAILURE(rc))
+            VBClFatalError(("Creating pid-file path: %Rrc\n", rc));
+        if (fDaemonise)
+            rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */, fRespawn, &cRespawn);
+        if (RT_FAILURE(rc))
+            VBClFatalError(("Daemonizing: %Rrc\n", rc));
+        if (g_szPidFile[0])
+            rc = VbglR3PidFile(g_szPidFile, &g_hPidFile);
+        if (rc == VERR_FILE_LOCK_VIOLATION)  /* Already running. */
+            return 0;
+        if (RT_FAILURE(rc))
+            VBClFatalError(("Creating pid-file: %Rrc\n", rc));
+    }
     /* Set signal handlers to clean up on exit. */
     vboxClientSetSignalHandlers();