Changeset 10878 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 25, 2008 7:48:31 AM (17 years ago)

Author:

vboxsync

Message:

PerfAPI: Linux implementation ready

Location:

trunk/src/VBox/Main

Files:

• linux/PerformanceLinux.cpp (modified) (3 diffs)
• testcase/tstAPI.cpp (modified) (2 diffs)

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

@@ -39 +39 @@
     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);
 };
 
@@ -78 +80 @@
 {
     int rc = VINF_SUCCESS;
-    char *pszName;
-    pid_t pid2;
-    char c;
-    int iTmp;
-    unsigned uTmp;
-    unsigned long ulTmp, u32user, u32kernel;
-    char buf[80]; /* @todo: this should be tied to max allowed proc name. */
+    uint64_t uHostUser, uHostKernel, uHostIdle;
 
-    uint64_t uHostUser, uHostKernel, uHostIdle;
     rc = getRawHostCpuLoad(&uHostUser, &uHostKernel, &uHostIdle);
-    if (RT_FAILURE(rc))
-        return rc;
-    *total = (uint64_t)uHostUser + uHostKernel + uHostIdle;
-
-    RTStrAPrintf(&pszName, "/proc/%d/stat", process);
-    //printf("Opening %s...\n", pszName);
-    FILE *f = fopen(pszName, "r");
-    RTMemFree(pszName);
-
-    if (f)
+    if (RT_SUCCESS(rc))
     {
-        if (fscanf(f, "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu",
-                   &pid2, buf, &c, &iTmp, &iTmp, &iTmp, &iTmp, &iTmp, &uTmp,
-                   &ulTmp, &ulTmp, &ulTmp, &ulTmp, &u32user, &u32kernel) == 15)
-        {
-            Assert((pid_t)process == pid2);
-            *user = u32user;
-            *kernel = u32kernel;
-        }
-        else
-            rc = VERR_FILE_IO_ERROR;
-        fclose(f);
+        unsigned long ulTmp;
+        *total = (uint64_t)uHostUser + uHostKernel + uHostIdle;
+        rc = getRawProcessStats(process, user, kernel, &ulTmp);
     }
-    else
-        rc = VERR_ACCESS_DENIED;
 
     return rc;
@@ -145 +121 @@
     return rc;
 }
+
 int CollectorLinux::getProcessMemoryUsage(RTPROCESS process, unsigned long *used)
 {
-    return E_NOTIMPL;
+    uint64_t u64Tmp;
+    unsigned long nPagesUsed;
+    int rc = getRawProcessStats(process, &u64Tmp, &u64Tmp, &nPagesUsed);
+    if (RT_SUCCESS(rc))
+    {
+        Assert(getpagesize() >= 1024);
+        *used = nPagesUsed * (getpagesize() / 1024);
+    }
+    return rc;
+}
+
+int CollectorLinux::getRawProcessStats(RTPROCESS process, uint64_t *cpuUser, uint64_t *cpuKernel, unsigned long *memPagesUsed)
+{
+    int rc = VINF_SUCCESS;
+    char *pszName;
+    pid_t pid2;
+    char c;
+    int iTmp;
+    uint64_t u64Tmp;
+    unsigned uTmp;
+    unsigned long ulTmp, u32user, u32kernel;
+    char buf[80]; /* @todo: this should be tied to max allowed proc name. */
+
+    RTStrAPrintf(&pszName, "/proc/%d/stat", process);
+    //printf("Opening %s...\n", pszName);
+    FILE *f = fopen(pszName, "r");
+    RTMemFree(pszName);
+
+    if (f)
+    {
+        if (fscanf(f, "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu "
+                      "%ld %ld %ld %ld %ld %ld %llu %lu %ld",
+                   &pid2, buf, &c, &iTmp, &iTmp, &iTmp, &iTmp, &iTmp, &uTmp,
+                   &ulTmp, &ulTmp, &ulTmp, &ulTmp, &u32user, &u32kernel,
+                   &ulTmp, &ulTmp, &ulTmp, &ulTmp, &ulTmp, &ulTmp, &u64Tmp,
+                   &ulTmp, memPagesUsed) == 24)
+        {
+            Assert((pid_t)process == pid2);
+            *cpuUser   = u32user;
+            *cpuKernel = u32kernel;
+        }
+        else
+            rc = VERR_FILE_IO_ERROR;
+        fclose(f);
+    }
+    else
+        rc = VERR_ACCESS_DENIED;
+
+    return rc;
 }
 
 }
+

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -975 +975 @@
         CHECK_RC_BREAK (session->COMGETTER(Console) (console.asOutParam()));
 
-        RTThreadSleep(3000); // Sleep for 10 seconds
+        RTThreadSleep(5000); // Sleep for 5 seconds
 
         printf("Metrics collected with DSL machine running: --------------------\n");
@@ -981 +981 @@
 
         // Pause
-        printf ("Press enter to pause the VM execution in the remote session...");
-        getchar();
+        //printf ("Press enter to pause the VM execution in the remote session...");
+        //getchar();
         CHECK_RC (console->Pause());
 
-        RTThreadSleep(10000); // Sleep for 10 seconds
+        RTThreadSleep(5000); // Sleep for 5 seconds
 
         printf("Metrics collected with DSL machine paused: ---------------------\n");