core: move some root info attrs to topology infos

Topology discovery and backend information:
* Backend
* SyntheticDescription
* hwlocVersion
* ProcessName

OS information:
* uname stuff (OSName, OSRelease, OSVersion, HostName, Architecture)
* LinuxCgroup
* WindowsBuildEnvironment

Hardware info (DMI, CPU when in root because Package locality is missing, etc)
remains in root.

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

Author: bgoglin

NEWS

@@ -39,6 +39,10 @@ Version 3.0.0
     - hwloc_infos_s structures may be modified with hwloc_modify_infos().
     - hwloc_topology_get_infos() returns the new topology-global array
       of info attributes.
+      . Several info attributes previously stored in the root object are
+        now topology attributes (e.g. information about hwloc, about the
+        discovery, operating system information returned by uname).
+        See "Custom string infos" in the documentation for details.
     - hwloc_cpukinds_get_info() and hwloc_cpukinds_register() now manipulate
       infos as such a structure.
 * Tools

doc/hwloc.doxy

@@ -2023,7 +2023,7 @@ See doc/examples/get-knl-modes.c in the source directory for an example of retri
 \endhtmlonly
 \subsection attributes_info_os Operating System Information
 
-These info attributes are attached to the root object (Machine).
+These info attributes are attached to the topology itself.
 
 <dl>
 <dt>OSName, OSRelease, OSVersion, HostName, Architecture</dt>
@@ -2043,12 +2043,12 @@ placed.
 \htmlonly
 </div><div class="subsection" id="attributes_info_hwloc">
 \endhtmlonly
-\subsection attributes_info_hwloc hwloc Information
+\subsection attributes_info_hwloc hwloc Topology Information
 
-Unless specified, these info attributes are attached to the root object (Machine).
+These info attributes are attached to the topology itself.
 
 <dl>
-<dt>Backend (topology root object)</dt>
+<dt>Backend</dt>
 <dd>The name of a hwloc backend/component that added objects in the topology.
 If several components were combined, multiple Backend pairs may exist,
 with different values, for instance <tt>x86</tt>, <tt>Linux</tt> and

hwloc/misc.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2023 Inria.  All rights reserved.
  * Copyright © 2009-2010 Université Bordeaux
  * Copyright © 2009-2018 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -86,7 +86,7 @@ void hwloc_add_uname_info(struct hwloc_topology *topology __hwloc_attribute_unus
 #ifdef HAVE_UNAME
   struct utsname _utsname, *utsname;
 
-  if (hwloc_obj_get_info_by_name(topology->levels[0][0], "OSName"))
+  if (hwloc_get_info_by_name(&topology->infos, "OSName"))
     /* don't annotate twice */
     return;
 
@@ -99,15 +99,15 @@ void hwloc_add_uname_info(struct hwloc_topology *topology __hwloc_attribute_unus
   }
 
   if (*utsname->sysname)
-    hwloc_obj_add_info(topology->levels[0][0], "OSName", utsname->sysname);
+    hwloc__add_info(&topology->infos, "OSName", utsname->sysname);
   if (*utsname->release)
-    hwloc_obj_add_info(topology->levels[0][0], "OSRelease", utsname->release);
+    hwloc__add_info(&topology->infos, "OSRelease", utsname->release);
   if (*utsname->version)
-    hwloc_obj_add_info(topology->levels[0][0], "OSVersion", utsname->version);
+    hwloc__add_info(&topology->infos, "OSVersion", utsname->version);
   if (*utsname->nodename)
-    hwloc_obj_add_info(topology->levels[0][0], "HostName", utsname->nodename);
+    hwloc__add_info(&topology->infos, "HostName", utsname->nodename);
   if (*utsname->machine)
-    hwloc_obj_add_info(topology->levels[0][0], "Architecture", utsname->machine);
+    hwloc__add_info(&topology->infos, "Architecture", utsname->machine);
 #endif /* HAVE_UNAME */
 }
 

hwloc/topology-aix.c

@@ -817,7 +817,7 @@ hwloc_look_aix(struct hwloc_backend *backend, struct hwloc_disc_status *dstatus)
 	}
     }
 
-  hwloc_obj_add_info(topology->levels[0][0], "Backend", "AIX");
+  hwloc__add_info(&topology->infos, "Backend", "AIX");
   hwloc_add_uname_info(topology, NULL);
   return 0;
 }

hwloc/topology-cuda.c

@@ -142,7 +142,7 @@ hwloc_cuda_discover(struct hwloc_backend *backend, struct hwloc_disc_status *dst
   }
 
   if (added > 0)
-    hwloc_obj_add_info(hwloc_get_root_obj(topology), "Backend", "CUDA");
+    hwloc_modify_infos(hwloc_topology_get_infos(topology), HWLOC_MODIFY_INFOS_OP_ADD, "Backend", "CUDA");
   return 0;
 }
 

hwloc/topology-darwin.c

@@ -903,7 +903,7 @@ hwloc_look_darwin(struct hwloc_backend *backend, struct hwloc_disc_status *dstat
   else
     hwloc__darwin_cpukinds_register(topology, &kinds);
 
-  hwloc_obj_add_info(topology->levels[0][0], "Backend", "Darwin");
+  hwloc__add_info(&topology->infos, "Backend", "Darwin");
   hwloc_add_uname_info(topology, NULL);
   return 0;
 }

hwloc/topology-freebsd.c

@@ -553,7 +553,7 @@ hwloc_look_freebsd(struct hwloc_backend *backend, struct hwloc_disc_status *dsta
   }
 
   if (data->need_global_infos) {
-    hwloc_obj_add_info(topology->levels[0][0], "Backend", "FreeBSD");
+    hwloc__add_info(&topology->infos, "Backend", "FreeBSD");
     hwloc_add_uname_info(topology, NULL);
     data->need_global_infos = 0;
   }

hwloc/topology-gl.c

@@ -142,7 +142,7 @@ hwloc_gl_discover(struct hwloc_backend *backend, struct hwloc_disc_status *dstat
   }
 
   if (added)
-    hwloc_obj_add_info(hwloc_get_root_obj(topology), "Backend", "GL");
+    hwloc_modify_infos(hwloc_topology_get_infos(topology), HWLOC_MODIFY_INFOS_OP_ADD, "Backend", "GL");
   return 0;
 }
 

hwloc/topology-hardwired.c

@@ -73,7 +73,7 @@ int hwloc_look_hardwired_fujitsu_k(struct hwloc_topology *topology)
   topology->support.discovery->pu = 1;
   hwloc_setup_pu_level(topology, 8);
 
-  hwloc_obj_add_info(topology->levels[0][0], "Backend", "hardwired:K-computer");
+  hwloc__add_info(&topology->infos, "Backend", "hardwired:K-computer");
   return 0;
 }
 
@@ -143,7 +143,7 @@ int hwloc_look_hardwired_fujitsu_fx10(struct hwloc_topology *topology)
   topology->support.discovery->pu = 1;
   hwloc_setup_pu_level(topology, 16);
 
-  hwloc_obj_add_info(topology->levels[0][0], "Backend", "hardwired:FX10");
+  hwloc__add_info(&topology->infos, "Backend", "hardwired:FX10");
   return 0;
 }
 
@@ -223,6 +223,6 @@ int hwloc_look_hardwired_fujitsu_fx100(struct hwloc_topology *topology)
   topology->support.discovery->pu = 1;
   hwloc_setup_pu_level(topology, 34);
 
-  hwloc_obj_add_info(topology->levels[0][0], "Backend", "hardwired:FX100");
+  hwloc__add_info(&topology->infos, "Backend", "hardwired:FX100");
   return 0;
 }

hwloc/topology-hpux.c

@@ -271,7 +271,7 @@ hwloc_look_hpux(struct hwloc_backend *backend, struct hwloc_disc_status *dstatus
     topology->support.discovery->numa = 1;
   /* don't set disallowed_{pu,numa} since we don't set the allowed sets */
 
-  hwloc_obj_add_info(topology->levels[0][0], "Backend", "HP-UX");
+  hwloc__add_info(&topology->infos, "Backend", "HP-UX");
   hwloc_add_uname_info(topology, NULL);
 
   free(nodes);