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

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/linux/PerformanceLinux.cpp (modified) (7 diffs)

trunk/src/VBox/Main/linux/PerformanceLinux.cpp

@@ -34 +34 @@
 {
 public:
-    virtual int getHostCpuMHz(unsigned long *mhz);
-    virtual int getHostMemoryUsage(unsigned long *total, unsigned long *used, unsigned long *available);
-    virtual int getProcessMemoryUsage(RTPROCESS process, unsigned long *used);
+    virtual int getHostCpuMHz(ULONG *mhz);
+    virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
+    virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
 
     virtual int getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle);
     virtual int getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total);
 private:
-    int getRawProcessStats(RTPROCESS process, uint64_t *cpuUser, uint64_t *cpuKernel, unsigned long *memPagesUsed);
+    int getRawProcessStats(RTPROCESS process, uint64_t *cpuUser, uint64_t *cpuKernel, ULONG *memPagesUsed);
 };
 
@@ -57 +57 @@
 {
     int rc = VINF_SUCCESS;
-    unsigned long u32user, u32nice, u32kernel, u32idle;
+    ULONG u32user, u32nice, u32kernel, u32idle;
     FILE *f = fopen("/proc/stat", "r");
 
@@ -86 +86 @@
     if (RT_SUCCESS(rc))
     {
-        unsigned long ulTmp;
+        ULONG ulTmp;
         *total = (uint64_t)uHostUser + uHostKernel + uHostIdle;
         rc = getRawProcessStats(process, user, kernel, &ulTmp);
@@ -94 +94 @@
 }
 
-int CollectorLinux::getHostCpuMHz(unsigned long *mhz)
+int CollectorLinux::getHostCpuMHz(ULONG *mhz)
 {
     return E_NOTIMPL;
 }
 
-int CollectorLinux::getHostMemoryUsage(unsigned long *total, unsigned long *used, unsigned long *available)
+int CollectorLinux::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
     int rc = VINF_SUCCESS;
-    unsigned long buffers, cached;
+    ULONG buffers, cached;
     FILE *f = fopen("/proc/meminfo", "r");
 
@@ -126 +126 @@
 }
 
-int CollectorLinux::getProcessMemoryUsage(RTPROCESS process, unsigned long *used)
+int CollectorLinux::getProcessMemoryUsage(RTPROCESS process, ULONG *used)
 {
     uint64_t u64Tmp;
-    unsigned long nPagesUsed;
+    ULONG nPagesUsed;
     int rc = getRawProcessStats(process, &u64Tmp, &u64Tmp, &nPagesUsed);
     if (RT_SUCCESS(rc))
@@ -139 +139 @@
 }
 
-int CollectorLinux::getRawProcessStats(RTPROCESS process, uint64_t *cpuUser, uint64_t *cpuKernel, unsigned long *memPagesUsed)
+int CollectorLinux::getRawProcessStats(RTPROCESS process, uint64_t *cpuUser, uint64_t *cpuKernel, ULONG *memPagesUsed)
 {
     int rc = VINF_SUCCESS;
@@ -148 +148 @@
     uint64_t u64Tmp;
     unsigned uTmp;
-    unsigned long ulTmp, u32user, u32kernel;
+    ULONG ulTmp, u32user, u32kernel;
     char buf[80]; /* @todo: this should be tied to max allowed proc name. */