core: use the new internal hwloc__replace_infos() and remove add_info_nodup()

And clarify that callers may always call replace,
even if the info doesn't exist yet.

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

Author: bgoglin

hwloc/topology-linux.c

@@ -2163,8 +2163,8 @@ static int hwloc_linux_get_allowed_resources_hook(hwloc_topology_t topology)
 
   hwloc_linux__get_allowed_resources(topology, fsroot_path, root_fd, &cpuset_name);
   if (cpuset_name) {
-    hwloc__add_info_nodup(&topology->levels[0][0]->infos,
-			  "LinuxCgroup", cpuset_name, 1 /* replace */);
+    hwloc__replace_infos(&topology->levels[0][0]->infos,
+                         "LinuxCgroup", cpuset_name);
     free(cpuset_name);
   }
   if (root_fd != -1)
@@ -5238,7 +5238,7 @@ hwloc_linux_parse_cpuinfo_ppc(const char *prefix, const char *value,
       hwloc__add_info(infos, "PlatformName", value);
   } else if (!strcmp("model", prefix)) {
     if (value[0])
-      hwloc__add_info(infos, "PlatformModel", value);
+      hwloc__replace_infos(infos, "PlatformModel", value);
   }
   /* platform-specific fields */
   else if (!strcasecmp("vendor", prefix)) {
@@ -5251,7 +5251,7 @@ hwloc_linux_parse_cpuinfo_ppc(const char *prefix, const char *value,
 	     || !strcasecmp("Machine", prefix)) {
     /* machine and board are similar (and often more precise) than model above */
     if (value[0])
-      hwloc__add_info_nodup(infos, "PlatformModel", value, 1);
+      hwloc__replace_infos(infos, "PlatformModel", value);
   } else if (!strcasecmp("Revision", prefix)
 	     || !strcmp("Hardware rev", prefix)) {
     if (value[0])
@@ -5303,7 +5303,7 @@ hwloc_linux_parse_cpuinfo_generic(const char *prefix, const char *value,
      * we should have the Architecture keypair for basic information anyway.
      */
     if (value[0])
-      hwloc__add_info_nodup(infos, "CPUModel", value, 1);
+      hwloc__replace_infos(infos, "CPUModel", value);
   }
   return 0;
 }

hwloc/topology-x86.c

@@ -911,23 +911,24 @@ static void look_proc(struct hwloc_backend *backend, struct procinfo *infos, uns
 }
 
 static void
-hwloc_x86_add_cpuinfos(hwloc_obj_t obj, struct procinfo *info, int replace)
+hwloc_x86_add_cpuinfos(hwloc_obj_t obj, struct procinfo *info)
 {
+  /* these attributes may have been set by somebody else earlier, so always try to replace */
   char number[12];
   if (info->cpuvendor[0])
-    hwloc__add_info_nodup(&obj->infos, "CPUVendor", info->cpuvendor, replace);
+    hwloc__replace_infos(&obj->infos, "CPUVendor", info->cpuvendor);
   snprintf(number, sizeof(number), "%u", info->cpufamilynumber);
-  hwloc__add_info_nodup(&obj->infos, "CPUFamilyNumber", number, replace);
+  hwloc__replace_infos(&obj->infos, "CPUFamilyNumber", number);
   snprintf(number, sizeof(number), "%u", info->cpumodelnumber);
-  hwloc__add_info_nodup(&obj->infos, "CPUModelNumber", number, replace);
+  hwloc__replace_infos(&obj->infos, "CPUModelNumber", number);
   if (info->cpumodel[0]) {
     const char *c = info->cpumodel;
     while (*c == ' ')
       c++;
-    hwloc__add_info_nodup(&obj->infos, "CPUModel", c, replace);
+    hwloc__replace_infos(&obj->infos, "CPUModel", c);
   }
   snprintf(number, sizeof(number), "%u", info->cpustepping);
-  hwloc__add_info_nodup(&obj->infos, "CPUStepping", number, replace);
+  hwloc__replace_infos(&obj->infos, "CPUStepping", number);
 }
 
 static void
@@ -1037,7 +1038,7 @@ static void summarize(struct hwloc_backend *backend, struct procinfo *infos, uns
 	package = hwloc_alloc_setup_object(topology, HWLOC_OBJ_PACKAGE, packageid);
 	package->cpuset = package_cpuset;
 
-	hwloc_x86_add_cpuinfos(package, &infos[i], 0);
+	hwloc_x86_add_cpuinfos(package, &infos[i]);
 
 	hwloc_debug_1arg_bitmap("os package %u has cpuset %s\n",
 				packageid, package_cpuset);
@@ -1050,12 +1051,12 @@ static void summarize(struct hwloc_backend *backend, struct procinfo *infos, uns
 	package = hwloc_get_next_obj_covering_cpuset_by_type(topology, set, HWLOC_OBJ_PACKAGE, NULL);
 	hwloc_bitmap_free(set);
 	if (package) {
-	  /* Found package above that PU, annotate if no such attribute yet */
-	  hwloc_x86_add_cpuinfos(package, &infos[i], 1);
+	  /* Found package above that PU, annotate */
+	  hwloc_x86_add_cpuinfos(package, &infos[i]);
 	  hwloc_bitmap_andnot(remaining_cpuset, remaining_cpuset, package->cpuset);
 	} else {
 	  /* No package, annotate the root object */
-	  hwloc_x86_add_cpuinfos(hwloc_get_root_obj(topology), &infos[i], 1);
+	  hwloc_x86_add_cpuinfos(hwloc_get_root_obj(topology), &infos[i]);
 	  break;
 	}
       }

hwloc/topology.c

@@ -540,36 +540,8 @@ static int hwloc__add_info_unique(struct hwloc_infos_s *infos, const char *name,
   return hwloc__add_info(infos, name, value);
 }
 
-int hwloc__add_info_nodup(struct hwloc_infos_s *infos,
-			  const char *name, const char *value,
-			  int replace)
-{
-  struct hwloc_info_s *array = infos->array;
-  unsigned count = infos->count;
-  unsigned i;
-
-  if (!name || !value) {
-    errno = EINVAL;
-    return -1;
-  }
-
-  for(i=0; i<count; i++) {
-    if (!strcmp(array[i].name, name)) {
-      if (replace) {
-	char *new = strdup(value);
-	if (!new)
-	  return -1;
-	free(array[i].value);
-	array[i].value = new;
-      }
-      return 0;
-    }
-  }
-  return hwloc__add_info(infos, name, value);
-}
-
-static int hwloc__replace_infos(struct hwloc_infos_s *infos,
-                                const char *name, const char *value)
+int hwloc__replace_infos(struct hwloc_infos_s *infos,
+                         const char *name, const char *value)
 {
   struct hwloc_info_s *array = infos->array;
   unsigned count = infos->count;

include/hwloc/rename.h

@@ -833,7 +833,7 @@ extern "C" {
 #define hwloc_find_insert_io_parent_by_complete_cpuset HWLOC_NAME(hwloc_find_insert_io_parent_by_complete_cpuset)
 
 #define hwloc__add_info HWLOC_NAME(_add_info)
-#define hwloc__add_info_nodup HWLOC_NAME(_add_info_nodup)
+#define hwloc__replace_infos HWLOC_NAME(_replace_infos)
 #define hwloc__move_infos HWLOC_NAME(_move_infos)
 #define hwloc__free_infos HWLOC_NAME(_free_infos)
 #define hwloc__tma_dup_infos HWLOC_NAME(_tma_dup_infos)

include/private/private.h

@@ -326,7 +326,7 @@ extern void hwloc_pci_discovery_exit(struct hwloc_topology *topology);
 extern hwloc_obj_t hwloc_find_insert_io_parent_by_complete_cpuset(struct hwloc_topology *topology, hwloc_cpuset_t cpuset);
 
 extern int hwloc__add_info(struct hwloc_infos_s *infos, const char *name, const char *value);
-extern int hwloc__add_info_nodup(struct hwloc_infos_s *infos, const char *name, const char *value, int replace);
+extern int hwloc__replace_infos(struct hwloc_infos_s *infos, const char *name, const char *value);
 extern int hwloc__move_infos(struct hwloc_infos_s *dst_infos, struct hwloc_infos_s *src_infos);
 extern int hwloc__tma_dup_infos(struct hwloc_tma *tma, struct hwloc_infos_s *dst_infos, struct hwloc_infos_s *src_infos);
 extern void hwloc__free_infos(struct hwloc_infos_s *infos);