Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/top/patches/04.percent_cpu.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Thu, 20 Mar 2014 07:05:00 -0700
branchs11-update
changeset 2993 2d33c9c7a5a3
parent 638 d348d0ea7b75
child 1134 9b5eb03884b6
permissions -rw-r--r--
18054012 Upgrade gtar to version 1.27.1 18054038 Update gtar to ASLR + 64b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
638
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     1
 
--- top-3.8beta1/machine/m_sunos5.c.orig	Tue Nov  8 11:23:08 2011
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     2
 
+++ top-3.8beta1/machine/m_sunos5.c	Tue Nov  8 11:23:11 2011
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -152,8 +152,17 @@
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     4
 
  * one of the spare slots in the prinfo structure.
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     5
 
  */
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     6
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     7
 
-#define percent_cpu(pp) (*(double *)dbl_align(&pp->pr_filler[0]))
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     8
 
+#if OSREV > 59
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     9
 
+/*
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    10
 
+ * on Solaris 10, psinfo.pr_filler is 4 bytes and not double-aligned, so we must * move our scratch space to the larger pr.lwp_pr_filler which is 20 bytes
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    11
 
+ * XXX this is a time bomb and will likely break in future Solaris releases.
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    12
 
+ */
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    13
 
+#define percent_cpu(pp) (*(double *)dbl_align(&pp->pr_lwp.pr_filler[0]))
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    14
 
+#else
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    15
 
+#define percent_cpu(pp) (*(double *)dbl_align(&pp->pr_filler[0]))
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    16
 
+#endif
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    17
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    18
 
+
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    19
 
 /* definitions for indices in the nlist array */
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    20
 
 #define X_V			 0
d348d0ea7b75 7101665 top crashes in getptable
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    21
 
 #define X_MPID			 1
upstream/oracle/userland-gate