From: Victor Julien <victor@inliniac.net>
Date: Tue, 28 May 2019 13:16:50 +0000 (+0200)
Subject: stream: simplify segment and ssn pool inits
X-Git-Tag: suricata-5.0.0-rc1~442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67ba132c10d38bdf0bf098fb7bfbbfc1636ee386;p=thirdparty%2Fsuricata.git

stream: simplify segment and ssn pool inits
---

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index d632510133..39f8a0310b 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -453,13 +453,7 @@ TcpReassemblyThreadCtx *StreamTcpReassembleInitThreadCtx(ThreadVars *tv)
                 ra_ctx->segment_thread_pool_id);
     } else {
         /* grow segment_thread_pool until we have a element for our thread id */
-        ra_ctx->segment_thread_pool_id = PoolThreadGrow(segment_thread_pool,
-                0, /* unlimited */
-                stream_config.prealloc_segments,
-                sizeof(TcpSegment),
-                TcpSegmentPoolAlloc,
-                TcpSegmentPoolInit, NULL,
-                TcpSegmentPoolCleanup, NULL);
+        ra_ctx->segment_thread_pool_id = PoolThreadExpand(segment_thread_pool);
         SCLogDebug("pool size %d, thread segment_thread_pool_id %d",
                 PoolThreadSize(segment_thread_pool),
                 ra_ctx->segment_thread_pool_id);
diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 119d278104..3c10dc7d03 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -5191,13 +5191,7 @@ TmEcode StreamTcpThreadInit(ThreadVars *tv, void *initdata, void **data)
         SCLogDebug("pool size %d, thread ssn_pool_id %d", PoolThreadSize(ssn_pool), stt->ssn_pool_id);
     } else {
         /* grow ssn_pool until we have a element for our thread id */
-        stt->ssn_pool_id = PoolThreadGrow(ssn_pool,
-                0, /* unlimited */
-                stream_config.prealloc_sessions,
-                sizeof(TcpSession),
-                StreamTcpSessionPoolAlloc,
-                StreamTcpSessionPoolInit, NULL,
-                StreamTcpSessionPoolCleanup, NULL);
+        stt->ssn_pool_id = PoolThreadExpand(ssn_pool);
         SCLogDebug("pool size %d, thread ssn_pool_id %d", PoolThreadSize(ssn_pool), stt->ssn_pool_id);
     }
     SCMutexUnlock(&ssn_pool_mutex);