Skip to content

Two-channel graph (Graph2) meter style #1415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Explorer09 wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Two-channel graph (Graph2) meter style #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7b4558f
Allow guest time to be hidden in "non-detailed" CPU meter
Explorer09 Mar 17, 2026
0eec9d6
netbsd & openbsd: Simplify CPU meter value assignment code
Explorer09 Mar 17, 2026
3a61af7
Revert "Fix CPU virtualization bar color and help text in non-detaile…
Explorer09 Mar 18, 2026
7fb4d52
Restore "virtualized" word for non-detailed CPU meter in help screen
Explorer09 Mar 18, 2026
b7eb686
Use CPU_METER_STEAL for 'virtualized' CPU time in non-detailed mode
Explorer09 Mar 18, 2026
cca350e
Round graph meter dynamic scale and print graph scale
Explorer09 Nov 2, 2025
c578196
Introduce powerOf2Floor() and popCount8() functions
Explorer09 Dec 2, 2025
7a84121
Graph meter coloring (with GraphData structure rework)
Explorer09 Mar 9, 2026
6456774
Remove unused constant defines of graph meter code
Explorer09 Mar 9, 2026
24f0518
Introduce "Graph2" meter style (two-channel graph)
Explorer09 Mar 9, 2026
0090462
NetworkIOMeter: add "Graph2" meter mode support
Explorer09 Mar 9, 2026
fcd8227
DiskIOMeter: add "Graph2" meter mode support
Explorer09 Mar 9, 2026
2f70f10
Add a special "details" value for "Graph2" meter drawing
Explorer09 Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Action.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,9 +781,12 @@ static Htop_Reaction actionHelp(State* st) {
addbartext(CRT_colors[CPU_GUEST], "/", "guest");
addbartext(CRT_colors[CPU_IOWAIT], "/", "io-wait");
addbartext(CRT_colors[BAR_SHADOW], " ", "used%");
} else if (CRT_colorScheme == COLORSCHEME_MONOCHROME) {
addbartext(CRT_colors[CPU_STEAL], "/-/-/", "virtualized");
addbartext(CRT_colors[BAR_SHADOW], " ", "used%");
} else {
addbartext(CRT_colors[CPU_GUEST], "/", "virt");
addbartext(CRT_colors[BAR_SHADOW], " ", "used%");
addbartext(CRT_colors[CPU_STEAL], "/", "virtualized");
addbartext(CRT_colors[BAR_SHADOW], " ", "used%");
}
addattrstr(CRT_colors[BAR_BORDER], "]");

Expand Down
12 changes: 0 additions & 12 deletions CPUMeter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@ 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;
Expand Down Expand Up @@ -89,11 +82,6 @@ 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) {
Expand Down
8 changes: 6 additions & 2 deletions DiskIOMeter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,10 @@ static void DiskIOMeter_updateMode(Meter* this, MeterModeId mode) {
this->mode = mode;

Meter_setMode(data->diskIORateMeter, mode);

// DiskIOTimeMeter does not support "Graph2" mode
if (mode == GRAPH2_METERMODE)
mode = GRAPH_METERMODE;
Meter_setMode(data->diskIOTimeMeter, mode);

this->h = MAXIMUM(data->diskIORateMeter->h, data->diskIOTimeMeter->h);
Expand All @@ -310,7 +314,7 @@ const MeterClass DiskIORateMeter_class = {
},
.updateValues = DiskIORateMeter_updateValues,
.defaultMode = TEXT_METERMODE,
.supportedModes = METERMODE_DEFAULT_SUPPORTED,
.supportedModes = METERMODE_DEFAULT_SUPPORTED | (1 << GRAPH2_METERMODE),
.maxItems = 2,
.isPercentChart = false,
.total = 1.0,
Expand Down Expand Up @@ -348,7 +352,7 @@ const MeterClass DiskIOMeter_class = {
},
.updateValues = DiskIOMeter_updateValues,
.defaultMode = TEXT_METERMODE,
.supportedModes = METERMODE_DEFAULT_SUPPORTED,
.supportedModes = METERMODE_DEFAULT_SUPPORTED | (1 << GRAPH2_METERMODE),
.isMultiColumn = true,
.name = "DiskIO",
.uiName = "Disk IO",
Expand Down
Loading
Loading