mirror of
https://github.com/xzeldon/htop.git
synced 2024-12-24 23:15:46 +00:00
500fb283e9
Promote the Arg union to a core data type in Object.c such that it is visible everywhere (many source files need it), and correct declarations of several functions that use it. The Process_sendSignal function is also corrected to have the expected return type (bool, not void) - an error being masked by ignoring this not-quite-harmless warning. I've also added error checking to the kill(2) call here, which was previously overlooked / missing (?).
120 lines
2.8 KiB
C
120 lines
2.8 KiB
C
/*
|
|
htop - Affinity.c
|
|
(C) 2004-2011 Hisham H. Muhammad
|
|
(C) 2020 Red Hat, Inc. All Rights Reserved.
|
|
Released under the GNU GPL, see the COPYING file
|
|
in the source distribution for its full text.
|
|
*/
|
|
|
|
#include "Affinity.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#ifdef HAVE_LIBHWLOC
|
|
#include <hwloc.h>
|
|
#if __linux__
|
|
#define HTOP_HWLOC_CPUBIND_FLAG HWLOC_CPUBIND_THREAD
|
|
#else
|
|
#define HTOP_HWLOC_CPUBIND_FLAG HWLOC_CPUBIND_PROCESS
|
|
#endif
|
|
#elif HAVE_LINUX_AFFINITY
|
|
#include <sched.h>
|
|
#endif
|
|
|
|
/*{
|
|
#include "Process.h"
|
|
#include "ProcessList.h"
|
|
|
|
typedef struct Affinity_ {
|
|
ProcessList* pl;
|
|
int size;
|
|
int used;
|
|
int* cpus;
|
|
} Affinity;
|
|
|
|
}*/
|
|
|
|
Affinity* Affinity_new(ProcessList* pl) {
|
|
Affinity* this = xCalloc(1, sizeof(Affinity));
|
|
this->size = 8;
|
|
this->cpus = xCalloc(this->size, sizeof(int));
|
|
this->pl = pl;
|
|
return this;
|
|
}
|
|
|
|
void Affinity_delete(Affinity* this) {
|
|
free(this->cpus);
|
|
free(this);
|
|
}
|
|
|
|
void Affinity_add(Affinity* this, int id) {
|
|
if (this->used == this->size) {
|
|
this->size *= 2;
|
|
this->cpus = xRealloc(this->cpus, sizeof(int) * this->size);
|
|
}
|
|
this->cpus[this->used] = id;
|
|
this->used++;
|
|
}
|
|
|
|
|
|
#ifdef HAVE_LIBHWLOC
|
|
|
|
Affinity* Affinity_get(Process* proc, ProcessList* pl) {
|
|
hwloc_cpuset_t cpuset = hwloc_bitmap_alloc();
|
|
bool ok = (hwloc_get_proc_cpubind(pl->topology, proc->pid, cpuset, HTOP_HWLOC_CPUBIND_FLAG) == 0);
|
|
Affinity* affinity = NULL;
|
|
if (ok) {
|
|
affinity = Affinity_new(pl);
|
|
if (hwloc_bitmap_last(cpuset) == -1) {
|
|
for (int i = 0; i < pl->cpuCount; i++) {
|
|
Affinity_add(affinity, i);
|
|
}
|
|
} else {
|
|
unsigned int id;
|
|
hwloc_bitmap_foreach_begin(id, cpuset);
|
|
Affinity_add(affinity, id);
|
|
hwloc_bitmap_foreach_end();
|
|
}
|
|
}
|
|
hwloc_bitmap_free(cpuset);
|
|
return affinity;
|
|
}
|
|
|
|
bool Affinity_set(Process* proc, Arg arg) {
|
|
Affinity *this = arg.v;
|
|
hwloc_cpuset_t cpuset = hwloc_bitmap_alloc();
|
|
for (int i = 0; i < this->used; i++) {
|
|
hwloc_bitmap_set(cpuset, this->cpus[i]);
|
|
}
|
|
bool ok = (hwloc_set_proc_cpubind(this->pl->topology, proc->pid, cpuset, HTOP_HWLOC_CPUBIND_FLAG) == 0);
|
|
hwloc_bitmap_free(cpuset);
|
|
return ok;
|
|
}
|
|
|
|
#elif HAVE_LINUX_AFFINITY
|
|
|
|
Affinity* Affinity_get(Process* proc, ProcessList* pl) {
|
|
cpu_set_t cpuset;
|
|
bool ok = (sched_getaffinity(proc->pid, sizeof(cpu_set_t), &cpuset) == 0);
|
|
if (!ok) return NULL;
|
|
Affinity* affinity = Affinity_new(pl);
|
|
for (int i = 0; i < pl->cpuCount; i++) {
|
|
if (CPU_ISSET(i, &cpuset))
|
|
Affinity_add(affinity, i);
|
|
}
|
|
return affinity;
|
|
}
|
|
|
|
bool Affinity_set(Process* proc, Arg arg) {
|
|
Affinity *this = arg.v;
|
|
cpu_set_t cpuset;
|
|
CPU_ZERO(&cpuset);
|
|
for (int i = 0; i < this->used; i++) {
|
|
CPU_SET(this->cpus[i], &cpuset);
|
|
}
|
|
bool ok = (sched_setaffinity(proc->pid, sizeof(unsigned long), &cpuset) == 0);
|
|
return ok;
|
|
}
|
|
|
|
#endif
|