From 34ce0648debf85ebc74d1f4f3a2ef7c2c290798e Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Sat, 10 Oct 1998 21:41:57 +0000 Subject: [PATCH] Added names/labels/descriptions for the newly added SMP fields. --- sysdeps/names/cpu.c | 39 +++++++++++++++++++++++---------------- sysdeps/names/proctime.c | 12 ++++++++---- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/sysdeps/names/cpu.c b/sysdeps/names/cpu.c index 385c8e59..0a3bc9a3 100644 --- a/sysdeps/names/cpu.c +++ b/sysdeps/names/cpu.c @@ -23,13 +23,17 @@ const char *glibtop_names_cpu [GLIBTOP_MAX_CPU] = { - "total", "user", "nice", "sys", "idle", "frequency" + "total", "user", "nice", "sys", "idle", "frequency", + "xcpu_total", "xcpu_user", "xcpu_nice", "xcpu_sys", + "xcpu_idle" }; const unsigned glibtop_types_cpu [GLIBTOP_MAX_CPU] = { GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, - GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG + GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, + GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, + GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG }; const char *glibtop_labels_cpu [GLIBTOP_MAX_CPU] = @@ -39,22 +43,25 @@ const char *glibtop_labels_cpu [GLIBTOP_MAX_CPU] = N_("CPU Time in User Mode (nice)"), N_("CPU Time in System Mode"), N_("CPU Time in the Idle Task"), - N_("Tick Frequency") + N_("Tick Frequency"), + N_("SMP Total CPU Time"), + N_("SMP CPU Time in User Mode"), + N_("SMP CPU Time in User Mode (nice)"), + N_("SMP CPU Time in System Mode"), + N_("SMP CPU Time in the Idle Task") }; const char *glibtop_descriptions_cpu [GLIBTOP_MAX_CPU] = { - N_("The number of jiffies (1/100ths of a second) since " - "system boot"), - N_("The number of jiffies (1/100ths of a second) that " - "the system spent in user mode"), - N_("The number of jiffies (1/100ths of a second) that " - "the system spent in user mode with low priority (nice)"), - N_("The number of jiffies (1/100ths of a second) that " - "the system spent in system mode"), - N_("The number of jiffies (1/100ths of a second) that " - "the system spend in the idle task"), - N_("All of the above values are in jiffies (1/100ths of " - "a second) unless otherwise stated in this field " - "(i.e. 'frequency != 100')") + N_("Number of clock ticks since system boot"), + N_("Number of clock ticks the system spent in user mode"), + N_("Number of clock ticks the system spent in user mode (nice)"), + N_("Number of clock ticks the system spent in system mode"), + N_("Number of clock ticks the system spent in the idle task"), + N_("Tick frequency (default is 100)"), + N_("Number of clock ticks since system boot"), + N_("Number of clock ticks the system spent in user mode"), + N_("Number of clock ticks the system spent in user mode (nice)"), + N_("Number of clock ticks the system spent in system mode"), + N_("Number of clock ticks the system spent in the idle task"), }; diff --git a/sysdeps/names/proctime.c b/sysdeps/names/proctime.c index a6e142b6..b947c898 100644 --- a/sysdeps/names/proctime.c +++ b/sysdeps/names/proctime.c @@ -25,21 +25,23 @@ const char *glibtop_names_proc_time [GLIBTOP_MAX_PROC_TIME] = { "start_time", "rtime", "utime", "stime", "cutime", "cstime", - "timeout", "it_real_value", "timeout" + "timeout", "it_real_value", "timeout", "xcpu_utime", + "xcpu_stime" }; const unsigned glibtop_types_proc_time [GLIBTOP_MAX_PROC_TIME] = { GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, - GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG + GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, + GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG }; const char *glibtop_labels_proc_time [GLIBTOP_MAX_PROC_TIME] = { N_("Start_Time"), N_("RTime"), N_("UTime"), N_("STime"), N_("CUTime"), N_("CSTime"), N_("TimeOut"), N_("It_Real_Value"), - N_("Frequency") + N_("Frequency"), N_("XCPU_UTime"), N_("XCPU_STime") }; const char *glibtop_descriptions_proc_time [GLIBTOP_MAX_PROC_TIME] = @@ -53,7 +55,9 @@ const char *glibtop_descriptions_proc_time [GLIBTOP_MAX_PROC_TIME] = N_("The time (in jiffies) of the process's next timeout"), N_("The time (in jiffies) before the next SIGALRM is sent " "to the process due to an interval timer."), - N_("Tick frequency") + N_("Tick frequency"), + N_("SMP user-mode CPU time accumulated by process"), + N_("SMP kernel-mode CPU time accumulated by process") };