utils/info: --topology -v shows topo info attrs

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

Author: bgoglin

utils/hwloc/hwloc-info.1in

@@ -37,6 +37,7 @@ This is the default if some objects are given on the command-line.
 \fB\-\-topology\fR
 Report a summary of the topology instead of about some specific objects.
 This is the default if no object is given on the command-line.
+If \-v is also given, topology info attributes are also shown.
 .TP
 \fB\-\-support\fR
 Report the features that are supported by hwloc on the topology.
@@ -266,6 +267,19 @@ To show the best-bandwidth node among NUMA nodes local to a PU:
      type = NUMANode
     ...
 
+To see info attributes of the topology:
+
+    $ hwloc-info --topology --verbose
+    depth 0:           1 Machine (type #0)
+     depth 1:          1 Package (type #1)
+      depth 2:         2 Core (type #2)
+       depth 3:        4 PU (type #3)
+    Special depth -3:  1 NUMANode (type #13)
+    info Backend = Linux
+    info LinuxCgroup = /user/622
+    info Architecture = x86_64
+    info hwlocVersion = 3.0.0a1-git
+
 .
 .\" **************************
 .\"    See also section

utils/hwloc/hwloc-info.c

@@ -817,6 +817,12 @@ main (int argc, char *argv[])
 
   if (mode == HWLOC_INFO_MODE_TOPOLOGY) {
     hwloc_lstopo_show_summary(stdout, topology);
+    if (verbose_mode > 0) {
+      struct hwloc_infos_s *infos = hwloc_topology_get_infos(topology);
+      unsigned i;
+      for(i=0; i<infos->count; i++)
+        printf("info %s = %s\n", infos->array[i].name, infos->array[i].value);
+    }
 
   } else if (mode == HWLOC_INFO_MODE_SUPPORT) {
     const struct hwloc_topology_support *support = hwloc_topology_get_support(topology);

utils/hwloc/test-hwloc-info.output

@@ -5,7 +5,7 @@ depth 0:           1 Machine (type #0)
    depth 3:        24 PU (type #3)
 Special depth -3:  2 NUMANode (type #13)
 
-# --topology
+# --topology --verbose
 depth 0:           1 Machine (type #0)
  depth 1:          2 Group0 (type #12)
   depth 2:         6 Core (type #2)

utils/hwloc/test-hwloc-info.sh.in

@@ -42,8 +42,8 @@ set -e
   echo "# (default)"
   $info --if synthetic --input "node:2 core:3 pu:4"
   echo
-  echo "# --topology"
-  $info --if synthetic --input "node:2 core:3 pu:4" --topology
+  echo "# --topology --verbose"
+  $info --if synthetic --input "node:2 core:3 pu:4" --topology --verbose
   echo
   echo "# --support"
   $info --if synthetic --input "node:2 core:3 pu:4" --support