From e548974ca8c1957c583912e9f353ab8fc59f41d8 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 26 Nov 2018 14:44:03 +0100 Subject: [PATCH] MINOR: compression: always create the compression pool Surprisingly, the compression pool was created at runtime on first use, which is not very convenient, has performance and reliability impacts, and even makes monitoring less easy. Let's move the pool creation at startup time instead. This even removes the need for the spinlock in case USE_ZLIB is not defined. --- src/compression.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/compression.c b/src/compression.c index 3c0cea5716..d3e6f28169 100644 --- a/src/compression.c +++ b/src/compression.c @@ -40,7 +40,7 @@ #include -#if defined(USE_SLZ) || defined(USE_ZLIB) +#if defined(USE_ZLIB) __decl_hathreads(static HA_SPINLOCK_T comp_pool_lock); #endif @@ -158,13 +158,6 @@ static inline int init_comp_ctx(struct comp_ctx **comp_ctx) return -1; #endif - if (unlikely(pool_comp_ctx == NULL)) { - HA_SPIN_LOCK(COMP_POOL_LOCK, &comp_pool_lock); - if (unlikely(pool_comp_ctx == NULL)) - pool_comp_ctx = create_pool("comp_ctx", sizeof(struct comp_ctx), MEM_F_SHARED); - HA_SPIN_UNLOCK(COMP_POOL_LOCK, &comp_pool_lock); - } - *comp_ctx = pool_alloc(pool_comp_ctx); if (*comp_ctx == NULL) return -1; @@ -716,6 +709,11 @@ static void __comp_fetch_init(void) slz_make_crc_table(); slz_prepare_dist_table(); #endif + +#if defined(USE_ZLIB) || defined(USE_SLZ) + pool_comp_ctx = create_pool("comp_ctx", sizeof(struct comp_ctx), MEM_F_SHARED); +#endif + #if defined(USE_ZLIB) && defined(DEFAULT_MAXZLIBMEM) global.maxzlibmem = DEFAULT_MAXZLIBMEM * 1024U * 1024U; #endif -- 2.47.3