]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: pattern: use trim_all_pools() instead of a conditional malloc_trim()
authorWilly Tarreau <w@1wt.eu>
Wed, 22 Mar 2023 14:38:13 +0000 (15:38 +0100)
committerWilly Tarreau <w@1wt.eu>
Wed, 22 Mar 2023 16:30:28 +0000 (17:30 +0100)
First this will ensure that we serialize the threads and avoid severe
contention. Second it removes ugly ifdefs and conditions.

src/pattern.c

index 71f25a43b35fe3f8162143c1c436b8fa20ab7abc..6c263bebecadbe948d76da61e172214c08331477 100644 (file)
@@ -2083,11 +2083,8 @@ int pat_ref_purge_range(struct pat_ref *ref, uint from, uint to, int budget)
        list_for_each_entry(expr, &ref->pat, list)
                HA_RWLOCK_WRUNLOCK(PATEXP_LOCK, &expr->lock);
 
-#if defined(HA_HAVE_MALLOC_TRIM)
-       if (done && is_trim_enabled()) {
-               malloc_trim(0);
-       }
-#endif
+       if (done)
+               trim_all_pools();
 
        return done;
 }