utils: factorize the computing of the location prefix length

pci[vendor:device] needs a temporary hack because it's not handled
in hwloc_calc_parse_level() yet while typelen includes it.
Will be removed in next commit.

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

Author: bgoglin

utils/hwloc/hwloc-annotate.c

@@ -171,7 +171,7 @@ get_unique_obj(hwloc_topology_t topology, int topodepth, char *str,
   size_t typelen;
   int err;
 
-  typelen = strspn(str, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+  typelen = hwloc_calc_parse_level_size(str);
   if (!typelen || (str[typelen] != ':' && str[typelen] != '=' && str[typelen] != '['))
     return NULL;
 
@@ -809,7 +809,7 @@ int main(int argc, char *argv[])
 	      apply(topology, hwloc_get_root_obj(topology));
 	    } else {
 		size_t typelen;
-		typelen = strspn(location, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+		typelen = hwloc_calc_parse_level_size(location);
 		if (typelen && (location[typelen] == ':' || location[typelen] == '=' || location[typelen] == '[')) {
 			struct hwloc_calc_location_context_s lcontext;
 			lcontext.topology = topology;

utils/hwloc/hwloc-calc.h

@@ -151,6 +151,18 @@ hwloc_calc_get_obj_inside_sets_by_depth(struct hwloc_calc_location_context_s *lc
   return NULL;
 }
 
+/* return the length of the type/depth prefix
+ * 0 if not found or invalid.
+ */
+static __hwloc_inline size_t
+hwloc_calc_parse_level_size(const char *string)
+{
+  /* type/depth prefix ends with either '.' (for child), "=" (for name of osdev),
+   * ':' (for index).
+   */
+  return strcspn(string, ":=.");
+}
+
 static __hwloc_inline int
 hwloc_calc_parse_level(struct hwloc_calc_location_context_s *lcontext,
                        hwloc_topology_t topology,
@@ -328,7 +340,7 @@ hwloc_calc_append_object_range(struct hwloc_calc_location_context_s *lcontext,
     /* parse the next string before calling ourself recursively */
     size_t typelen;
     const char *nextstring = dot+1;
-    typelen = strspn(nextstring, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+    typelen = hwloc_calc_parse_level_size(nextstring);
     if (!typelen || nextstring[typelen] != ':') {
       if (verbose >= 0)
 	fprintf(stderr, "hierarchical sublocation %s contains types not followed by colon and index range\n", nextstring);
@@ -592,6 +604,14 @@ hwloc_calc_process_location(struct hwloc_calc_location_context_s *lcontext,
     hwloc_obj_t obj = NULL;
 
     if (*sep == ':' || *sep == '[') {
+      if (level.type == HWLOC_OBJ_PCI_DEVICE) {
+        /* FIXME: temporary hack because typelen includes pci and osdev filters
+         * but only osdev types are handled in hwloc_calc_parse_level()
+         */
+        const char *bracket = strchr(arg, '[');
+        if (bracket && bracket-sep < 0)
+          sep = bracket;
+      }
       return hwloc_calc_append_iodev_by_index(lcontext, level.type, level.depth, sep, cbfunc, cbdata);
 
     } else if (*sep == '=' && level.type == HWLOC_OBJ_PCI_DEVICE) {
@@ -696,7 +716,7 @@ hwloc_calc_process_location_as_set(struct hwloc_calc_location_context_s *lcontex
 				 mode, verbose);
 
   /* try to match a type/depth followed by a special character */
-  typelen = strspn(arg, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+  typelen = hwloc_calc_parse_level_size(arg);
   if (typelen && (arg[typelen] == ':' || arg[typelen] == '=' || arg[typelen] == '[')) {
     /* process type/depth */
     struct hwloc_calc_process_location_set_cbdata_s cbdata;

utils/hwloc/hwloc-info.c

@@ -1051,7 +1051,7 @@ main (int argc, char *argv[])
         return EXIT_FAILURE;
       } else {
 	/* try to match a type/depth followed by a special character */
-	typelen = strspn(argv[0], "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+	typelen = hwloc_calc_parse_level_size(argv[0]);
 	if (typelen && (argv[0][typelen] == ':' || argv[0][typelen] == '=' || argv[0][typelen] == '[')) {
 	  err = hwloc_calc_process_location(&lcontext, argv[0], typelen,
 					    hwloc_calc_process_location_info_cb, NULL);