tests: rename and enlarge the infos test

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

Author: bgoglin

tests/hwloc/CMakeLists.txt

@@ -3,7 +3,7 @@ foreach(t api_version backends bind
   distances get_area_memlocation get_cache_covering_cpuset get_closest_objs get_largest_objs_inside_cpuset
   get_last_cpu_location get_next_obj_covering_cpuset get_obj_below_array_by_type get_obj_covering_cpuset
   get_obj_inside_cpuset get_obj_with_same_locality get_shared_cache_covering_obj
-  groups insert_misc iodevs is_thissystem list_components obj_infos object_userdata pci_backend synthetic
+  groups insert_misc iodevs is_thissystem list_components object_userdata pci_backend synthetic
   topology_abi topology_allow topology_diff topology_dup topology_restrict type_depth type_sscanf
 )
   add_executable(hwloc_${t} hwloc_${t}.c)
@@ -13,7 +13,7 @@ foreach(t api_version backends bind
   set_tests_properties(${t} PROPERTIES TIMEOUT 10)
 endforeach()
 
-foreach(t cpuset_nodeset memattrs cpukinds gl windows_processor_groups)
+foreach(t cpuset_nodeset memattrs cpukinds infos gl windows_processor_groups)
   add_executable(${t} ${t}.c)
   target_link_libraries(${t} PRIVATE hwloc)
 

tests/hwloc/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright © 2009-2022 Inria.  All rights reserved.
+# Copyright © 2009-2023 Inria.  All rights reserved.
 # Copyright © 2009-2012 Université Bordeaux
 # Copyright © 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # See COPYING in top-level directory.
@@ -63,9 +63,9 @@ check_PROGRAMS = \
         hwloc_topology_dup \
         hwloc_topology_diff \
         hwloc_topology_abi \
-        hwloc_obj_infos \
         hwloc_iodevs \
         cpuset_nodeset \
+        infos \
         memattrs \
         memtiers \
         cpukinds \

tests/hwloc/hwloc_obj_infos.c

@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2011-2023 Inria.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include "hwloc.h"
+
+#include <assert.h>
+
+/* check obj infos */
+
+#define NAME1 "foobar"
+#define VALUE1 "myvalue"
+#define NAME2 "foobaz"
+#define VALUE2 "myothervalue"
+
+int main(void)
+{
+  hwloc_topology_t topology;
+  hwloc_obj_t obj;
+  int err;
+
+  hwloc_topology_init(&topology);
+  hwloc_topology_load(topology);
+
+  obj = hwloc_get_root_obj(topology);
+
+  /* basics */
+  if (hwloc_obj_get_info_by_name(obj, NAME1)
+      || hwloc_obj_get_info_by_name(obj, NAME2))
+    return 0;
+
+  hwloc_obj_add_info(obj, NAME1, VALUE1);
+  assert(!hwloc_obj_get_info_by_name(obj, NAME2));
+  hwloc_obj_add_info(obj, NAME2, VALUE2);
+
+  if (strcmp(hwloc_obj_get_info_by_name(obj, NAME1), VALUE1))
+    assert(0);
+  if (strcmp(hwloc_obj_get_info_by_name(obj, NAME2), VALUE2))
+    assert(0);
+
+  /* removes */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REMOVE, VALUE1, NULL); /* no match */
+  assert(!err);
+  /* cannot check obj->infos.count since it contained normal info attrs after load() */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REMOVE, NAME1, VALUE2); /* no match */
+  assert(!err);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REMOVE, NULL, NAME2); /* no match */
+  assert(!err);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REMOVE, NULL, NULL); /* remove all */
+  assert(!err);
+  assert(obj->infos.count == 0);
+
+  /* invalid add */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, NULL, "");
+  assert(err == -1);
+  /* 9 interleaved duplicates */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin1", "foo1");
+  assert(!err);
+  assert(obj->infos.count == 1);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin2", "foo1");
+  assert(!err);
+  assert(obj->infos.count == 2);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin3", "foo1");
+  assert(!err);
+  assert(obj->infos.count == 3);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin1", "foo2");
+  assert(!err);
+  assert(obj->infos.count == 4);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin2", "foo2");
+  assert(!err);
+  assert(obj->infos.count == 5);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin3", "foo2");
+  assert(!err);
+  assert(obj->infos.count == 6);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin1", "foo3");
+  assert(!err);
+  assert(obj->infos.count == 7);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin2", "foo3");
+  assert(!err);
+  assert(obj->infos.count == 8);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD, "coin3", "foo3");
+  assert(!err);
+  assert(obj->infos.count == 9);
+
+  /* invalid replace */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REPLACE, "", NULL);
+  assert(err == -1);
+  /* replace the third set of duplicates */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REPLACE, "coin3", "foo4");
+  assert(!err);
+  assert(obj->infos.count == 7);
+  assert(!strcmp(obj->infos.array[2].name, "coin3"));
+  assert(!strcmp(obj->infos.array[2].value, "foo4"));
+  /* remove second set of duplicates */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REMOVE, "coin2", NULL);
+  assert(!err);
+  assert(obj->infos.count == 4);
+  /* remove second instance of first duplicates */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REMOVE, "coin1", "foo2");
+  assert(!err);
+  assert(obj->infos.count == 3);
+  /* replace reminder of the first set of duplicates */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_REPLACE, "coin1", "foo5");
+  assert(!err);
+  assert(obj->infos.count == 2);
+  assert(!strcmp(obj->infos.array[0].name, "coin1"));
+  assert(!strcmp(obj->infos.array[0].value, "foo5"));
+  /* check the other remaining entry */
+  assert(!strcmp(obj->infos.array[1].name, "coin3"));
+  assert(!strcmp(obj->infos.array[1].value, "foo4"));
+
+  /* check add_unique */
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD_UNIQUE, "coin1", "foo5");
+  assert(!err);
+  assert(obj->infos.count == 2);
+  err = hwloc_modify_infos(&obj->infos, HWLOC_MODIFY_INFOS_OP_ADD_UNIQUE, "coin1", "foo4");
+  assert(!err);
+  assert(obj->infos.count == 3);
+  assert(!strcmp(obj->infos.array[2].name, "coin1"));
+  assert(!strcmp(obj->infos.array[2].value, "foo4"));
+
+  hwloc_topology_destroy(topology);
+
+  return 0;
+}