]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
projects / thirdparty / haproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2817472)
MINOR: pattern: prepare removal of a pattern from the list head
authorWilly Tarreau <w@1wt.eu>
Tue, 3 Nov 2020 10:22:04 +0000 (11:22 +0100)
committerWilly Tarreau <w@1wt.eu>
Thu, 5 Nov 2020 18:27:09 +0000 (19:27 +0100)
Instead of using LIST_DEL() on the pattern itself inside an expression,
we look it up from its head. The goal is to get rid of the double-linked
list while this usage remains exclusively for freeing on startup error!

src/pattern.c patch | blob | blame | history

diff --git a/src/pattern.c b/src/pattern.c
index b2f06fea70362a1f1ca7853a392a39b9de3432ff..612abca8e902a4bf4eba2c20858c04893c10a5b2 100644 (file)
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -1120,6 +1120,23 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
        return NULL;
 }
 
+/* finds the pattern holding <list> from list head <head> and deletes it.
+ * This is made for use for pattern removal within an expression.
+ */
+static void pat_unlink_from_head(struct list *head, struct list *list)
+{
+       struct list *next;
+
+       next = head->n;
+       while (next != head) {
+               if (next == list) {
+                       LIST_DEL(list);
+                       return;
+               }
+               next = next->n;
+       }
+}
+
 void free_pattern_tree(struct eb_root *root)
 {
        struct eb_node *node, *next;
@@ -1130,7 +1147,7 @@ void free_pattern_tree(struct eb_root *root)
                next = eb_next(node);
                eb_delete(node);
                elt = container_of(node, struct pattern_tree, node);
-               LIST_DEL(&elt->from_ref);
+               pat_unlink_from_head(&elt->ref->tree_head, &elt->from_ref);
                free(elt->data);
                free(elt);
                node = next;
@@ -1143,7 +1160,7 @@ void pat_prune_gen(struct pattern_expr *expr)
 
        list_for_each_entry_safe(pat, tmp, &expr->patterns, list) {
                LIST_DEL(&pat->list);
-               LIST_DEL(&pat->from_ref);
+               pat_unlink_from_head(&pat->pat.ref->list_head, &pat->from_ref);
                if (pat->pat.sflags & PAT_SF_REGFREE)
                        regex_free(pat->pat.ptr.ptr);
                else
Mirror of https://github.com/haproxy/haproxy.git