Changeset 107560 in vbox for trunk/src

Timestamp:

Jan 9, 2025 8:56:01 AM (7 weeks ago)

Author:

vboxsync

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

166633

Message:

src/VBox/Main/testcase/tstCollector.cpp: Fixed warnings found by Parfait (assignment unused). Lots of renaming, needs further cleanup. jiraref:VBP-1424

File:

• trunk/src/VBox/Main/testcase/tstCollector.cpp (modified) (32 diffs)

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

@@ -177 +177 @@
     {
         RTPrintf("tstCollector: preCollect() -> %Rrc\n", rc);
-        return 1;
+        return rc;
     }
     rc = collector->getRawHostNetworkLoad(NETIFNAME, &hostRxStart, &hostTxStart);
@@ -187 +187 @@
         {
             RTPrintf("tstCollector: getRawHostNetworkLoad() -> %Rrc\n", rc);
-            return 1;
+            return rc;
         }
 
@@ -196 +196 @@
         {
             RTPrintf("tstCollector: preCollect() -> %Rrc\n", rc);
-            return 1;
+            return rc;
         }
         hostRxStop = hostRxStart;
@@ -204 +204 @@
         {
             RTPrintf("tstCollector: getRawHostNetworkLoad() -> %Rrc\n", rc);
-            return 1;
+            return rc;
         }
         RTPrintf("tstCollector: host network speed = %llu bytes/sec (%llu mbit/sec)\n",
@@ -218 +218 @@
     }
 
-    return 0;
+    return rc;
 }
 
@@ -236 +236 @@
         {
             RTPrintf("tstCollector: getHostFilesystemUsage() -> %Rrc\n", rc);
-            return 1;
+            return rc;
         }
         RTPrintf("tstCollector: host root fs total     = %lu MB\n", total);
@@ -242 +242 @@
         RTPrintf("tstCollector: host root fs available = %lu MB\n\n", available);
     }
-    return 0;
+    return rc;
 }
 
@@ -260 +260 @@
         {
             RTPrintf("tstCollector: getDiskListByFs(%s) -> %Rrc\n", FSNAME, rc);
-            return 1;
+            return rc;
         }
         if (disksUsage.empty())
         {
             RTPrintf("tstCollector: getDiskListByFs(%s) returned empty usage list\n", FSNAME);
-            return 0;
+            return VINF_SUCCESS;
         }
         if (disksLoad.empty())
         {
             RTPrintf("tstCollector: getDiskListByFs(%s) returned empty usage list\n", FSNAME);
-            return 0;
+            return VINF_SUCCESS;
         }
 
@@ -284 +284 @@
             {
                 RTPrintf("tstCollector: getHostDiskSize() -> %Rrc\n", rc);
-                return 1;
+                return rc;
             }
         }
@@ -297 +297 @@
             {
                 RTPrintf("tstCollector: preCollect() -> %Rrc\n", rc);
-                return 1;
+                return rc;
             }
             rc = collector->getRawHostDiskLoad(it->c_str(), &diskMsStart, &totalMsStart);
@@ -303 +303 @@
             {
                 RTPrintf("tstCollector: getRawHostDiskLoad() -> %Rrc\n", rc);
-                return 1;
+                return rc;
             }
 
@@ -312 +312 @@
             {
                 RTPrintf("tstCollector: preCollect() -> %Rrc\n", rc);
-                return 1;
+                return rc;
             }
             rc = collector->getRawHostDiskLoad(it->c_str(), &diskMsStop, &totalMsStop);
@@ -318 +318 @@
             {
                 RTPrintf("tstCollector: getRawHostDiskLoad() -> %Rrc\n", rc);
-                return 1;
+                return rc;
             }
             RTPrintf("tstCollector: host disk util    = %llu msec (%u.%u %%), total = %llu msec\n\n",
@@ -328 +328 @@
     }
 
-    return 0;
+    return VINF_SUCCESS;
 }
 
@@ -335 +335 @@
 int main(int argc, char *argv[])
 {
-    bool cpuTest, ramTest, netTest, diskTest, fsTest, perfTest;
-    cpuTest = ramTest = netTest = diskTest = fsTest = perfTest = false;
     /*
      * Initialize the VBox runtime without loading
@@ -344 +342 @@
     if (RT_FAILURE(rc))
     {
-        RTPrintf("tstCollector: RTR3InitExe() -> %d\n", rc);
-        return 1;
-    }
+        RTPrintf("tstCollector: RTR3InitExe() -> %Rrc\n", rc);
+        return RTEXITCODE_FAILURE;
+    }
+
+    bool cpuTest, ramTest, netTest, diskTest, fsTest, perfTest;
+
+    cpuTest = ramTest = netTest = diskTest = fsTest = perfTest = false;
+
     if (argc > 1)
     {
@@ -372 +375 @@
             {
                 RTPrintf("tstCollector: Unknown option: %s\n", argv[i]);
-                return 2;
+                return RTEXITCODE_SYNTAX;
             }
         }
@@ -398 +401 @@
     {
         RTPrintf("tstCollector: createMetricFactory() failed\n");
-        return 1;
+        return RTEXITCODE_FAILURE;
     }
 
@@ -425 +428 @@
     {
         RTPrintf("tstCollector: preCollect() -> %Rrc\n", rc);
-        return 1;
+        return RTEXITCODE_FAILURE;
     }
     if (cpuTest)
@@ -435 +438 @@
         {
             RTPrintf("tstCollector: getRawHostCpuLoad() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         rc = collector->getRawProcessCpuLoad(RTProcSelf(), &processUserStart, &processKernelStart, &processTotalStart);
@@ -441 +444 @@
         {
             RTPrintf("tstCollector: getRawProcessCpuLoad() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
 
@@ -450 +453 @@
         {
             RTPrintf("tstCollector: preCollect() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         rc = collector->getRawHostCpuLoad(&hostUserStop, &hostKernelStop, &hostIdleStop);
@@ -456 +459 @@
         {
             RTPrintf("tstCollector: getRawHostCpuLoad() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         rc = collector->getRawProcessCpuLoad(RTProcSelf(), &processUserStop, &processKernelStop, &processTotalStop);
@@ -462 +465 @@
         {
             RTPrintf("tstCollector: getRawProcessCpuLoad() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         hostTotal = hostUserStop - hostUserStart
@@ -488 +491 @@
         {
             RTPrintf("tstCollector: preCollect() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         rc = collector->getRawHostCpuLoad(&hostUserStart, &hostKernelStart, &hostIdleStart);
@@ -494 +497 @@
         {
             RTPrintf("tstCollector: getRawHostCpuLoad() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         rc = collector->getRawProcessCpuLoad(RTProcSelf(), &processUserStart, &processKernelStart, &processTotalStart);
@@ -500 +503 @@
         {
             RTPrintf("tstCollector: getRawProcessCpuLoad() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         start = RTTimeMilliTS();
@@ -509 +512 @@
         {
             RTPrintf("tstCollector: preCollect() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         rc = collector->getRawHostCpuLoad(&hostUserStop, &hostKernelStop, &hostIdleStop);
@@ -515 +518 @@
         {
             RTPrintf("tstCollector: getRawHostCpuLoad() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         rc = collector->getRawProcessCpuLoad(RTProcSelf(), &processUserStop, &processKernelStop, &processTotalStop);
@@ -521 +524 @@
         {
             RTPrintf("tstCollector: getRawProcessCpuLoad() -> %Rrc\n", rc);
-            return 1;
+            return RTEXITCODE_FAILURE;
         }
         hostTotal = hostUserStop - hostUserStart
@@ -553 +556 @@
         {
             RTPrintf("tstCollector: getHostMemoryUsage() -> %Rrc\n", rc);
-            return 1;
-        }
+            return RTEXITCODE_FAILURE;
+        }
+
         rc = collector->getProcessMemoryUsage(RTProcSelf(), &processUsed);
         if (RT_FAILURE(rc))
         {
             RTPrintf("tstCollector: getProcessMemoryUsage() -> %Rrc\n", rc);
-            return 1;
-        }
+            return RTEXITCODE_FAILURE;
+        }
+
         RTPrintf("tstCollector: host mem total     = %lu kB\n", total);
         RTPrintf("tstCollector: host mem used      = %lu kB\n", used);
@@ -568 +573 @@
 
     if (netTest)
-        rc = testNetwork(collector);
+        testNetwork(collector);
     if (fsTest)
-    rc = testFsUsage(collector);
+        testFsUsage(collector);
     if (diskTest)
-        rc = testDisk(collector);
+        testDisk(collector);
+
     if (perfTest)
     {
         RTPrintf("tstCollector: TESTING - Performance\n\n");
-
         measurePerformance(collector, argv[0], 100);
     }