Merge branch 'hishamhm-pull-914'

Action.c

@@ -479,7 +479,7 @@ static Htop_Reaction actionHelp(State* st) {
    if (settings->detailedCPUTime) {
       addattrstr(CRT_colors[CPU_NICE_TEXT], "low"); addstr("/");
       addattrstr(CRT_colors[CPU_NORMAL], "normal"); addstr("/");
-      addattrstr(CRT_colors[CPU_KERNEL], "kernel"); addstr("/");
+      addattrstr(CRT_colors[CPU_SYSTEM], "kernel"); addstr("/");
       addattrstr(CRT_colors[CPU_IRQ], "irq"); addstr("/");
       addattrstr(CRT_colors[CPU_SOFTIRQ], "soft-irq"); addstr("/");
       addattrstr(CRT_colors[CPU_STEAL], "steal"); addstr("/");
@@ -489,7 +489,7 @@ static Htop_Reaction actionHelp(State* st) {
    } else {
       addattrstr(CRT_colors[CPU_NICE_TEXT], "low-priority"); addstr("/");
       addattrstr(CRT_colors[CPU_NORMAL], "normal"); addstr("/");
-      addattrstr(CRT_colors[CPU_KERNEL], "kernel"); addstr("/");
+      addattrstr(CRT_colors[CPU_SYSTEM], "kernel"); addstr("/");
       addattrstr(CRT_colors[CPU_GUEST], "virtualiz");
       addattrstr(CRT_colors[BAR_SHADOW], "               used%");
    }

CPUMeter.c

@@ -34,7 +34,7 @@ typedef enum {
 }*/
 
 int CPUMeter_attributes[] = {
-   CPU_NICE, CPU_NORMAL, CPU_KERNEL, CPU_IRQ, CPU_SOFTIRQ, CPU_STEAL, CPU_GUEST, CPU_IOWAIT
+   CPU_NICE, CPU_NORMAL, CPU_SYSTEM, CPU_IRQ, CPU_SOFTIRQ, CPU_STEAL, CPU_GUEST, CPU_IOWAIT
 };
 
 #ifndef MIN
@@ -80,7 +80,7 @@ static void CPUMeter_display(Object* cast, RichString* out) {
    if (this->pl->settings->detailedCPUTime) {
       xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_KERNEL]);
       RichString_append(out, CRT_colors[METER_TEXT], "sy:");
-      RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
+      RichString_append(out, CRT_colors[CPU_SYSTEM], buffer);
       xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_NICE]);
       RichString_append(out, CRT_colors[METER_TEXT], "ni:");
       RichString_append(out, CRT_colors[CPU_NICE_TEXT], buffer);
@@ -106,7 +106,7 @@ static void CPUMeter_display(Object* cast, RichString* out) {
    } else {
       xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_KERNEL]);
       RichString_append(out, CRT_colors[METER_TEXT], "sys:");
-      RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
+      RichString_append(out, CRT_colors[CPU_SYSTEM], buffer);
       xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_NICE]);
       RichString_append(out, CRT_colors[METER_TEXT], "low:");
       RichString_append(out, CRT_colors[CPU_NICE_TEXT], buffer);

CRT.c

@@ -122,7 +122,7 @@ typedef enum ColorElements_ {
    CPU_NICE,
    CPU_NICE_TEXT,
    CPU_NORMAL,
-   CPU_KERNEL,
+   CPU_SYSTEM,
    CPU_IOWAIT,
    CPU_IRQ,
    CPU_SOFTIRQ,
@@ -229,7 +229,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = ColorPair(Blue,Black),
       [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue,Black),
       [CPU_NORMAL] = ColorPair(Green,Black),
-      [CPU_KERNEL] = ColorPair(Red,Black),
+      [CPU_SYSTEM] = ColorPair(Red,Black),
       [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
       [CPU_IRQ] = ColorPair(Yellow,Black),
       [CPU_SOFTIRQ] = ColorPair(Magenta,Black),
@@ -291,7 +291,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = A_NORMAL,
       [CPU_NICE_TEXT] = A_NORMAL,
       [CPU_NORMAL] = A_BOLD,
-      [CPU_KERNEL] = A_BOLD,
+      [CPU_SYSTEM] = A_BOLD,
       [CPU_IOWAIT] = A_NORMAL,
       [CPU_IRQ] = A_BOLD,
       [CPU_SOFTIRQ] = A_BOLD,
@@ -353,7 +353,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = ColorPair(Cyan,White),
       [CPU_NICE_TEXT] = ColorPair(Cyan,White),
       [CPU_NORMAL] = ColorPair(Green,White),
-      [CPU_KERNEL] = ColorPair(Red,White),
+      [CPU_SYSTEM] = ColorPair(Red,White),
       [CPU_IOWAIT] = A_BOLD | ColorPair(Black, White),
       [CPU_IRQ] = ColorPair(Blue,White),
       [CPU_SOFTIRQ] = ColorPair(Blue,White),
@@ -415,7 +415,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = ColorPair(Cyan,Black),
       [CPU_NICE_TEXT] = ColorPair(Cyan,Black),
       [CPU_NORMAL] = ColorPair(Green,Black),
-      [CPU_KERNEL] = ColorPair(Red,Black),
+      [CPU_SYSTEM] = ColorPair(Red,Black),
       [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
       [CPU_IRQ] = A_BOLD | ColorPair(Blue,Black),
       [CPU_SOFTIRQ] = ColorPair(Blue,Black),
@@ -477,7 +477,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = A_BOLD | ColorPair(Cyan,Blue),
       [CPU_NICE_TEXT] = A_BOLD | ColorPair(Cyan,Blue),
       [CPU_NORMAL] = A_BOLD | ColorPair(Green,Blue),
-      [CPU_KERNEL] = A_BOLD | ColorPair(Red,Blue),
+      [CPU_SYSTEM] = A_BOLD | ColorPair(Red,Blue),
       [CPU_IOWAIT] = A_BOLD | ColorPair(Blue,Blue),
       [CPU_IRQ] = A_BOLD | ColorPair(Black,Blue),
       [CPU_SOFTIRQ] = ColorPair(Black,Blue),
@@ -539,7 +539,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = ColorPair(Blue,Black),
       [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue,Black),
       [CPU_NORMAL] = ColorPair(Green,Black),
-      [CPU_KERNEL] = ColorPair(Red,Black),
+      [CPU_SYSTEM] = ColorPair(Red,Black),
       [CPU_IOWAIT] = ColorPair(Yellow,Black),
       [CPU_IRQ] = A_BOLD | ColorPair(Blue,Black),
       [CPU_SOFTIRQ] = ColorPair(Blue,Black),

CRT.h

@@ -110,7 +110,7 @@ typedef enum ColorElements_ {
    CPU_NICE,
    CPU_NICE_TEXT,
    CPU_NORMAL,
-   CPU_KERNEL,
+   CPU_SYSTEM,
    CPU_IOWAIT,
    CPU_IRQ,
    CPU_SOFTIRQ,

TasksMeter.c

@@ -15,7 +15,7 @@ in the source distribution for its full text.
 }*/
 
 int TasksMeter_attributes[] = {
-   CPU_KERNEL, PROCESS_THREAD, PROCESS, TASKS_RUNNING
+   CPU_SYSTEM, PROCESS_THREAD, PROCESS, TASKS_RUNNING
 };
 
 static void TasksMeter_updateValues(Meter* this, char* buffer, int len) {

solaris/SolarisProcessList.c

@@ -25,6 +25,8 @@ in the source distribution for its full text.
 
 #define MAXCMDLINE 255
 
+#define GZONE	"global    "
+#define UZONE	"unknown   "
 /*{
 
 #include <kstat.h>
@@ -62,12 +64,12 @@ typedef struct SolarisProcessList_ {
 char* SolarisProcessList_readZoneName(kstat_ctl_t* kd, SolarisProcess* sproc) {
   char* zname;
   if ( sproc->zoneid == 0 ) {
-     zname = xStrdup("global    ");
+     zname = xStrdup(GZONE);
   } else if ( kd == NULL ) {
-     zname = xStrdup("unknown   ");
+     zname = xStrdup(UZONE);
   } else {
      kstat_t* ks = kstat_lookup( kd, "zones", sproc->zoneid, NULL );
-     zname = xStrdup(ks->ks_name);
+     zname = xStrdup(ks == NULL ? UZONE : ks->ks_name);
   }
   return zname;
 }

solaris/SolarisProcessList.h

@@ -12,6 +12,8 @@ in the source distribution for its full text.
 
 #define MAXCMDLINE 255
 
+#define GZONE	"global    "
+#define UZONE	"unknown   "
 
 #include <kstat.h>
 #include <sys/param.h>