linux: reoder annotated before parsing/inserting distances

Otherwise the matrix would be wrong.

Further fixes commit c1c34a6

Signed-off-by: Brice Goglin <[email protected]>

hwloc/topology-linux.c

@@ -3987,11 +3987,20 @@ annotate_sysfsnode(struct hwloc_topology *topology,
     return 0;
   }
 
-  for(i=0, node=hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NUMANODE, NULL);
-      i<nbnodes;
-      i++, node = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NUMANODE, node)) {
+  for(node=hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NUMANODE, NULL);
+      node != NULL;
+      node = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NUMANODE, node)) {
     assert(node); /* list_sysfsnode() ensured that sysfs nodes and existing nodes match */
-    nodes[i] = node;
+
+    /* hwloc_parse_nodes_distances() requires nodes in physical index order,
+     * and inserting distances requires nodes[] and indexes[] in same order.
+     */
+    for(i=0; i<nbnodes; i++)
+      if (indexes[i] == node->os_index) {
+	nodes[i] = node;
+	break;
+      }
+
     hwloc_get_sysfs_node_meminfo(data, path, node->os_index, &node->attr->numanode);
   }
 

tests/hwloc/x86+linux/64amd64-4p2n4ca2co.topoextnuma.output

@@ -685,7 +685,7 @@
     </object>
   </object>
   <distances2 type="NUMANode" nbobjs="8" kind="5" indexing="os">
-    <indexes length="16">0 1 6 7 2 3 4 5 </indexes>
+    <indexes length="16">0 1 2 3 4 5 6 7 </indexes>
     <u64values length="30">10 16 16 22 16 22 16 22 16 10 </u64values>
     <u64values length="30">22 16 16 22 22 16 16 22 10 16 </u64values>
     <u64values length="30">16 16 16 16 22 16 16 10 16 16 </u64values>