utils/annotate: "topology" location may be used to manipulate topo attributes

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>

Author: bgoglin

utils/hwloc/hwloc-annotate.1in

@@ -80,8 +80,12 @@ This is specified by the \fImode\fR:
 .B info <name> <value>
 Specifies a new string info attribute whose name is \fIname\fR and
 value is \fIvalue\fR.
+
 If \fBlocation\fR is \fIcpukind#<N>\fR, operate on the info attributes
 of the N-th cpukind.
+
+If \fBlocation\fR is \fItopology\fR, operate on the topology info
+attributes instead of on objects.
 .TP
 .B subtype <subtype>
 Specifies that the subtype attribute of the object should now be \fIsubtype\fR.
@@ -228,6 +232,10 @@ Remove all info attributes from the first cpukind:
 
     $ hwloc-annotate --ci input.xml output.xml -- cpukind#0 -- none
 
+Add an info attribute to the topology:
+
+    $ hwloc-annotate input.xml output.xml -- topology -- info GotThisTopology FromMyGreatServerYesterday
+
 Add a Misc object named "foobar" under the root object of the topology
 and modify the input XML directly:
 

utils/hwloc/hwloc-annotate.c

@@ -801,6 +801,8 @@ int main(int argc, char *argv[])
               } else {
                 apply_infos(infos);
               }
+            } else if (!strcmp(location, "topology") && (infoname || clearinfos)) {
+              apply_infos(hwloc_topology_get_infos(topology));
             } else if (!strcmp(location, "all")) {
 	      apply_recursive(topology, hwloc_get_root_obj(topology));
 	    } else if (!strcmp(location, "root")) {

utils/hwloc/test-hwloc-annotate.output

@@ -180,4 +180,5 @@
     <info name="foo" value="bar"/>
     <info name="foo2" value="bar2"/>
   </cpukind>
+  <info name="Foooo" value="Barrr"/>
 </topology>

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

@@ -46,6 +46,7 @@ $annotate $srcdir/test-hwloc-annotate.input $file pu:0 misc pumisc
 $annotate $file $file root misc rootmisc
 $annotate $file $file misc:0 misc miscmisc1
 $annotate $file $file all info Foo Bar
+$annotate $file $file topology info Foooo Barrr
 $annotate --ci $file $file -- Core:all L3:all -- info Foo2 Bar2
 $annotate --ci $file $file L2Cache:0 none
 $annotate --ri $file $file pack:all info Foo