Changeset 4609 in vbox

Timestamp:

Sep 7, 2007 12:24:15 PM (17 years ago)

Author:

vboxsync

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

24251

Message:

Updates

Location:

trunk/src/VBox/Additions/WINNT/VBoxService

Files:

• VBoxService.cpp (modified) (2 diffs)
• VBoxStatistics.cpp (modified) (3 diffs)

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

@@ -27 +27 @@
 #include <malloc.h>
 #include <VBoxGuestInternal.h>
+#include <iprt/string.h>
 
 #include "helpers.h"
@@ -64 +65 @@
 
     vmmdevInitRequest(&pReq->header, VMMDevReq_LogString);
-    vsprintf(pReq->szString, String, va);
+    RTStrPrintfV(pReq->szString, sizeof(Buffer)-sizeof(*pReq), String, va);
     OutputDebugStringA(pReq->szString);
     pReq->header.size += strlen(pReq->szString);

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxStatistics.cpp

@@ -143 +143 @@
     GetSystemInfo(&systemInfo);
 
+    memStatus.dwLength = sizeof(memStatus);
     gCtx.pfnGlobalMemoryStatusEx(&memStatus);
 
     req.guestStats.u32PageSize          = systemInfo.dwPageSize;
     req.guestStats.u32PhysMemTotal      = (uint32_t)(memStatus.ullTotalPhys / systemInfo.dwPageSize);
-    dprintf(("memStatus.ullTotalPhys %VX64\n", memStatus.ullTotalPhys));
     req.guestStats.u32PhysMemAvail      = (uint32_t)(memStatus.ullAvailPhys / systemInfo.dwPageSize);
     /* The current size of the committed memory limit, in bytes. This is physical memory plus the size of the page file, minus a small overhead. */
@@ -161 +161 @@
         if (gCtx.pfnGetPerformanceInfo(&perfInfo, sizeof(perfInfo)))
         {
-            dprintf(("PhysicalTotal     %VX64\n", perfInfo.PhysicalTotal));
-            dprintf(("PhysicalAvailable %VX64\n", perfInfo.PhysicalAvailable));
             req.guestStats.u32Processes         = perfInfo.ProcessCount;
             req.guestStats.u32Threads           = perfInfo.ThreadCount;
@@ -205 +203 @@
         uint64_t deltaKernel  = (pProcInfo->KernelTime.QuadPart - gCtx.ullLastCpuLoad_Kernel);
         uint64_t deltaUser    = (pProcInfo->UserTime.QuadPart - gCtx.ullLastCpuLoad_User);
+        deltaKernel          -= deltaIdle;  /* idle time is added to kernel time */
         uint64_t ullTotalTime = deltaIdle + deltaKernel + deltaUser;