distances: don't attach the matrix to Misc obje...

distances: don't attach the matrix to Misc objects

Those have a special depth, it would mess up the distance relative_depth

This fixes tests/hwloc_insert_misc on NUMA platforms.

This commit was SVN r5789.

diff --git a/src/distances.c b/src/distances.c
index bac26bb7f543ca3321893b19f2383ab2c9b22897..ca3f7eada2d6cb437732fcdbb50c470a1f2937f6 100644 (file)
--- a/src/distances.c
+++ b/src/distances.c
@@ -527,6 +527,9 @@ hwloc_distances__finalize_logical(struct hwloc_topology *topology,
     hwloc_bitmap_free(nodeset);
     return;
   }
+  /* don't attach to Misc objects */
+  while (root->type == HWLOC_OBJ_MISC)
+    root = root->parent;
   /* ideally, root has the exact cpuset and nodeset.
    * but ignoring or other things that remove objects may cause the object array to reduce */
   assert(hwloc_bitmap_isincluded(cpuset, root->cpuset));