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

Timestamp:

Oct 5, 2015 9:01:30 PM (10 years ago)

Author:

vboxsync

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

103082

Message:

VBoxService: Some more cleanups log statements & comments.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (3 diffs)
• VBoxServiceBalloon.cpp (modified) (11 diffs)
• VBoxServiceControlProcess.cpp (modified) (1 diff)
• VBoxServiceUtils.cpp (modified) (1 diff)
• VBoxServiceVMInfo-win.cpp (modified) (1 diff)
• VBoxServiceVMInfo.cpp (modified) (1 diff)

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

@@ -430 +430 @@
     if (s_enmLastStatus != VBoxGuestFacilityStatus_Failed)
     {
-        int rc = VbglR3ReportAdditionsStatus(VBoxGuestFacilityType_VBoxService,
-                                             enmStatus, 0 /* Flags */);
+        int rc = VbglR3ReportAdditionsStatus(VBoxGuestFacilityType_VBoxService, enmStatus, 0 /* Flags */);
         if (RT_FAILURE(rc))
         {
@@ -620 +619 @@
                 if (rc != VERR_SERVICE_DISABLED)
                 {
-                    VGSvcError("Service '%s' failed to initialize: %Rrc\n",
-                                     g_aServices[j].pDesc->pszName, rc);
+                    VGSvcError("Service '%s' failed to initialize: %Rrc\n", g_aServices[j].pDesc->pszName, rc);
                     VGSvcReportStatus(VBoxGuestFacilityStatus_Failed);
                     return rc;
@@ -817 +815 @@
           );
 
-    VGSvcVerbose(3, "VBoxServiceMainWait: Received signal %d (rc=%d)\n", iSignal, rc);
+    VGSvcVerbose(3, "VGSvcMainWait: Received signal %d (rc=%d)\n", iSignal, rc);
 #endif /* !RT_OS_WINDOWS */
 }

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

@@ -164 +164 @@
         return VINF_SUCCESS;
 
-    VGSvcVerbose(3, "VBoxServiceBalloonSetUser: cNewChunks=%u g_cMemBalloonChunks=%u\n", cNewChunks, g_cMemBalloonChunks);
+    VGSvcVerbose(3, "vgsvcBalloonSetUser: cNewChunks=%u g_cMemBalloonChunks=%u\n", cNewChunks, g_cMemBalloonChunks);
     int rc = VINF_SUCCESS;
     if (cNewChunks > g_cMemBalloonChunks)
@@ -197 +197 @@
             }
         }
-        VGSvcVerbose(3, "VBoxServiceBalloonSetUser: inflation complete. chunks=%u rc=%d\n", i, rc);
+        VGSvcVerbose(3, "vgsvcBalloonSetUser: inflation complete. chunks=%u rc=%d\n", i, rc);
     }
     else
@@ -219 +219 @@
             else
                 break;
-            VGSvcVerbose(3, "VBoxServiceBalloonSetUser: deflation complete. chunks=%u rc=%d\n", i, rc);
+            VGSvcVerbose(3, "vgsvcBalloonSetUser: deflation complete. chunks=%u rc=%d\n", i, rc);
         }
     }
@@ -232 +232 @@
 static DECLCALLBACK(int) vgsvcBalloonInit(void)
 {
-    VGSvcVerbose(3, "VBoxServiceBalloonInit\n");
+    VGSvcVerbose(3, "vgsvcBalloonInit\n");
 
     int rc = RTSemEventMultiCreate(&g_MemBalloonEvent);
@@ -247 +247 @@
     if (RT_SUCCESS(rc))
     {
-        VGSvcVerbose(3, "MemBalloon: New balloon size %d MB (%s memory)\n",
-                           cNewChunks, fHandleInR3 ? "R3" : "R0");
+        VGSvcVerbose(3, "MemBalloon: New balloon size %d MB (%s memory)\n", cNewChunks, fHandleInR3 ? "R3" : "R0");
         if (fHandleInR3)
             rc = vgsvcBalloonSetUser(cNewChunks);
@@ -303 +302 @@
     if (RT_FAILURE(rc))
     {
-        VGSvcVerbose(3, "VBoxServiceBalloonWorker: VbglR3CtlFilterMask failed with %Rrc\n", rc);
+        VGSvcVerbose(3, "vgsvcBalloonInit: VbglR3CtlFilterMask failed with %Rrc\n", rc);
         return rc;
     }
@@ -330 +329 @@
             if (RT_SUCCESS(rc))
             {
-                VGSvcVerbose(3, "VBoxServiceBalloonWorker: new balloon size %d MB (%s memory)\n",
-                                   cNewChunks, fHandleInR3 ? "R3" : "R0");
+                VGSvcVerbose(3, "vgsvcBalloonInit: new balloon size %d MB (%s memory)\n", cNewChunks, fHandleInR3 ? "R3" : "R0");
                 if (fHandleInR3)
                 {
@@ -337 +335 @@
                     if (RT_FAILURE(rc))
                     {
-                        VGSvcVerbose(3, "VBoxServiceBalloonWorker: failed to set balloon size %d MB (%s memory)\n",
-                                    cNewChunks, fHandleInR3 ? "R3" : "R0");
+                        VGSvcVerbose(3, "vgsvcBalloonInit: failed to set balloon size %d MB (%s memory)\n",
+                                     cNewChunks, fHandleInR3 ? "R3" : "R0");
                     }
                     else
-                        VGSvcVerbose(3, "VBoxServiceBalloonWorker: successfully set requested balloon size %d.\n", cNewChunks);
+                        VGSvcVerbose(3, "vgsvcBalloonInit: successfully set requested balloon size %d.\n", cNewChunks);
                 }
                 else
@@ -347 +345 @@
             }
             else
-                VGSvcVerbose(3, "VBoxServiceBalloonWorker: VbglR3MemBalloonRefresh failed with %Rrc\n", rc);
+                VGSvcVerbose(3, "vgsvcBalloonInit: VbglR3MemBalloonRefresh failed with %Rrc\n", rc);
         }
 
@@ -363 +361 @@
         if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
         {
-            VGSvcError("VBoxServiceBalloonWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
+            VGSvcError("vgsvcBalloonInit: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
             rc = rc2;
             break;
@@ -372 +370 @@
     rc = VbglR3CtlFilterMask(0, VMMDEV_EVENT_BALLOON_CHANGE_REQUEST);
     if (RT_FAILURE(rc))
-        VGSvcVerbose(3, "VBoxServiceBalloonWorker: VbglR3CtlFilterMask failed with %Rrc\n", rc);
+        VGSvcVerbose(3, "vgsvcBalloonInit: VbglR3CtlFilterMask failed with %Rrc\n", rc);
 
     RTSemEventMultiDestroy(g_MemBalloonEvent);
     g_MemBalloonEvent = NIL_RTSEMEVENTMULTI;
 
-    VGSvcVerbose(3, "VBoxServiceBalloonWorker: finished mem balloon change request thread\n");
-    return 0;
+    VGSvcVerbose(3, "vgsvcBalloonInit: finished mem balloon change request thread\n");
+    return VINF_SUCCESS;
 }
 

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

@@ -968 +968 @@
 #endif
 #ifdef DEBUG
-    VGSvcVerbose(3, "VBoxServiceControlExecMakeFullPath: %s -> %s\n", pszPath, pszExpanded);
+    VGSvcVerbose(3, "vgsvcGstCtrlProcessMakeFullPath: %s -> %s\n", pszPath, pszExpanded);
 #endif
     return rc;

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

@@ -243 +243 @@
 
 /**
- * Helper for VBoxServiceGetFileVersion and attempts to read and parse
+ * Helper for vgsvcUtilGetFileVersion and attempts to read and parse
  * FileVersion.
  *

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -513 +513 @@
  * @returns VBox status code.
  * @param   ppaProcs    Where to return the process snapshot.  This must be
- *                      freed by calling VBoxServiceVMInfoWinProcessesFree.
+ *                      freed by calling vgsvcVMInfoWinProcessesFree.
  *
  * @param   pcProcs     Where to store the returned process count.

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

@@ -424 +424 @@
     if (RT_SUCCESS(rc))
         rc = VGSvcPropCacheUpdate(pCache, pszName, pszValue);
-    if (rc == VINF_SUCCESS) /* VBoxServicePropCacheUpdate will also return VINF_NO_CHANGE. */
+    if (rc == VINF_SUCCESS) /* VGSvcPropCacheUpdate will also return VINF_NO_CHANGE. */
     {
         /** @todo Combine updating flags w/ updating the actual value. */