mirror of https://github.com/xzeldon/htop.git
CPU_KERNEL redefined
This commit is contained in:
senjan
parent
402e46bb82
commit
131a6c6e2b
4
Action.c
4
Action.c
|
|
@ -463,7 +463,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_KRNL], "kernel"); addstr("/");
|
||||
addattrstr(CRT_colors[CPU_IRQ], "irq"); addstr("/");
|
||||
addattrstr(CRT_colors[CPU_SOFTIRQ], "soft-irq"); addstr("/");
|
||||
addattrstr(CRT_colors[CPU_STEAL], "steal"); addstr("/");
|
||||
|
|
@ -473,7 +473,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_KRNL], "kernel"); addstr("/");
|
||||
addattrstr(CRT_colors[CPU_GUEST], "virtualiz");
|
||||
addattrstr(CRT_colors[BAR_SHADOW], " used%");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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_KRNL, 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_KRNL], 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_KRNL], 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);
|
||||
|
|
|
|||
14
CRT.c
14
CRT.c
|
|
@ -122,7 +122,7 @@ typedef enum ColorElements_ {
|
|||
CPU_NICE,
|
||||
CPU_NICE_TEXT,
|
||||
CPU_NORMAL,
|
||||
CPU_KERNEL,
|
||||
CPU_KRNL,
|
||||
CPU_IOWAIT,
|
||||
CPU_IRQ,
|
||||
CPU_SOFTIRQ,
|
||||
|
|
@ -226,7 +226,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_KRNL] = ColorPair(Red,Black),
|
||||
[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
|
||||
[CPU_IRQ] = ColorPair(Yellow,Black),
|
||||
[CPU_SOFTIRQ] = ColorPair(Magenta,Black),
|
||||
|
|
@ -285,7 +285,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_KRNL] = A_BOLD,
|
||||
[CPU_IOWAIT] = A_NORMAL,
|
||||
[CPU_IRQ] = A_BOLD,
|
||||
[CPU_SOFTIRQ] = A_BOLD,
|
||||
|
|
@ -344,7 +344,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_KRNL] = ColorPair(Red,White),
|
||||
[CPU_IOWAIT] = A_BOLD | ColorPair(Black, White),
|
||||
[CPU_IRQ] = ColorPair(Blue,White),
|
||||
[CPU_SOFTIRQ] = ColorPair(Blue,White),
|
||||
|
|
@ -403,7 +403,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_KRNL] = ColorPair(Red,Black),
|
||||
[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
|
||||
[CPU_IRQ] = A_BOLD | ColorPair(Blue,Black),
|
||||
[CPU_SOFTIRQ] = ColorPair(Blue,Black),
|
||||
|
|
@ -462,7 +462,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_KRNL] = A_BOLD | ColorPair(Red,Blue),
|
||||
[CPU_IOWAIT] = A_BOLD | ColorPair(Blue,Blue),
|
||||
[CPU_IRQ] = A_BOLD | ColorPair(Black,Blue),
|
||||
[CPU_SOFTIRQ] = ColorPair(Black,Blue),
|
||||
|
|
@ -521,7 +521,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_KRNL] = ColorPair(Red,Black),
|
||||
[CPU_IOWAIT] = ColorPair(Yellow,Black),
|
||||
[CPU_IRQ] = A_BOLD | ColorPair(Blue,Black),
|
||||
[CPU_SOFTIRQ] = ColorPair(Blue,Black),
|
||||
|
|
|
|||
Loading…
Reference in New Issue