mirror of https://github.com/xzeldon/htop.git
Merge branch 'pcp-dynamic-cpu'
This commit is contained in:
commit
c31fd3c691
|
@ -23,22 +23,17 @@ in the source distribution for its full text.
|
||||||
#include "pcp/PCPProcess.h"
|
#include "pcp/PCPProcess.h"
|
||||||
|
|
||||||
|
|
||||||
static int PCPProcessList_computeCPUcount(void) {
|
|
||||||
int cpus;
|
|
||||||
if ((cpus = Platform_getMaxCPU()) <= 0)
|
|
||||||
cpus = Metric_instanceCount(PCP_PERCPU_SYSTEM);
|
|
||||||
return cpus > 1 ? cpus : 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void PCPProcessList_updateCPUcount(PCPProcessList* this) {
|
static void PCPProcessList_updateCPUcount(PCPProcessList* this) {
|
||||||
ProcessList* pl = &(this->super);
|
ProcessList* pl = &(this->super);
|
||||||
unsigned int cpus = PCPProcessList_computeCPUcount();
|
pl->activeCPUs = Metric_instanceCount(PCP_PERCPU_SYSTEM);
|
||||||
|
unsigned int cpus = Platform_getMaxCPU();
|
||||||
if (cpus == pl->existingCPUs)
|
if (cpus == pl->existingCPUs)
|
||||||
return;
|
return;
|
||||||
|
if (cpus <= 0)
|
||||||
|
cpus = pl->activeCPUs;
|
||||||
|
if (cpus <= 1)
|
||||||
|
cpus = pl->activeCPUs = 1;
|
||||||
pl->existingCPUs = cpus;
|
pl->existingCPUs = cpus;
|
||||||
// TODO: support offline CPUs and hot swapping
|
|
||||||
pl->activeCPUs = pl->existingCPUs;
|
|
||||||
|
|
||||||
free(this->percpu);
|
free(this->percpu);
|
||||||
free(this->values);
|
free(this->values);
|
||||||
|
@ -695,9 +690,10 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
|
||||||
|
|
||||||
bool ProcessList_isCPUonline(const ProcessList* super, unsigned int id) {
|
bool ProcessList_isCPUonline(const ProcessList* super, unsigned int id) {
|
||||||
assert(id < super->existingCPUs);
|
assert(id < super->existingCPUs);
|
||||||
|
(void) super;
|
||||||
|
|
||||||
// TODO: support offline CPUs and hot swapping
|
pmAtomValue value;
|
||||||
(void) super; (void) id;
|
if (Metric_instance(PCP_PERCPU_SYSTEM, id, id, &value, PM_TYPE_U32))
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue