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

Timestamp:

Dec 1, 2018 10:13:05 PM (6 years ago)

Author:

vboxsync

Message:

VBoxService: Mark printf-style formatters as such, fixing fallout. Eliminated another redundant connection to the guest control service. bugref:9313

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceAutoMount.cpp (modified) (3 diffs)
• VBoxServiceControl.h (modified) (1 diff)
• VBoxServiceControlProcess.cpp (modified) (7 diffs)
• VBoxServiceControlSession.cpp (modified) (5 diffs)
• VBoxServiceInternal.h (modified) (1 diff)

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

@@ -787 +787 @@
     }
     else
-        VGSvcError("vbsvcAutomounterQueryMountDirAndPrefix: RTPathAbs(%s) -> %Rrc\n", rc);
+        VGSvcError("vbsvcAutomounterQueryMountDirAndPrefix: RTPathAbs(%s) -> %Rrc\n", pszDir, rc);
 
 
@@ -967 +967 @@
      */
     FILE *pFile = setmntent("/proc/mounts", "r");
+    int iErrMounts = errno;
     if (!pFile)
         pFile = setmntent("/etc/mtab", "r");
@@ -988 +989 @@
     else
         VGSvcError("vbsvcAutomounterQueryMountPoint: Could not open mount tab '%s' (errno=%d) or '/proc/mounts' (errno=%d)\n",
-                   _PATH_MOUNTED, errno);
+                   _PATH_MOUNTED, errno, iErrMounts);
 
 #elif defined(RT_OS_SOLARIS)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h

@@ -251 +251 @@
     /** Whether the guest process thread was started or not. */
     bool                            fStarted;
-    /** Client ID. */
-    uint32_t                        uClientID;
     /** Context ID. */
     uint32_t                        uContextID;

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

@@ -516 +516 @@
                        pProcess->uPID, pProcess->StartupInfo.szCmd, pProcess->uContextID,
                        pProcess->StartupInfo.szUser, pProcess->StartupInfo.uTimeLimitMS);
-    VBGLR3GUESTCTRLCMDCTX ctxStart = { pProcess->uClientID, pProcess->uContextID };
+    VBGLR3GUESTCTRLCMDCTX ctxStart = { g_idControlSvcClient, pProcess->uContextID };
     rc = VbglR3GuestCtrlProcCbStatus(&ctxStart,
                                      pProcess->uPID, PROC_STS_STARTED, 0 /* u32Flags */,
@@ -694 +694 @@
     }
 
-    VGSvcVerbose(3, "[PID %RU32]: Loop ended: rc=%Rrc, fShutdown=%RTbool, fProcessAlive=%RTbool, fProcessTimedOut=%RTbool, MsProcessKilled=%RU64\n",
+    VGSvcVerbose(3, "[PID %RU32]: Loop ended: rc=%Rrc, fShutdown=%RTbool, fProcessAlive=%RTbool, fProcessTimedOut=%RTbool, MsProcessKilled=%RU64 (%RX64)\n",
                  pProcess->uPID, rc, pProcess->fShutdown, fProcessAlive, fProcessTimedOut, MsProcessKilled, MsProcessKilled);
     VGSvcVerbose(3, "[PID %RU32]: *phStdOutR=%s, *phStdErrR=%s\n",
@@ -832 +832 @@
         else
             VGSvcVerbose(1, "[PID %RU32]: Handling process status %u not implemented\n", pProcess->uPID, ProcessStatus.enmReason);
+        VBGLR3GUESTCTRLCMDCTX ctxEnd = { g_idControlSvcClient, pProcess->uContextID };
         VGSvcVerbose(2, "[PID %RU32]: Ended, ClientID=%u, CID=%u, Status=%u, Flags=0x%x\n",
-                     pProcess->uPID, pProcess->uClientID, pProcess->uContextID, uStatus, fFlags);
-
-        VBGLR3GUESTCTRLCMDCTX ctxEnd = { pProcess->uClientID, pProcess->uContextID };
+                     pProcess->uPID, ctxEnd.uClientID, pProcess->uContextID, uStatus, fFlags);
+
         rc2 = VbglR3GuestCtrlProcCbStatus(&ctxEnd, pProcess->uPID, uStatus, fFlags, NULL /* pvData */, 0 /* cbData */);
         if (   RT_FAILURE(rc2)
@@ -1448 +1448 @@
     VGSvcVerbose(3, "Thread of process pThread=0x%p = '%s' started\n", pProcess, pProcess->StartupInfo.szCmd);
 
-    int rc = VbglR3GuestCtrlConnect(&pProcess->uClientID);
-    if (RT_FAILURE(rc))
-    {
-        VGSvcError("Process thread '%s' (%p) failed to connect to the guest control service, rc=%Rrc\n",
-                   pProcess->StartupInfo.szCmd, pProcess, rc);
-        RTThreadUserSignal(RTThreadSelf());
-        return rc;
-    }
-
-    VGSvcVerbose(3, "Guest process '%s' got client ID=%u, flags=0x%x\n",
-                 pProcess->StartupInfo.szCmd, pProcess->uClientID, pProcess->StartupInfo.uFlags);
-
-    /* Legacy setting: */
-    if (!VbglR3GuestCtrlSupportsOptimizations(pProcess->uClientID))
-    {
-        rc = VbglR3GuestCtrlMsgFilterSet(pProcess->uClientID, 0 /* Skip all */,
-                                         0 /* Filter mask to add */, 0 /* Filter mask to remove */);
-        if (RT_FAILURE(rc))
-            VGSvcError("Unable to set message filter, rc=%Rrc\n", rc); /* Non-critical. */
-    }
-
-    rc = VGSvcGstCtrlSessionProcessAdd(pProcess->pSession, pProcess);
+    VGSvcVerbose(3, "Guest process '%s', flags=0x%x\n", pProcess->StartupInfo.szCmd, pProcess->StartupInfo.uFlags);
+
+    int rc = VGSvcGstCtrlSessionProcessAdd(pProcess->pSession, pProcess);
     if (RT_FAILURE(rc))
     {
@@ -1583 +1564 @@
                             {
                                 uint32_t uFlags = RTPOLL_EVT_ERROR;
-    #if 0
+#if 0
                                 /* Add reading event to pollset to get some more information. */
                                 uFlags |= RTPOLL_EVT_READ;
-    #endif
+#endif
                                 /* Stdin. */
                                 if (RT_SUCCESS(rc))
@@ -1698 +1679 @@
     }
 
-    if (pProcess->uClientID)
-    {
-        if (RT_FAILURE(rc))
-        {
-            VBGLR3GUESTCTRLCMDCTX ctx = { pProcess->uClientID, pProcess->uContextID };
-            int rc2 = VbglR3GuestCtrlProcCbStatus(&ctx,
-                                                  pProcess->uPID, PROC_STS_ERROR, rc,
-                                                  NULL /* pvData */, 0 /* cbData */);
-            if (   RT_FAILURE(rc2)
-                && rc2 != VERR_NOT_FOUND)
-                VGSvcError("[PID %RU32]: Could not report process failure error; rc=%Rrc (process error %Rrc)\n",
-                           pProcess->uPID, rc2, rc);
-        }
-
-        /* Disconnect this client from the guest control service. This also cancels all
-         * outstanding host requests. */
-        VGSvcVerbose(3, "[PID %RU32]: Disconnecting (client ID=%u) ...\n", pProcess->uPID, pProcess->uClientID);
-        VbglR3GuestCtrlDisconnect(pProcess->uClientID);
-        pProcess->uClientID = 0;
+    if (RT_FAILURE(rc))
+    {
+        VBGLR3GUESTCTRLCMDCTX ctx = { g_idControlSvcClient, pProcess->uContextID };
+        int rc2 = VbglR3GuestCtrlProcCbStatus(&ctx,
+                                              pProcess->uPID, PROC_STS_ERROR, rc,
+                                              NULL /* pvData */, 0 /* cbData */);
+        if (   RT_FAILURE(rc2)
+            && rc2 != VERR_NOT_FOUND)
+            VGSvcError("[PID %RU32]: Could not report process failure error; rc=%Rrc (process error %Rrc)\n",
+                       pProcess->uPID, rc2, rc);
     }
 
@@ -1808 +1780 @@
     {
         static uint32_t s_uCtrlExecThread = 0;
-        if (s_uCtrlExecThread++ == UINT32_MAX)
+        if (s_uCtrlExecThread++ == UINT32_MAX) /** @todo r=bird: ????????????? */
             s_uCtrlExecThread = 0; /* Wrap around to not let IPRT freak out. */
         rc = RTThreadCreateF(&pProcess->Thread, vgsvcGstCtrlProcessThread,

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

@@ -256 +256 @@
             else
             {
-                VGSvcError("[File %s] empty filename!\n");
+                VGSvcError("[File %s] empty filename!\n", szFile);
                 rc = VERR_INVALID_NAME;
             }
@@ -1499 +1499 @@
                     rc = VbglR3GuestCtrlSessionAccept(idClient, idSession, abSecretKey, sizeof(abSecretKey));
                     if (RT_SUCCESS(rc))
-                        VGSvcVerbose(3, "Session %u accepted\n");
+                        VGSvcVerbose(3, "Session %u accepted (client ID %u)\n", idClient, idSession);
                     else
-                        VGSvcError("Failed to accept session: %Rrc\n", rc);
+                        VGSvcError("Failed to accept session %u (client ID %u): %Rrc\n", idClient, idSession, rc);
                 }
                 else
@@ -1509 +1509 @@
                                                      VBOX_GUESTCTRL_FILTER_BY_SESSION(idSession), 0);
                     if (RT_SUCCESS(rc))
-                        VGSvcVerbose(3, "Session %u filtering successfully enabled\n");
+                        VGSvcVerbose(3, "Session %u filtering successfully enabled\n", idSession);
                     else
                         VGSvcError("Failed to set session filter: %Rrc\n", rc);
@@ -1549 +1549 @@
         return VGSvcError("Error connecting to guest control service, rc=%Rrc\n", rc);
     g_fControlSupportsOptimizations = VbglR3GuestCtrlSupportsOptimizations(idClient);
+    g_idControlSvcClient            = idClient;
 
     rc = vgsvcGstCtrlSessionReadKeyAndAccept(idClient, pSession->StartupInfo.uSessionID);
@@ -1618 +1619 @@
     VGSvcVerbose(3, "Disconnecting client ID=%RU32 ...\n", idClient);
     VbglR3GuestCtrlDisconnect(idClient);
+    g_idControlSvcClient = 0;
 
     VGSvcVerbose(3, "Session worker returned with rc=%Rrc\n", rc);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -182 +182 @@
 #endif
 
-extern RTEXITCODE               VGSvcSyntax(const char *pszFormat, ...);
-extern RTEXITCODE               VGSvcError(const char *pszFormat, ...);
-extern void                     VGSvcVerbose(unsigned iLevel, const char *pszFormat, ...);
+extern RTEXITCODE               VGSvcSyntax(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
+extern RTEXITCODE               VGSvcError(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
+extern void                     VGSvcVerbose(unsigned iLevel, const char *pszFormat, ...)  RT_IPRT_FORMAT_ATTR(2, 3);
 extern int                      VGSvcLogCreate(const char *pszLogFile);
-extern void                     VGSvcLogV(const char *pszFormat, va_list va);
+extern void                     VGSvcLogV(const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 extern void                     VGSvcLogDestroy(void);
 extern int                      VGSvcArgUInt32(int argc, char **argv, const char *psz, int *pi, uint32_t *pu32,