Changeset 86877 in vbox

Timestamp:

Nov 12, 2020 6:32:51 PM (4 years ago)

Author:

vboxsync

Message:

Additions/VBoxDRMClient: Removed code duplication between VBoxClient / VBoxService by refactoring the VBoxDRMClient routines into VbglR3. Also improved error checking here and there, added @todos. bugref:9637

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDRMClient.cpp (added)
• src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (2 diffs)
• src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (2 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -812 +812 @@
 VBGLR3DECL(int)     VbglR3WriteCoreDump(void);
 
+/** @}  */
+
+/** @name DRM client handling
+ * @{ */
+VBGLR3DECL(bool)    VbglR3DRMClientIsNeeded(void);
+VBGLR3DECL(bool)    VbglR3DRMClientIsRunning(void);
+VBGLR3DECL(int)     VbglR3DRMClientStart(void);
 /** @}  */
 

trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk

@@ -122 +122 @@
         VBoxGuestR3LibCpuHotPlug.cpp \
         VBoxGuestR3LibCredentials.cpp \
+        VBoxGuestR3LibDRMClient.cpp \
         VBoxGuestR3LibEvent.cpp \
         VBoxGuestR3LibGuestUser.cpp \

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -894 +894 @@
 }
 
-#ifdef VBOX_WITH_VBOXSERVICE_DRMRESIZE
-/**
- * Check for a guest property and start VBoxDRMClient if it exists.
- *
- */
-static void startDRMResize(void)
-{
-    uint32_t uGuestPropSvcClientID;
-    int rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3GuestPropExist(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/DRMResize");
-        if (RT_SUCCESS(rc))
-        {
-            RTMsgInfo("Starting DRM resize service");
-            char szDRMClientPath[RTPATH_MAX];
-            RTPathExecDir(szDRMClientPath, RTPATH_MAX);
-            RTPathStripSuffix(szDRMClientPath);
-            RTPathAppend(szDRMClientPath, RTPATH_MAX, "VBoxDRMClient");
-            const char *apszArgs[1] = { NULL };
-            rc = RTProcCreate("VBoxDRMClient", apszArgs, RTENV_DEFAULT,
-                              RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_SEARCH_PATH, NULL);
-            if (rc == -1)
-                RTMsgError("Could not start DRM resize service");
-        }
-    }
-}
-#endif /* VBOX_WITH_VBOXSERVICE_DRMRESIZE */
 
 int main(int argc, char **argv)
@@ -1188 +1160 @@
 
 #ifdef VBOX_WITH_VBOXSERVICE_DRMRESIZE
-    startDRMResize();
+        if (VbglR3DRMClientIsNeeded())
+    {
+        rc = VbglR3DRMClientStart();
+        if (RT_FAILURE(rc))
+            VGSvcError("Starting DRM resizing client failed with %Rrc\n", rc);
+    }
 #endif /* VBOX_WITH_VBOXSERVICE_DRMRESIZE */
 

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

@@ -670 +670 @@
     const char *pSessionType;
 
-    if (pDisplayType != NULL) {
+    if (pDisplayType != NULL)
         return true;
-    }
-    pSessionType = getenv("XDG_SESSION_TYPE");
-    if ((pSessionType != NULL) && (RTStrIStartsWith(pSessionType, "wayland"))) {
+
+    pSessionType = getenv("XDG_SESSION_TYPE"); /** @todo r=andy Use RTEnv API. */
+    if ((pSessionType != NULL) && (RTStrIStartsWith(pSessionType, "wayland")))
         return true;
-    }
-    return false;
-}
-
-/**
- * We start VBoxDRMClient from VBoxService in case  some guest property is set.
- * We check the same guest property here and dont start this service in case
- * it (guest property) is set.
- */
-static bool checkDRMClient(void)
-{
-    bool fStartClient = false;
-
-    uint32_t idClient;
-    int rc = VbglR3GuestPropConnect(&idClient);
-    if (RT_SUCCESS(rc))
-    {
-        fStartClient = VbglR3GuestPropExist(idClient, "/VirtualBox/GuestAdd/DRMResize" /*pszPropName*/);
-        VbglR3GuestPropDisconnect(idClient);
-    }
-
-    return fStartClient;
-}
-
-static bool startDRMClient(void)
-{
-    char* argv[] = {NULL};
-    char* env[] = {NULL};
-    char szDRMClientPath[RTPATH_MAX];
-    RTPathExecDir(szDRMClientPath, RTPATH_MAX);
-    RTPathAppend(szDRMClientPath, RTPATH_MAX, "VBoxDRMClient");
-    VBClLogInfo("Starting DRM client.\n");
-    int rc = execve(szDRMClientPath, argv, env);
-    if (rc == -1)
-        VBClLogFatalError("execve for '%s' returns the following error %d: %s\n", szDRMClientPath, errno, strerror(errno));
-    /* This is reached only when execve fails. */
+
     return false;
 }
@@ -723 +688 @@
      * So for 32-bit GAs we use our DRM client. */
 #if ARCH_BITS == 32
-    /* igore rc */ startDRMClient();
-    return VERR_NOT_AVAILABLE;
+    int rc = VbglR3DRMClientStart();
+    if (RT_FAILURE(rc))
+        VBClLogError("Starting DRM resizing client (32-bit) failed with %Rrc\n", rc);
+    return VERR_NOT_AVAILABLE; /** @todo r=andy Why ignoring rc here? */
 #endif
 
     /* If DRM client is already running don't start this service. */
-    if (checkDRMClient())
-    {
-        VBClLogFatalError("DRM resizing is already running. Exiting this service\n");
+    if (VbglR3DRMClientIsRunning())
+    {
+        VBClLogInfo("DRM resizing is already running. Exiting this service\n");
         return VERR_NOT_AVAILABLE;
     }
+
     if (isXwayland())
-        return startDRMClient();
+    {
+        int rc = VbglR3DRMClientStart();
+        if (RT_FAILURE(rc))
+            VBClLogError("Starting DRM resizing client failed with %Rrc\n", rc);
+        return rc;
+    }
 
     x11Connect();
+
     if (x11Context.pDisplay == NULL)
-        return false;
+        return VERR_NOT_AVAILABLE;
+
     /* don't start the monitoring thread if related randr functionality is not available. */
     if (x11Context.fMonitorInfoAvailable)
+    {
         if (RT_FAILURE(startX11MonitorThread()))
-            return false;
-    return true;
+            return VERR_NOT_AVAILABLE;
+    }
+
+    return VINF_SUCCESS;
 }