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

Timestamp:

Sep 27, 2010 12:19:31 PM (14 years ago)

Author:

vboxsync

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

66221

Message:

VBoxService: Logging (also get rid of some ambiguous lines).

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceBalloon.cpp (modified) (1 diff)
• VBoxServicePageSharing.cpp (modified) (6 diffs)
• VBoxServiceStats.cpp (modified) (3 diffs)
• VBoxServiceTimeSync.cpp (modified) (8 diffs)

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

@@ -376 +376 @@
         if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
         {
-            VBoxServiceError("RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
+            VBoxServiceError("VBoxServiceBalloonWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
             rc = rc2;
             break;

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

@@ -241 +241 @@
         idxRegion++;
     }
-    VBoxServiceVerbose(3, "VbglR3RegisterSharedModule %s %s base=%p size=%x cregions=%d\n", pModule->Info.szModule, pModule->szFileVersion, pModule->Info.modBaseAddr, pModule->Info.modBaseSize, idxRegion);
+    VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: VbglR3RegisterSharedModule %s %s base=%p size=%x cregions=%d\n", pModule->Info.szModule, pModule->szFileVersion, pModule->Info.modBaseAddr, pModule->Info.modBaseSize, idxRegion);
 #ifdef RT_ARCH_X86
     int rc = VbglR3RegisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (RTGCPTR32)pModule->Info.modBaseAddr,
@@ -252 +252 @@
 //    AssertRC(rc);
     if (RT_FAILURE(rc))
-        VBoxServiceVerbose(3, "VbglR3RegisterSharedModule failed with %d\n", rc);
+        VBoxServiceVerbose(3, "VBoxServicePageSharingRegisterModule: VbglR3RegisterSharedModule failed with %d\n", rc);
 
 end:
@@ -352 +352 @@
     if (hSnapshot == INVALID_HANDLE_VALUE)
     {
-        VBoxServiceVerbose(3, "CreateToolhelp32Snapshot failed with %d\n", GetLastError());
+        VBoxServiceVerbose(3, "VBoxServicePageSharingInspectGuest: CreateToolhelp32Snapshot failed with %d\n", GetLastError());
         return;
     }
@@ -610 +610 @@
         if (rc != VERR_TIMEOUT && RT_FAILURE(rc))
         {
-            VBoxServiceError("RTSemEventMultiWait failed; rc=%Rrc\n", rc);
+            VBoxServiceError("VBoxServicePageSharingWorker: RTSemEventMultiWait failed; rc=%Rrc\n", rc);
             break;
         }
@@ -699 +699 @@
                 rc = RTProcCreate(pszExeName, papszArgs, RTENV_DEFAULT, 0 /* normal child */, &hProcess);
                 if (RT_FAILURE(rc))
-                    VBoxServiceError("RTProcCreate %s failed; rc=%Rrc\n", pszExeName, rc);
+                    VBoxServiceError("VBoxServicePageSharingWorkerProcess: RTProcCreate %s failed; rc=%Rrc\n", pszExeName, rc);
             }
         }
@@ -716 +716 @@
         if (rc != VERR_TIMEOUT && RT_FAILURE(rc))
         {
-            VBoxServiceError("RTSemEventMultiWait failed; rc=%Rrc\n", rc);
+            VBoxServiceError("VBoxServicePageSharingWorkerProcess: RTSemEventMultiWait failed; rc=%Rrc\n", rc);
             break;
         }

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

@@ -170 +170 @@
 /**
  * Gathers VM statistics and reports them to the host.
- *
- * @returns
- * @param   oid                 .
  */
 static void VBoxServiceVMStatsReport(void)
@@ -237 +234 @@
         }
         else
-            VBoxServiceVerbose(3, "GetPerformanceInfo failed with %d\n", GetLastError());
+            VBoxServiceVerbose(3, "VBoxServiceVMStatsReport: GetPerformanceInfo failed with %d\n", GetLastError());
     }
 
@@ -667 +664 @@
         if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
         {
-            VBoxServiceError("RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
+            VBoxServiceError("VBoxServiceVMStatsWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
             rc = rc2;
             break;

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

@@ -441 +441 @@
         return;
     if (SetSystemTimeAdjustment(0, TRUE /* Periodic adjustments disabled. */))
-        VBoxServiceVerbose(3, "Windows Time Adjustment is now disabled.\n");
+        VBoxServiceVerbose(3, "VBoxServiceTimeSyncCancelAdjust: Windows Time Adjustment is now disabled.\n");
     else if (g_cTimeSyncErrors++ < 10)
-        VBoxServiceError("SetSystemTimeAdjustment(,disable) failed, error=%u\n", GetLastError());
+        VBoxServiceError("VBoxServiceTimeSyncCancelAdjust: SetSystemTimeAdjustment(,disable) failed, error=%u\n", GetLastError());
 #endif /* !RT_OS_WINDOWS */
 }
@@ -482 +482 @@
     }
     else if (g_cTimeSyncErrors++ < 10)
-        VBoxServiceError("RTTimeSet(%RDtimespec) failed: %Rrc\n", &NewGuestTime, rc);
+        VBoxServiceError("VBoxServiceTimeSyncSet: RTTimeSet(%RDtimespec) failed: %Rrc\n", &NewGuestTime, rc);
 }
 
@@ -516 +516 @@
             {
                 if (g_cTimeSyncErrors++ < 10)
-                    VBoxServiceError("VbglR3GetHostTime failed; rc2=%Rrc\n", rc2);
+                    VBoxServiceError("VBoxServiceTimeSyncWorker: VbglR3GetHostTime failed; rc2=%Rrc\n", rc2);
                 break;
             }
@@ -537 +537 @@
                     if (idNewSession != g_idTimeSyncSession)
                     {
-                        VBoxServiceVerbose(3, "TimeSync: The VM session ID changed, forcing resync.\n");
+                        VBoxServiceVerbose(3, "VBoxServiceTimeSyncWorker: The VM session ID changed, forcing resync.\n");
                         TimeSyncSetThreshold = 0;
                         g_idTimeSyncSession  = idNewSession;
@@ -559 +559 @@
                 if (g_cVerbosity >= 3)
                 {
-                    VBoxServiceVerbose(3, "Host:    %s    (MinAdjust: %RU32 ms)\n",
+                    VBoxServiceVerbose(3, "VBoxServiceTimeSyncWorker: Host:    %s    (MinAdjust: %RU32 ms)\n",
                                        RTTimeToString(RTTimeExplode(&Time, &HostNow), sz, sizeof(sz)), MinAdjust);
-                    VBoxServiceVerbose(3, "Guest: - %s => %RDtimespec drift\n",
+                    VBoxServiceVerbose(3, "VBoxServiceTimeSyncWorker: Guest: - %s => %RDtimespec drift\n",
                                        RTTimeToString(RTTimeExplode(&Time, &GuestNow), sz, sizeof(sz)),
                                        &Drift);
@@ -588 +588 @@
                 break;
             }
-            VBoxServiceVerbose(3, "%RDtimespec: latency too high (%RDtimespec) sleeping 1s\n", GuestElapsed);
+            VBoxServiceVerbose(3, "VBoxServiceTimeSyncWorker: %RDtimespec: latency too high (%RDtimespec) sleeping 1s\n", GuestElapsed);
             RTThreadSleep(1000);
         } while (--cTries > 0);
@@ -608 +608 @@
         if (rc2 != VERR_TIMEOUT && RT_FAILURE(rc2))
         {
-            VBoxServiceError("RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
+            VBoxServiceError("VBoxServiceTimeSyncWorker: RTSemEventMultiWait failed; rc2=%Rrc\n", rc2);
             rc = rc2;
             break;
@@ -640 +640 @@
         {
             DWORD dwErr = GetLastError();
-            VBoxServiceError("Restoring token privileges (SE_SYSTEMTIME_NAME) failed with code %u!\n", dwErr);
+            VBoxServiceError("VBoxServiceTimeSyncTerm: Restoring token privileges (SE_SYSTEMTIME_NAME) failed with code %u!\n", dwErr);
         }
         CloseHandle(g_hTokenProcess);