author | akshay.kale@oracle.com <akshay.kale@oracle.com> |
Fri, 14 Oct 2016 13:13:27 -0700 | |
changeset 7112 | dab9beb5bc49 |
parent 5657 | 541cf9eb0302 |
permissions | -rw-r--r-- |
5657
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
1 |
# |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
2 |
# This patch was added for |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
3 |
# 15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
4 |
# |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
5 |
--- top-3.8beta1/machine/m_sunos5.c.orig 2016-03-23 10:33:23.778848582 -0700 |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
6 |
+++ top-3.8beta1/machine/m_sunos5.c 2016-03-23 10:33:37.697844284 -0700 |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
7 |
@@ -436,14 +436,22 @@ |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
8 |
if (pp->px_state == SONPROC && cpucount > 1) |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
9 |
{ |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
10 |
/* large #s may overflow colums */ |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
11 |
- if (pp->px_onpro < 100) |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
12 |
+ if (pp->px_onpro < 1000) |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
13 |
{ |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
14 |
- return snprintf(buf, sz, "cpu/%-2d", pp->px_onpro); |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
15 |
+ return snprintf(buf, sz, "cpu/%-3d", pp->px_onpro); |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
16 |
} |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
17 |
- return snprintf(buf, sz, "cpu/**"); |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
18 |
+ if (pp->px_onpro < 10000) |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
19 |
+ { |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
20 |
+ return snprintf(buf, sz, "cp/%-4d", pp->px_onpro); |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
21 |
+ } |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
22 |
+ if (pp->px_onpro < 100000) |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
23 |
+ { |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
24 |
+ return snprintf(buf, sz, "c/%-5d", pp->px_onpro); |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
25 |
+ } |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
26 |
+ return snprintf(buf, sz, "cpu/***"); |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
27 |
} |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
28 |
|
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
29 |
- return snprintf(buf, sz, "%-6s", state_abbrev[(int)pp->px_state]); |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
30 |
+ return snprintf(buf, sz, "%-7s", state_abbrev[(int)pp->px_state]); |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
31 |
} |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
32 |
|
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
33 |
int |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
34 |
@@ -488,7 +496,7 @@ |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
35 |
{ "NICE", 4, 1, 0, fmt_nice }, |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
36 |
{ "SIZE", 5, 1, 0, fmt_size }, |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
37 |
{ "RES", 5, 1, 0, fmt_res }, |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
38 |
- { "STATE", 6, 0, 0, fmt_state }, |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
39 |
+ { "STATE", 7, 0, 0, fmt_state }, |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
40 |
{ "TIME", 6, 1, 0, fmt_time }, |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
41 |
{ "CPU", 6, 1, 0, fmt_cpu }, |
541cf9eb0302
15706228 SUNBT7032615 top thinks that systems have 99 or fewer CPUs
Roger A. Faulkner <roger.faulkner@oracle.com>
parents:
diff
changeset
|
42 |
{ "COMMAND", 7, 0, 0, fmt_command }, |