Changeset 61084 in vbox for trunk

Timestamp:

May 20, 2016 8:48:52 AM (9 years ago)

Author:

vboxsync

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

107351

Message:

Main/PerformanceSolaris.cpp: fix struct version incompatibilities between Solaris versions by reading what we need (S10 has a struct with about 350 bytes, and S11.3 already has 440, with several increases for various S11 versions)

File:

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

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -306 +306 @@
     if (h != -1)
     {
-        if (read(h, &psinfo, sizeof(psinfo)) == sizeof(psinfo))
+        /* psinfo_t keeps growing, so only read what we need to maximize
+         * cross-version compatibility. The structures are compatible. */
+        ssize_t cb = RT_OFFSETOF(psinfo_t, pr_rssize) + RT_SIZEOFMEMB(psinfo_t, pr_rssize);
+        AssertCompile(RT_OFFSETOF(psinfo_t, pr_rssize) > RT_OFFSETOF(psinfo_t, pr_pid));
+        if (read(h, &psinfo, cb) == cb)
         {
             Assert((pid_t)process == psinfo.pr_pid);