aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pool/thread: remove unused Free callback

Browse Source 
Not used so not tested.
pull/15429/head
Victor Julien 2 months ago
parent 4624028722
commit d4575f5765
4 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File

9
src/stream-tcp-reassemble.c
Unescape Escape View File

@ -567,12 +567,9 @@ TcpReassemblyThreadCtx *StreamTcpReassembleInitThreadCtx(ThreadVars *tv)
SCMutexLock(&segment_thread_pool_mutex);
if (segment_thread_pool == NULL) {
segment_thread_pool = PoolThreadInit(1, /* thread */
0, /* unlimited */
stream_config.prealloc_segments,
sizeof(TcpSegment),
TcpSegmentPoolAlloc,
TcpSegmentPoolInit, NULL,
TcpSegmentPoolCleanup, NULL);
0, /* unlimited */
stream_config.prealloc_segments, sizeof(TcpSegment), TcpSegmentPoolAlloc,
TcpSegmentPoolInit, NULL, TcpSegmentPoolCleanup);
ra_ctx->segment_thread_pool_id = 0;
SCLogDebug("pool size %d, thread segment_thread_pool_id %d",
PoolThreadSize(segment_thread_pool),

18
src/stream-tcp.c
Unescape Escape View File

@ -854,12 +854,9 @@ void StreamTcpInitConfig(bool quiet)
SCMutexLock(&ssn_pool_mutex);
if (ssn_pool == NULL) {
ssn_pool = PoolThreadInit(1, /* thread */
0, /* unlimited */
stream_config.prealloc_sessions,
sizeof(TcpSession),
StreamTcpSessionPoolAlloc,
StreamTcpSessionPoolInit, NULL,
StreamTcpSessionPoolCleanup, NULL);
0, /* unlimited */
stream_config.prealloc_sessions, sizeof(TcpSession), StreamTcpSessionPoolAlloc,
StreamTcpSessionPoolInit, NULL, StreamTcpSessionPoolCleanup);
}
SCMutexUnlock(&ssn_pool_mutex);
}
@ -6222,12 +6219,9 @@ TmEcode StreamTcpThreadInit(ThreadVars *tv, void *initdata, void **data)
SCMutexLock(&ssn_pool_mutex);
if (ssn_pool == NULL) {
ssn_pool = PoolThreadInit(1, /* thread */
0, /* unlimited */
stream_config.prealloc_sessions,
sizeof(TcpSession),
StreamTcpSessionPoolAlloc,
StreamTcpSessionPoolInit, NULL,
StreamTcpSessionPoolCleanup, NULL);
0, /* unlimited */
stream_config.prealloc_sessions, sizeof(TcpSession), StreamTcpSessionPoolAlloc,
StreamTcpSessionPoolInit, NULL, StreamTcpSessionPoolCleanup);
stt->ssn_pool_id = 0;
SCLogDebug("pool size %d, thread ssn_pool_id %d", PoolThreadSize(ssn_pool), stt->ssn_pool_id);
} else {

32
src/util-pool-thread.c
Unescape Escape View File

@ -41,9 +41,8 @@
* \param thread number of threads this is for. Can start with 1 and be expanded.
* Other params are as for PoolInit()
*/
PoolThread *PoolThreadInit(int threads, uint32_t size, uint32_t prealloc_size,
uint32_t elt_size, void *(*Alloc)(void), int (*Init)(void *, void *),
void *InitData, void (*Cleanup)(void *), void (*Free)(void *))
PoolThread *PoolThreadInit(int threads, uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
void *(*Alloc)(void), int (*Init)(void *, void *), void *InitData, void (*Cleanup)(void *))
{
sc_errno = SC_OK;
@ -77,7 +76,7 @@ PoolThread *PoolThreadInit(int threads, uint32_t size, uint32_t prealloc_size,
// SCLogDebug("size %u prealloc_size %u elt_size %u Alloc %p Init %p InitData %p Cleanup %p Free %p",
// size, prealloc_size, elt_size,
// Alloc, Init, InitData, Cleanup, Free);
e->pool = PoolInit(size, prealloc_size, elt_size, Alloc, Init, InitData, Cleanup, Free);
e->pool = PoolInit(size, prealloc_size, elt_size, Alloc, Init, InitData, Cleanup, NULL);
SCMutexUnlock(&e->lock);
if (e->pool == NULL) {
SCLogDebug("error");
@ -258,8 +257,7 @@ void PoolThreadTestFree(void *data)
static int PoolThreadTestInit01(void)
{
PoolThread *pt = PoolThreadInit(4, /* threads */
10, 5, 10, PoolThreadTestAlloc,
NULL, NULL, NULL, NULL);
10, 5, 10, PoolThreadTestAlloc, NULL, NULL, NULL);
FAIL_IF(pt == NULL);
PoolThreadFree(pt);
PASS;
@ -270,9 +268,7 @@ static int PoolThreadTestInit02(void)
int i = 123;
PoolThread *pt = PoolThreadInit(4, /* threads */
10, 5, 10,
PoolThreadTestAlloc, PoolThreadTestInit,
&i, PoolThreadTestFree, NULL);
10, 5, 10, PoolThreadTestAlloc, PoolThreadTestInit, &i, PoolThreadTestFree);
FAIL_IF(pt == NULL);
PoolThreadFree(pt);
PASS;
@ -281,8 +277,7 @@ static int PoolThreadTestInit02(void)
static int PoolThreadTestGet01(void)
{
PoolThread *pt = PoolThreadInit(4, /* threads */
10, 5, 10, PoolThreadTestAlloc,
NULL, NULL, NULL, NULL);
10, 5, 10, PoolThreadTestAlloc, NULL, NULL, NULL);
FAIL_IF(pt == NULL);
void *data = PoolThreadGetById(pt, 3);
@ -300,8 +295,7 @@ static int PoolThreadTestGet02(void)
int i = 123;
PoolThread *pt = PoolThreadInit(4, /* threads */
10, 5, 10, PoolThreadTestAlloc,
PoolThreadTestInit, &i, PoolThreadTestFree, NULL);
10, 5, 10, PoolThreadTestAlloc, PoolThreadTestInit, &i, PoolThreadTestFree);
FAIL_IF_NULL(pt);
void *data = PoolThreadGetById(pt, 3);
@ -321,8 +315,7 @@ static int PoolThreadTestReturn01(void)
int i = 123;
PoolThread *pt = PoolThreadInit(4, /* threads */
10, 5, 10, PoolThreadTestAlloc,
PoolThreadTestInit, &i, PoolThreadTestFree, NULL);
10, 5, 10, PoolThreadTestAlloc, PoolThreadTestInit, &i, PoolThreadTestFree);
FAIL_IF_NULL(pt);
void *data = PoolThreadGetById(pt, 3);
@ -346,8 +339,7 @@ static int PoolThreadTestReturn01(void)
static int PoolThreadTestGrow01(void)
{
PoolThread *pt = PoolThreadInit(4, /* threads */
10, 5, 10, PoolThreadTestAlloc,
NULL, NULL, NULL, NULL);
10, 5, 10, PoolThreadTestAlloc, NULL, NULL, NULL);
FAIL_IF_NULL(pt);
FAIL_IF(PoolThreadExpand(pt) < 0);
@ -360,8 +352,7 @@ static int PoolThreadTestGrow02(void)
int i = 123;
PoolThread *pt = PoolThreadInit(4, /* threads */
10, 5, 10, PoolThreadTestAlloc,
PoolThreadTestInit, &i, PoolThreadTestFree, NULL);
10, 5, 10, PoolThreadTestAlloc, PoolThreadTestInit, &i, PoolThreadTestFree);
FAIL_IF_NULL(pt);
FAIL_IF(PoolThreadExpand(pt) < 0);
@ -374,8 +365,7 @@ static int PoolThreadTestGrow03(void)
int i = 123;
PoolThread *pt = PoolThreadInit(4, /* threads */
10, 5, 10, PoolThreadTestAlloc,
PoolThreadTestInit, &i, PoolThreadTestFree, NULL);
10, 5, 10, PoolThreadTestAlloc, PoolThreadTestInit, &i, PoolThreadTestFree);
FAIL_IF_NULL(pt);
FAIL_IF(PoolThreadExpand(pt) < 0);

3
src/util-pool-thread.h
Unescape Escape View File

@ -65,7 +65,8 @@ void PoolThreadRegisterTests(void);
* \note same as PoolInit() except for "threads"
* \param threads number of threads to use this
* \retval pt thread pool or NULL on error */
PoolThread *PoolThreadInit(int threads, uint32_t size, uint32_t prealloc_size, uint32_t elt_size, void *(*Alloc)(void), int (*Init)(void *, void *), void *InitData, void (*Cleanup)(void *), void (*Free)(void *));
PoolThread *PoolThreadInit(int threads, uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
void *(*Alloc)(void), int (*Init)(void *, void *), void *InitData, void (*Cleanup)(void *));
/** \brief grow a thread pool by one
* \note copies settings from initial PoolThreadInit() call

Write Preview
Loading…
Cancel
Save