New upstream version 3.0.0upstream/3.0.0

1 files changed, 18 insertions, 11 deletions

diff --git a/ProcessList.c b/ProcessList.c
index 7482b03..36b494e 100644
--- a/ProcessList.c
+++ b/ProcessList.c
@@ -84,21 +84,28 @@ ProcessList* ProcessList_init(ProcessList* this, ObjectClass* klass, UsersTable*
    this->usersTable = usersTable;
    this->pidWhiteList = pidWhiteList;
    this->userId = userId;
-   
+
    // tree-view auxiliary buffer
    this->processes2 = Vector_new(klass, true, DEFAULT_SIZE);
-   
+
    // set later by platform-specific code
    this->cpuCount = 0;
 
 #ifdef HAVE_LIBHWLOC
    this->topologyOk = false;
-   int topoErr = hwloc_topology_init(&this->topology);
-   if (topoErr == 0) {
-      topoErr = hwloc_topology_load(this->topology);
-   }
-   if (topoErr == 0) {
-      this->topologyOk = true;
+   if (hwloc_topology_init(&this->topology) == 0) {
+      this->topologyOk =
+         #if HWLOC_API_VERSION < 0x00020000
+         /* try to ignore the top-level machine object type */
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_MACHINE) &&
+         /* ignore caches, which don't add structure */
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_CORE) &&
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_CACHE) &&
+         0 == hwloc_topology_set_flags(this->topology, HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM) &&
+         #else
+         0 == hwloc_topology_set_all_types_filter(this->topology, HWLOC_TYPE_FILTER_KEEP_STRUCTURE) &&
+         #endif
+         0 == hwloc_topology_load(this->topology);
    }
 #endif
 
@@ -138,10 +145,10 @@ void ProcessList_printHeader(ProcessList* this, RichString* header) {
 void ProcessList_add(ProcessList* this, Process* p) {
    assert(Vector_indexOf(this->processes, p, Process_pidCompare) == -1);
    assert(Hashtable_get(this->processTable, p->pid) == NULL);
-   
+
    Vector_add(this->processes, p);
    Hashtable_put(this->processTable, p->pid, p);
-   
+
    assert(Vector_indexOf(this->processes, p, Process_pidCompare) != -1);
    assert(Hashtable_get(this->processTable, p->pid) != NULL);
    assert(Hashtable_count(this->processTable) == Vector_count(this->processes));
@@ -353,7 +360,7 @@ void ProcessList_scan(ProcessList* this) {
    this->runningTasks = 0;
 
    ProcessList_goThroughEntries(this);
-   
+
    for (int i = Vector_size(this->processes) - 1; i >= 0; i--) {
       Process* p = (Process*) Vector_get(this->processes, i);
       if (p->updated == false)