Changeset 11180 in vbox for trunk/src/VBox/Main/win

Timestamp:

Aug 6, 2008 3:34:11 PM (17 years ago)

Author:

vboxsync

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

34200

Message:

PerfAPI: replaced unsigned long with ULONG to get rid of solaris 64-bit issue.

File:

• trunk/src/VBox/Main/win/PerformanceWin.cpp (modified) (7 diffs)

trunk/src/VBox/Main/win/PerformanceWin.cpp

@@ -36 +36 @@
     ~CollectorWin();
 
-    virtual int getHostCpuLoad(unsigned long *user, unsigned long *kernel, unsigned long *idle);
-    virtual int getHostCpuMHz(unsigned long *mhz);
-    virtual int getHostMemoryUsage(unsigned long *total, unsigned long *used, unsigned long *available);
-    virtual int getProcessCpuLoad(RTPROCESS process, unsigned long *user, unsigned long *kernel);
-    virtual int getProcessMemoryUsage(RTPROCESS process, unsigned long *used);
+    virtual int getHostCpuLoad(ULONG *user, ULONG *kernel, ULONG *idle);
+    virtual int getHostCpuMHz(ULONG *mhz);
+    virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
+    virtual int getProcessCpuLoad(RTPROCESS process, ULONG *user, ULONG *kernel);
+    virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
 
     virtual int getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle);
@@ -261 +261 @@
 }
 
-int CollectorWin::getHostCpuLoad(unsigned long *user, unsigned long *kernel, unsigned long *idle)
+int CollectorWin::getHostCpuLoad(ULONG *user, ULONG *kernel, ULONG *idle)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -334 +334 @@
 }
 
-int CollectorWin::getHostCpuMHz(unsigned long *mhz)
+int CollectorWin::getHostCpuMHz(ULONG *mhz)
 {
     return VERR_NOT_IMPLEMENTED;
 }
 
-int CollectorWin::getHostMemoryUsage(unsigned long *total, unsigned long *used, unsigned long *available)
+int CollectorWin::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
     MEMORYSTATUSEX mstat;
@@ -346 +346 @@
     if (GlobalMemoryStatusEx(&mstat))
     {
-        *total = (unsigned long)( mstat.ullTotalPhys / 1000 );
-        *available = (unsigned long)( mstat.ullAvailPhys / 1000 );
+        *total = (ULONG)( mstat.ullTotalPhys / 1000 );
+        *available = (ULONG)( mstat.ullAvailPhys / 1000 );
         *used = *total - *available;
     }
@@ -356 +356 @@
 }
 
-int CollectorWin::getProcessCpuLoad(RTPROCESS process, unsigned long *user, unsigned long *kernel)
+int CollectorWin::getProcessCpuLoad(RTPROCESS process, ULONG *user, ULONG *kernel)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -430 +430 @@
 }
 
-int CollectorWin::getProcessMemoryUsage(RTPROCESS process, unsigned long *used)
+int CollectorWin::getProcessMemoryUsage(RTPROCESS process, ULONG *used)
 {
     HRESULT hr;
@@ -472 +472 @@
                 return VERR_INTERNAL_ERROR;
             }
-            *used = (unsigned long)(u64used / 1024);
+            *used = (ULONG)(u64used / 1024);
             rc = VINF_SUCCESS;
         }