Changeset 98020 in vbox for trunk/src/VBox/Main/src-server/solaris

Timestamp:

Jan 6, 2023 8:34:59 PM (2 years ago)

Author:

vboxsync

Message:

Main/PerformanceSolaris.cpp: 4 warnings, two involving what seems like 32-bit code not properly updated to 64-bit.

File:

• trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -296 +296 @@
     {
         *total = totalRAM;
-        *available = cb / 1024;
+        *available = (ULONG)RT_MIN(cb / 1024, ~(ULONG)0);
         *used = *total - *available;
     }
@@ -322 +322 @@
         {
             Assert((pid_t)process == psinfo.pr_pid);
-            *used = psinfo.pr_rssize;
+            *used = (ULONG)RT_MIN(psinfo.pr_rssize, ~(ULONG)0);
         }
         else
@@ -378 +378 @@
 uint64_t CollectorSolaris::wrapDetection(uint64_t cur, uint64_t prev, const char *name)
 {
-    static bool fNotSeen = true;
-
-    if (fNotSeen && cur < prev)
-    {
-        fNotSeen = false;
-        LogRel(("Detected wrap on %s (%llu < %llu).\n", name, cur, prev));
-    }
+    if (cur < prev)
+        LogRelMax(2, ("Detected wrap on %s (%llu < %llu).\n", name, cur, prev));
     return cur;
 }
@@ -429 +424 @@
     }
     kstat_named_t *kn;
-    if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"rbytes64")) == 0)
-    {
+    if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"rbytes64")) == NULL)
+    {
+        if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"rbytes")) == NULL)
+        {
+            LogRel(("kstat_data_lookup(rbytes) -> %d, name=%s\n", errno, name));
+            return VERR_INTERNAL_ERROR;
+        }
+#if ARCH_BITS == 32
         if (g_fNotReported)
         {
@@ -436 +437 @@
             LogRel(("Failed to locate rbytes64, falling back to 32-bit counters...\n"));
         }
-        if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"rbytes")) == 0)
-        {
-            LogRel(("kstat_data_lookup(rbytes) -> %d, name=%s\n", errno, name));
+        *rx = wrapCorrection(kn->value.ul, *rx, "rbytes");
+#else
+        AssertCompile(sizeof(kn->value.ul) == sizeof(uint64_t));
+        *rx = wrapDetection(kn->value.ul, *rx, "rbytes");
+#endif
+    }
+    else
+        *rx = wrapDetection(kn->value.ull, *rx, "rbytes64");
+    if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"obytes64")) == NULL)
+    {
+        if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"obytes")) == NULL)
+        {
+            LogRel(("kstat_data_lookup(obytes) -> %d\n", errno));
             return VERR_INTERNAL_ERROR;
         }
-        *rx = wrapCorrection(kn->value.ul, *rx, "rbytes");
-    }
-    else
-        *rx = wrapDetection(kn->value.ull, *rx, "rbytes64");
-    if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"obytes64")) == 0)
-    {
+#if ARCH_BITS == 32
         if (g_fNotReported)
         {
@@ -452 +458 @@
             LogRel(("Failed to locate obytes64, falling back to 32-bit counters...\n"));
         }
-        if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"obytes")) == 0)
-        {
-            LogRel(("kstat_data_lookup(obytes) -> %d\n", errno));
-            return VERR_INTERNAL_ERROR;
-        }
         *tx = wrapCorrection(kn->value.ul, *tx, "obytes");
+#else
+        AssertCompile(sizeof(kn->value.ul) == sizeof(uint64_t));
+        *tx = wrapDetection(kn->value.ul, *tx, "obytes");
+#endif
     }
     else