libmultipath: consolidate group_by_* functions
authorBenjamin Marzinski <bmarzins@redhat.com>
Fri, 23 Aug 2019 17:48:51 +0000 (12:48 -0500)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Tue, 1 Oct 2019 19:58:32 +0000 (21:58 +0200)
group_by_node_name() and group_by_serial() are exactly the same except
for how the paths are compared. group_by_prio() is different but its
pathvec solves the same issue as the bitmap from the other two
functions, and since we are always running sort_pathgroups() after
calling pgpriorityfn, there is no need to sort the pathgroups in
group_by_prio(). This means that all three functions can be replaced
with one function, group_by_match() that takes a match function as an
argument.

Reviewed-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
libmultipath/pgpolicies.c

index 1af42f5..2e4db74 100644 (file)
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 
 #include "checkers.h"
 #include "util.h"
@@ -104,10 +105,29 @@ int group_paths(struct multipath *mp)
        return 0;
 }
 
-/*
- * One path group per unique tgt_node_name present in the path vector
- */
-int group_by_node_name(struct multipath * mp)
+typedef bool (path_match_fn)(struct path *pp1, struct path *pp2);
+
+bool
+node_names_match(struct path *pp1, struct path *pp2)
+{
+       return (strncmp(pp1->tgt_node_name, pp2->tgt_node_name,
+                       NODE_NAME_SIZE) == 0);
+}
+
+bool
+serials_match(struct path *pp1, struct path *pp2)
+{
+       return (strncmp(pp1->serial, pp2->serial, SERIAL_SIZE) == 0);
+}
+
+bool
+prios_match(struct path *pp1, struct path *pp2)
+{
+       return (pp1->priority == pp2->priority);
+}
+
+int group_by_match(struct multipath * mp,
+                  bool (*path_match_fn)(struct path *, struct path *))
 {
        int i, j;
        int * bitmap;
@@ -150,8 +170,7 @@ int group_by_node_name(struct multipath * mp)
 
                        pp2 = VECTOR_SLOT(mp->paths, j);
 
-                       if (!strncmp(pp->tgt_node_name, pp2->tgt_node_name,
-                                       NODE_NAME_SIZE)) {
+                       if (path_match_fn(pp, pp2)) {
                                if (store_path(pgp->paths, pp2))
                                        goto out1;
 
@@ -171,70 +190,28 @@ out:
        return 1;
 }
 
+/*
+ * One path group per unique tgt_node_name present in the path vector
+ */
+int group_by_node_name(struct multipath * mp)
+{
+       return group_by_match(mp, node_names_match);
+}
+
 /*
  * One path group per unique serial number present in the path vector
  */
 int group_by_serial(struct multipath * mp)
 {
-       int i, j;
-       int * bitmap;
-       struct path * pp;
-       struct pathgroup * pgp;
-       struct path * pp2;
-
-       /* init the bitmap */
-       bitmap = (int *)MALLOC(VECTOR_SIZE(mp->paths) * sizeof (int));
-
-       if (!bitmap)
-               goto out;
-
-       for (i = 0; i < VECTOR_SIZE(mp->paths); i++) {
-
-               if (bitmap[i])
-                       continue;
-
-               pp = VECTOR_SLOT(mp->paths, i);
-
-               /* here, we really got a new pg */
-               pgp = alloc_pathgroup();
-
-               if (!pgp)
-                       goto out1;
-
-               if (add_pathgroup(mp, pgp))
-                       goto out2;
-
-               /* feed the first path */
-               if (store_path(pgp->paths, pp))
-                       goto out1;
-
-               bitmap[i] = 1;
-
-               for (j = i + 1; j < VECTOR_SIZE(mp->paths); j++) {
-
-                       if (bitmap[j])
-                               continue;
-
-                       pp2 = VECTOR_SLOT(mp->paths, j);
-
-                       if (0 == strcmp(pp->serial, pp2->serial)) {
-                               if (store_path(pgp->paths, pp2))
-                                       goto out1;
+       return group_by_match(mp, serials_match);
+}
 
-                               bitmap[j] = 1;
-                       }
-               }
-       }
-       FREE(bitmap);
-       return 0;
-out2:
-       free_pathgroup(pgp, KEEP_PATHS);
-out1:
-       FREE(bitmap);
-out:
-       free_pgvec(mp->pg, KEEP_PATHS);
-       mp->pg = NULL;
-       return 1;
+/*
+ * One path group per priority present in the path vector
+ */
+int group_by_prio(struct multipath *mp)
+{
+       return group_by_match(mp, prios_match);
 }
 
 int one_path_per_group(struct multipath *mp)
@@ -293,87 +270,3 @@ out:
        mp->pg = NULL;
        return 1;
 }
-
-int group_by_prio(struct multipath *mp)
-{
-       int i;
-       int prio;
-       struct path * pp;
-       struct pathgroup * pgp;
-       vector pathvec = NULL;
-
-       pathvec = vector_alloc();
-       if (!pathvec)
-               goto out;
-
-       vector_foreach_slot(mp->paths, pp, i) {
-               if (!vector_alloc_slot(pathvec))
-                       goto out1;
-               vector_set_slot(pathvec, pp);
-       }
-
-       while (VECTOR_SIZE(pathvec) > 0) {
-               pp = VECTOR_SLOT(pathvec, 0);
-               prio = pp->priority;
-
-               /*
-                * Find the position to insert the new path group. All groups
-                * are ordered by the priority value (higher value first).
-                */
-               vector_foreach_slot(mp->pg, pgp, i) {
-                       pp  = VECTOR_SLOT(pgp->paths, 0);
-
-                       if (prio > pp->priority)
-                               break;
-               }
-
-               /*
-                * Initialize the new path group.
-                */
-               pgp = alloc_pathgroup();
-
-               if (!pgp)
-                       goto out1;
-
-               if (store_path(pgp->paths, VECTOR_SLOT(pathvec, 0)))
-                       goto out2;
-
-               vector_del_slot(pathvec, 0);
-
-               /*
-                * Store the new path group into the vector.
-                */
-               if (i < VECTOR_SIZE(mp->pg)) {
-                       if (!vector_insert_slot(mp->pg, i, pgp))
-                               goto out2;
-                       pgp->mpp = mp;
-               } else {
-                       if (add_pathgroup(mp, pgp))
-                               goto out2;
-               }
-
-               /*
-                * add the other paths with the same prio
-                */
-               vector_foreach_slot(pathvec, pp, i) {
-                       if (pp->priority == prio) {
-                               if (store_path(pgp->paths, pp))
-                                       goto out1;
-
-                               vector_del_slot(pathvec, i);
-                               i--;
-                       }
-               }
-       }
-       free_pathvec(pathvec, KEEP_PATHS);
-       return 0;
-out2:
-       free_pathgroup(pgp, KEEP_PATHS);
-out1:
-       free_pathvec(pathvec, KEEP_PATHS);
-out:
-       free_pgvec(mp->pg, KEEP_PATHS);
-       mp->pg = NULL;
-       return 1;
-
-}