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

pool: remove unused Free callback

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

2
src/defrag.c
Unescape Escape View File

@ -174,7 +174,7 @@ DefragContextNew(void)
}
uint32_t frag_pool_prealloc = (uint32_t)frag_pool_size / 2;
dc->frag_pool = PoolInit((uint32_t)frag_pool_size, frag_pool_prealloc, sizeof(Frag), NULL,
DefragFragInit, dc, NULL, NULL);
DefragFragInit, dc, NULL);
if (dc->frag_pool == NULL) {
FatalError("Defrag: Failed to initialize fragment pool.");
}

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

@ -76,7 +76,7 @@ PoolThread *PoolThreadInit(int threads, uint32_t size, uint32_t prealloc_size, u
// 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, NULL);
e->pool = PoolInit(size, prealloc_size, elt_size, Alloc, Init, InitData, Cleanup);
SCMutexUnlock(&e->lock);
if (e->pool == NULL) {
SCLogDebug("error");
@ -126,16 +126,14 @@ int PoolThreadExpand(PoolThread *pt)
settings.Init = e->pool->Init;
settings.InitData = e->pool->InitData;
settings.Cleanup = e->pool->Cleanup;
settings.Free = e->pool->Free;
SCMutexUnlock(&e->lock);
e = &pt->array[newsize - 1];
memset(e, 0x00, sizeof(*e));
SCMutexInit(&e->lock, NULL);
SCMutexLock(&e->lock);
e->pool = PoolInit(settings.max_buckets, settings.preallocated,
settings.elt_size, settings.Alloc, settings.Init, settings.InitData,
settings.Cleanup, settings.Free);
e->pool = PoolInit(settings.max_buckets, settings.preallocated, settings.elt_size,
settings.Alloc, settings.Init, settings.InitData, settings.Cleanup);
SCMutexUnlock(&e->lock);
if (e->pool == NULL) {
SCLogError("pool grow failed");

49
src/util-pool.c
Unescape Escape View File

@ -77,12 +77,10 @@ static bool PoolDataPreAllocated(Pool *p, void *data)
* \param Init An init function or NULL to use a standard memset to 0
* \param InitData Init data
* \param Cleanup a free function or NULL if no special treatment is needed
* \param Free free func
* \retval the allocated Pool
*/
Pool *PoolInit(const uint32_t size, const uint32_t prealloc_size, const uint32_t elt_size,
void *(*Alloc)(void), int (*Init)(void *, void *), void *InitData, void (*Cleanup)(void *),
void (*Free)(void *))
void *(*Alloc)(void), int (*Init)(void *, void *), void *InitData, void (*Cleanup)(void *))
{
sc_errno = SC_OK;
@ -96,10 +94,6 @@ Pool *PoolInit(const uint32_t size, const uint32_t prealloc_size, const uint32_t
sc_errno = SC_EINVAL;
goto error;
}
if (elt_size && Free) {
sc_errno = SC_EINVAL;
goto error;
}
if (elt_size == 0 && Alloc == NULL) {
sc_errno = SC_EINVAL;
goto error;
@ -120,7 +114,6 @@ Pool *PoolInit(const uint32_t size, const uint32_t prealloc_size, const uint32_t
p->Init = Init;
p->InitData = InitData;
p->Cleanup = Cleanup;
p->Free = Free;
if (p->Init == NULL) {
p->Init = PoolMemset;
p->InitData = p;
@ -170,10 +163,7 @@ Pool *PoolInit(const uint32_t size, const uint32_t prealloc_size, const uint32_t
goto error;
}
if (p->Init(pb->data, p->InitData) != 1) {
if (p->Free)
p->Free(pb->data);
else
SCFree(pb->data);
SCFree(pb->data);
SCFree(pb);
sc_errno = SC_EINVAL;
goto error;
@ -230,10 +220,7 @@ void PoolFree(Pool *p)
p->Cleanup(pb->data);
if (p->data_buffer == NULL || !PoolDataPreAllocated(p, pb->data)) {
DEBUG_VALIDATE_BUG_ON(p->data_buffer == pb->data);
if (p->Free)
p->Free(pb->data);
else
SCFree(pb->data);
SCFree(pb->data);
}
pb->data = NULL;
}
@ -250,10 +237,7 @@ void PoolFree(Pool *p)
p->Cleanup(pb->data);
if (p->data_buffer == NULL || !PoolDataPreAllocated(p, pb->data)) {
DEBUG_VALIDATE_BUG_ON(p->data_buffer == pb->data);
if (p->Free)
p->Free(pb->data);
else
SCFree(pb->data);
SCFree(pb->data);
}
pb->data = NULL;
}
@ -296,10 +280,7 @@ void *PoolGet(Pool *p)
if (pitem != NULL) {
if (p->Init(pitem, p->InitData) != 1) {
if (p->Free != NULL)
p->Free(pitem);
else
SCFree(pitem);
SCFree(pitem);
SCReturnPtr(NULL, "void");
}
@ -344,10 +325,7 @@ void PoolReturn(Pool *p, void *data)
}
if (p->data_buffer == NULL || !PoolDataPreAllocated(p, data)) {
DEBUG_VALIDATE_BUG_ON(p->data_buffer == data);
if (p->Free)
p->Free(data);
else
SCFree(data);
SCFree(data);
}
}
@ -397,7 +375,7 @@ static void PoolTestFree(void *ptr)
static int PoolTestInit01 (void)
{
Pool *p = PoolInit(10,5,10,PoolTestAlloc,NULL,NULL,PoolTestFree, NULL);
Pool *p = PoolInit(10, 5, 10, PoolTestAlloc, NULL, NULL, PoolTestFree);
FAIL_IF_NOT(p != NULL);
PoolFree(p);
@ -406,7 +384,7 @@ static int PoolTestInit01 (void)
static int PoolTestInit02 (void)
{
Pool *p = PoolInit(10,5,10,PoolTestAlloc,NULL,NULL,PoolTestFree, NULL);
Pool *p = PoolInit(10, 5, 10, PoolTestAlloc, NULL, NULL, PoolTestFree);
FAIL_IF_NOT(p != NULL);
FAIL_IF_NOT(p->alloc_stack != NULL);
@ -423,7 +401,7 @@ static int PoolTestInit02 (void)
static int PoolTestInit03 (void)
{
Pool *p = PoolInit(10,5,10,PoolTestAlloc,NULL,NULL,PoolTestFree, NULL);
Pool *p = PoolInit(10, 5, 10, PoolTestAlloc, NULL, NULL, PoolTestFree);
FAIL_IF_NOT(p != NULL);
void *data = PoolGet(p);
@ -439,7 +417,8 @@ static int PoolTestInit03 (void)
static int PoolTestInit04 (void)
{
Pool *p = PoolInit(10,5,strlen("test") + 1,NULL, PoolTestInitArg,(void *)"test",PoolTestFree, NULL);
Pool *p = PoolInit(
10, 5, strlen("test") + 1, NULL, PoolTestInitArg, (void *)"test", PoolTestFree);
FAIL_IF_NOT(p != NULL);
char *str = PoolGet(p);
@ -457,7 +436,7 @@ static int PoolTestInit04 (void)
static int PoolTestInit05 (void)
{
Pool *p = PoolInit(10,5,10,PoolTestAlloc,NULL, NULL,PoolTestFree, NULL);
Pool *p = PoolInit(10, 5, 10, PoolTestAlloc, NULL, NULL, PoolTestFree);
FAIL_IF_NOT(p != NULL);
void *data = PoolGet(p);
@ -480,7 +459,7 @@ static int PoolTestInit05 (void)
static int PoolTestInit06 (void)
{
Pool *p = PoolInit(1,0,10,PoolTestAlloc,NULL,NULL,PoolTestFree, NULL);
Pool *p = PoolInit(1, 0, 10, PoolTestAlloc, NULL, NULL, PoolTestFree);
FAIL_IF_NOT(p != NULL);
FAIL_IF_NOT(p->allocated == 0);
@ -507,7 +486,7 @@ static int PoolTestInit06 (void)
/** \test pool with unlimited size */
static int PoolTestInit07 (void)
{
Pool *p = PoolInit(0,1,10,PoolTestAlloc,NULL,NULL,PoolTestFree, NULL);
Pool *p = PoolInit(0, 1, 10, PoolTestAlloc, NULL, NULL, PoolTestFree);
FAIL_IF_NOT(p != NULL);
FAIL_IF_NOT(p->max_buckets == 0);

4
src/util-pool.h
Unescape Escape View File

@ -61,7 +61,6 @@ typedef struct Pool_ {
int (*Init)(void *, void *);
void *InitData;
void (*Cleanup)(void *);
void (*Free)(void *);
uint32_t elt_size;
uint32_t outstanding; /**< counter of data items 'in use'. Pretty much
@ -72,7 +71,8 @@ typedef struct Pool_ {
} Pool;
/* prototypes */
Pool* PoolInit(uint32_t, uint32_t, uint32_t, void *(*Alloc)(void), int (*Init)(void *, void *), void *, void (*Cleanup)(void *), void (*Free)(void *));
Pool *PoolInit(uint32_t, uint32_t, uint32_t, void *(*Alloc)(void), int (*Init)(void *, void *),
void *, void (*Cleanup)(void *));
void PoolFree(Pool *);
void *PoolGet(Pool *);

Write Preview
Loading…
Cancel
Save