From 7ca10817122d3b7b30fabb1cadb75e5ee14b364e Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 18 Nov 2011 06:08:56 +0000 Subject: Mega-commit with features and tweaks for 1.0: * Performance improvements * Support for splitting CPU meters into two or four columns (thanks to Wim Heirman) * Switch from PLPA, which is now deprecated, to HWLOC. * Bring back support for native Linux sched_setaffinity, so we don't have to use HWLOC where we don't need to. * Support for typing in user names and column fields in selection panels. --- Header.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'Header.c') diff --git a/Header.c b/Header.c index a30c834b..9a14b156 100644 --- a/Header.c +++ b/Header.c @@ -124,8 +124,16 @@ MeterModeId Header_readMeterMode(Header* this, int i, HeaderSide side) { return meter->mode; } -void Header_defaultMeters(Header* this) { - Vector_add(this->leftMeters, Meter_new(this->pl, 0, &AllCPUsMeter)); +void Header_defaultMeters(Header* this, int cpuCount) { + if (cpuCount > 8) { + Vector_add(this->leftMeters, Meter_new(this->pl, 0, &LeftCPUs2Meter)); + Vector_add(this->rightMeters, Meter_new(this->pl, 0, &RightCPUs2Meter)); + } else if (cpuCount > 4) { + Vector_add(this->leftMeters, Meter_new(this->pl, 0, &LeftCPUsMeter)); + Vector_add(this->rightMeters, Meter_new(this->pl, 0, &RightCPUsMeter)); + } else { + Vector_add(this->leftMeters, Meter_new(this->pl, 0, &AllCPUsMeter)); + } Vector_add(this->leftMeters, Meter_new(this->pl, 0, &MemoryMeter)); Vector_add(this->leftMeters, Meter_new(this->pl, 0, &SwapMeter)); Vector_add(this->rightMeters, Meter_new(this->pl, 0, &TasksMeter)); -- cgit v1.2.3