mirror of https://github.com/xzeldon/htop.git
Plug mem leak, improve CPU enumeration logic
I think this leak may still exist in the FreeBSD port.
This commit is contained in:
parent
be9edc5d43
commit
198592a0f1
|
@ -48,19 +48,21 @@ static long fscale;
|
|||
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
|
||||
int mib[] = { CTL_HW, HW_NCPU };
|
||||
int fmib[] = { CTL_KERN, KERN_FSCALE };
|
||||
int i;
|
||||
int i, e;
|
||||
OpenBSDProcessList* fpl = calloc(1, sizeof(OpenBSDProcessList));
|
||||
ProcessList* pl = (ProcessList*) fpl;
|
||||
size_t size = sizeof(pl->cpuCount);
|
||||
|
||||
ProcessList_init(pl, Class(OpenBSDProcess), usersTable, pidWhiteList, userId);
|
||||
pl->cpuCount = 1; // default to 1 on sysctl() error
|
||||
(void)sysctl(mib, 2, &pl->cpuCount, &size, NULL, 0);
|
||||
e = sysctl(mib, 2, &pl->cpuCount, &size, NULL, 0);
|
||||
if (e == -1 || pl->cpuCount < 1) {
|
||||
pl->cpuCount = 1;
|
||||
}
|
||||
fpl->cpus = realloc(fpl->cpus, pl->cpuCount * sizeof(CPUData));
|
||||
|
||||
size = sizeof(fscale);
|
||||
if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0)
|
||||
err(1, "fscale sysctl call failed");
|
||||
err(1, "fscale sysctl call failed");
|
||||
|
||||
for (i = 0; i < pl->cpuCount; i++) {
|
||||
fpl->cpus[i].totalTime = 1;
|
||||
|
@ -80,6 +82,8 @@ void ProcessList_delete(ProcessList* this) {
|
|||
const OpenBSDProcessList* fpl = (OpenBSDProcessList*) this;
|
||||
if (fpl->kd) kvm_close(fpl->kd);
|
||||
|
||||
free(fpl->cpus);
|
||||
|
||||
ProcessList_done(this);
|
||||
free(this);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue