core: add an "allocated" private field in struct hwloc_infos_s

To properly preallocate the array when adding elements.

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

Author: bgoglin

hwloc/topology-darwin.c

@@ -333,6 +333,7 @@ static int hwloc__darwin_cpukinds_register(struct hwloc_topology *topology,
       infoattr.value = kinds->kinds[i].compatible;
       infos.array = &infoattr;
       infos.count = 1;
+      infos.allocated = 0;
     }
     if (kinds->kinds[i].perflevel >= 0) {
       /* perflevel0 always refers to the highest performance core type in the system. */

hwloc/topology-linux.c

@@ -4434,6 +4434,7 @@ hwloc_linux_cpukinds_register(struct hwloc_linux_cpukinds *cpukinds,
     infoattr.value = value;
     infos.array = &infoattr;
     infos.count = 1;
+    infos.allocated = 0;
     snprintf(value, sizeof(value), "%lu", cpukinds->sets[i].value);
     /* value (at least cpu_capacity) may be > INT_MAX, too large for a forced_efficiency, hence use i instead */
     hwloc_internal_cpukinds_register(topology, cpukinds->sets[i].cpuset,
@@ -4624,6 +4625,7 @@ look_sysfscpukinds(struct hwloc_topology *topology,
     infoattr.value = (char *) "IntelAtom";
     infos.array = &infoattr;
     infos.count = 1;
+    infos.allocated = 0;
     hwloc_internal_cpukinds_register(topology, atom_pmu_set, HWLOC_CPUKIND_EFFICIENCY_UNKNOWN, &infos, 0);
     /* the cpuset is given to the callee */
   } else {
@@ -4636,6 +4638,7 @@ look_sysfscpukinds(struct hwloc_topology *topology,
     infoattr.value = (char *) "IntelCore";
     infos.array = &infoattr;
     infos.count = 1;
+    infos.allocated = 0;
     hwloc_internal_cpukinds_register(topology, core_pmu_set, HWLOC_CPUKIND_EFFICIENCY_UNKNOWN, &infos, 0);
     /* the cpuset is given to the callee */
   } else {
@@ -5394,6 +5397,7 @@ hwloc_linux_parse_cpuinfo(struct hwloc_linux_backend_data_s *data,
     Lprocs[curproc].Pproc = Pproc;
     Lprocs[curproc].infos.array = NULL;
     Lprocs[curproc].infos.count = 0;
+    Lprocs[curproc].infos.allocated = 0;
     getprocnb_end() else {
 
       /* architecture specific or default routine for parsing cpumodel */
@@ -5780,6 +5784,7 @@ hwloc_linuxfs_look_cpu(struct hwloc_backend *backend, struct hwloc_disc_status *
    */
   global_infos.array = NULL;
   global_infos.count = 0;
+  global_infos.allocated = 0;
   numprocs = hwloc_linux_parse_cpuinfo(data, "/proc/cpuinfo", &Lprocs, &global_infos);
   if (numprocs < 0)
     numprocs = 0;
@@ -6915,6 +6920,7 @@ hwloc__get_firmware_dmi_memory_info_one(struct hwloc_topology *topology,
 
   infos.array = NULL;
   infos.count = 0;
+  infos.allocated = 0;
 
   /* start after the header */
   foff = header->length;

hwloc/topology-x86.c

@@ -1442,6 +1442,7 @@ look_procs(struct hwloc_backend *backend, struct procinfo *infos, unsigned long
           infoattr.value = (char *) "IntelAtom";
           _infos.array = &infoattr;
           _infos.count = 1;
+          _infos.allocated = 0;
           hwloc_internal_cpukinds_register(topology, atomset, HWLOC_CPUKIND_EFFICIENCY_UNKNOWN, &_infos, 0);
           /* the cpuset is given to the callee */
         } else {
@@ -1455,6 +1456,7 @@ look_procs(struct hwloc_backend *backend, struct procinfo *infos, unsigned long
           infoattr.value = (char *) "IntelCore";
           _infos.array = &infoattr;
           _infos.count = 1;
+          _infos.allocated = 0;
           hwloc_internal_cpukinds_register(topology, coreset, HWLOC_CPUKIND_EFFICIENCY_UNKNOWN, &_infos, 0);
           /* the cpuset is given to the callee */
         } else {

hwloc/topology-xml.c

@@ -1464,6 +1464,7 @@ hwloc__xml_import_cpukind(hwloc_topology_t topology,
 
   infos.array = NULL;
   infos.count = 0;
+  infos.allocated = 0;
 
   while (1) {
     char *attrname, *attrvalue;

hwloc/topology.c

@@ -471,20 +471,37 @@ void hwloc__free_infos(struct hwloc_infos_s *infos)
   free(infos->array);
 }
 
-int hwloc__add_info(struct hwloc_infos_s *infos, const char *name, const char *value)
+static int hwloc__realloc_infos(struct hwloc_infos_s *infos, unsigned nr)
 {
-  unsigned count = infos->count;
-  struct hwloc_info_s *array = infos->array;
+  struct hwloc_info_s *tmparray;
+  unsigned alloccount;
+
+  if (infos->allocated > infos->count + nr)
+    return 0;
+
 #define OBJECT_INFO_ALLOC 8
   /* nothing allocated initially, (re-)allocate by multiple of 8 */
-  unsigned alloccount = (count + 1 + (OBJECT_INFO_ALLOC-1)) & ~(OBJECT_INFO_ALLOC-1);
-  if (count != alloccount) {
-    struct hwloc_info_s *tmparray = realloc(array, alloccount*sizeof(*array));
-    if (!tmparray)
-      /* failed to allocate, ignore this info */
-      goto out_with_array;
-    infos->array = array = tmparray;
-  }
+  alloccount = (infos->count + nr + (OBJECT_INFO_ALLOC-1)) & ~(OBJECT_INFO_ALLOC-1);
+  tmparray = realloc(infos->array, alloccount*sizeof(*tmparray));
+  if (!tmparray)
+    return -1;
+
+  infos->array = tmparray;
+  infos->allocated = alloccount;
+  return 0;
+}
+
+int hwloc__add_info(struct hwloc_infos_s *infos, const char *name, const char *value)
+{
+  unsigned count;
+  struct hwloc_info_s *array;
+
+  if (hwloc__realloc_infos(infos, 1) < 0)
+    return -1;
+
+  count = infos->count;
+  array = infos->array;
+
   array[count].name = strdup(name);
   if (!array[count].name)
     goto out_with_array;
@@ -526,21 +543,19 @@ int hwloc__add_info_nodup(struct hwloc_infos_s *infos,
 int hwloc__move_infos(struct hwloc_infos_s *dst_infos,
 		      struct hwloc_infos_s *src_infos)
 {
-  unsigned dst_count = dst_infos->count;
-  struct hwloc_info_s *dst_array = dst_infos->array;
-  unsigned src_count = src_infos->count;
-  struct hwloc_info_s *src_array = src_infos->array;
+  struct hwloc_info_s *dst_array, *src_array;
+  unsigned dst_count, src_count;
   unsigned i;
-#define OBJECT_INFO_ALLOC 8
-  /* nothing allocated initially, (re-)allocate by multiple of 8 */
-  unsigned alloccount = (dst_count + src_count + (OBJECT_INFO_ALLOC-1)) & ~(OBJECT_INFO_ALLOC-1);
-  if (dst_count != alloccount) {
-    struct hwloc_info_s *tmp_array = realloc(dst_array, alloccount*sizeof(*dst_array));
-    if (!tmp_array)
-      /* Failed to realloc, ignore the appended infos */
-      goto drop;
-    dst_array = tmp_array;
-  }
+
+  src_count = src_infos->count;
+  src_array = src_infos->array;
+
+  if (hwloc__realloc_infos(dst_infos, src_count) < 0)
+    goto drop;
+
+  dst_count = dst_infos->count;
+  dst_array = dst_infos->array;
+
   for(i=0; i<src_count; i++, dst_count++) {
     dst_array[dst_count].name = src_array[i].name;
     dst_array[dst_count].value = src_array[i].value;
@@ -561,6 +576,7 @@ int hwloc__move_infos(struct hwloc_infos_s *dst_infos,
   free(src_array);
   src_infos->array = NULL;
   src_infos->count = 0;
+  src_infos->allocated = 0;
   return -1;
 }
 
@@ -576,7 +592,7 @@ int hwloc__tma_dup_infos(struct hwloc_tma *tma,
 {
   struct hwloc_info_s *newa;
   unsigned i, j;
-  newa = hwloc_tma_calloc(tma, oldi->count * sizeof(*newa));
+  newa = hwloc_tma_calloc(tma, oldi->allocated * sizeof(*newa));
   if (!newa)
     return -1;
   for(i=0; i<oldi->count; i++) {
@@ -587,6 +603,7 @@ int hwloc__tma_dup_infos(struct hwloc_tma *tma,
   }
   newi->array = newa;
   newi->count = oldi->count;
+  newi->allocated = oldi->allocated;
   return 0;
 
  failed:
@@ -597,6 +614,7 @@ int hwloc__tma_dup_infos(struct hwloc_tma *tma,
   }
   newi->array = NULL;
   newi->count = 0;
+  newi->allocated = 0;
   return -1;
 }
 

include/hwloc.h

@@ -433,6 +433,7 @@ struct hwloc_info_s {
 struct hwloc_infos_s {
   struct hwloc_info_s *array;  /**< \brief Array of string pairs */
   unsigned count;              /**< \brief Number of elements in the array. */
+  unsigned allocated;          /**< \private Internal use only (number of allocated elements in the array). */
 };
 
 /** \brief Structure of a topology object

tests/hwloc/cpukinds.c

@@ -91,6 +91,7 @@ int main(void)
   info.value = (char*) "BigCore";
   infos.array = &info;
   infos.count = 1;
+  infos.allocated = 0;
   err = hwloc_cpukinds_register(topology, cpuset, 1000, &infos, 0);
   assert(!err);
   /* PU 6-9 (third package) are small and less efficient */
@@ -100,6 +101,7 @@ int main(void)
   info.value = (char*) "SmallCore";
   infos.array = &info;
   infos.count = 1;
+  infos.allocated = 0;
   err = hwloc_cpukinds_register(topology, cpuset, 10, &infos, 0);
   assert(!err);
 
@@ -165,6 +167,7 @@ int main(void)
   info.value = (char*) "this, that and those";
   infos.array = &info;
   infos.count = 1;
+  infos.allocated = 0;
   err = hwloc_cpukinds_register(topology, cpuset, -1, &infos, 0);
   assert(!err);
 

utils/hwloc/hwloc-annotate.c

@@ -92,6 +92,7 @@ static void apply(hwloc_topology_t topology, hwloc_obj_t obj)
 		free(obj->infos.array);
 		obj->infos.array = NULL;
 		obj->infos.count = 0;
+                obj->infos.allocated = 0;
 	}
 	if (clearuserdata) {
 		hwloc_utils_userdata_free(obj);
@@ -119,6 +120,7 @@ static void apply(hwloc_topology_t topology, hwloc_obj_t obj)
 			if (!j) {
 				free(obj->infos.array);
 				obj->infos.array = NULL;
+                                obj->infos.allocated = 0;
 			}
 		}
 		if (infovalue)
@@ -774,6 +776,7 @@ int main(int argc, char *argv[])
           info.value = ckivalue;
           infos.count = 1;
           infos.array = &info;
+          infos.allocated = 0;
           if (hwloc_cpukinds_register(topology, ckcpuset, ckefficiency,
                                       ckiname ? &infos : NULL,
                                       ckflags) < 0) {