diff --git a/Action.c b/Action.c index c5375dd48..8123c4c8d 100644 --- a/Action.c +++ b/Action.c @@ -744,8 +744,8 @@ static Htop_Reaction actionHelp(State* st) { addbartext(CRT_colors[CPU_IOWAIT], "/", "io-wait"); addbartext(CRT_colors[BAR_SHADOW], " ", "used%"); } else { - addbartext(CRT_colors[CPU_GUEST], "/", "guest"); - addbartext(CRT_colors[BAR_SHADOW], " ", "used%"); + addbartext(CRT_colors[CPU_GUEST], "/", "virt"); + addbartext(CRT_colors[BAR_SHADOW], " ", "used%"); } addattrstr(CRT_colors[BAR_BORDER], "]"); diff --git a/CPUMeter.c b/CPUMeter.c index 40eaac10b..54cfa2673 100644 --- a/CPUMeter.c +++ b/CPUMeter.c @@ -36,6 +36,13 @@ static const int CPUMeter_attributes[] = { CPU_IOWAIT }; +static const int CPUMeter_attributes_summary[] = { + CPU_NICE, + CPU_NORMAL, + CPU_SYSTEM, + CPU_GUEST +}; + typedef struct CPUMeterData_ { unsigned int cpus; Meter** meters; @@ -68,6 +75,11 @@ static void CPUMeter_updateValues(Meter* this) { const Machine* host = this->host; const Settings* settings = host->settings; + if (settings->detailedCPUTime) { + this->curAttributes = CPUMeter_attributes; + } else { + this->curAttributes = CPUMeter_attributes_summary; + } unsigned int cpu = this->param; if (cpu > host->existingCPUs) {