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

detect grouping: remove debug mem counters

Browse Source
pull/1980/head
Victor Julien 9 years ago
parent 5f676167a3
commit e0111fbb90
5 changed files with 0 additions and 104 deletions
Show Stats Download Patch File Download Diff File

92
src/detect-engine-siggroup.c
Unescape Escape View File

@ -54,32 +54,13 @@
/* prototypes */
int SigGroupHeadClearSigs(SigGroupHead *);
static uint32_t detect_siggroup_head_memory = 0;
static uint32_t detect_siggroup_head_init_cnt = 0;
static uint32_t detect_siggroup_head_free_cnt = 0;
static uint32_t detect_siggroup_head_initdata_memory = 0;
static uint32_t detect_siggroup_head_initdata_init_cnt = 0;
static uint32_t detect_siggroup_head_initdata_free_cnt = 0;
static uint32_t detect_siggroup_sigarray_memory = 0;
static uint32_t detect_siggroup_sigarray_init_cnt = 0;
static uint32_t detect_siggroup_sigarray_free_cnt = 0;
static uint32_t detect_siggroup_matcharray_memory = 0;
static uint32_t detect_siggroup_matcharray_init_cnt = 0;
static uint32_t detect_siggroup_matcharray_free_cnt = 0;
void SigGroupHeadInitDataFree(SigGroupHeadInitData *sghid)
{
if (sghid->sig_array != NULL) {
SCFree(sghid->sig_array);
sghid->sig_array = NULL;
detect_siggroup_sigarray_free_cnt++;
detect_siggroup_sigarray_memory -= sghid->sig_size;
}
SCFree(sghid);
detect_siggroup_head_initdata_free_cnt++;
detect_siggroup_head_initdata_memory -= sizeof(SigGroupHeadInitData);
}
static SigGroupHeadInitData *SigGroupHeadInitDataAlloc(uint32_t size)
@ -90,9 +71,6 @@ static SigGroupHeadInitData *SigGroupHeadInitDataAlloc(uint32_t size)
memset(sghid, 0x00, sizeof(SigGroupHeadInitData));
detect_siggroup_head_initdata_init_cnt++;
detect_siggroup_head_initdata_memory += sizeof(SigGroupHeadInitData);
/* initialize the signature bitarray */
sghid->sig_size = size;
if ( (sghid->sig_array = SCMalloc(sghid->sig_size)) == NULL)
@ -100,9 +78,6 @@ static SigGroupHeadInitData *SigGroupHeadInitDataAlloc(uint32_t size)
memset(sghid->sig_array, 0, sghid->sig_size);
detect_siggroup_sigarray_init_cnt++;
detect_siggroup_sigarray_memory += sghid->sig_size;
return sghid;
error:
SigGroupHeadInitDataFree(sghid);
@ -152,9 +127,6 @@ static SigGroupHead *SigGroupHeadAlloc(const DetectEngineCtx *de_ctx, uint32_t s
if (sgh->init == NULL)
goto error;
detect_siggroup_head_init_cnt++;
detect_siggroup_head_memory += sizeof(SigGroupHead);
return sgh;
error:
@ -175,8 +147,6 @@ void SigGroupHeadFree(SigGroupHead *sgh)
SCLogDebug("sgh %p", sgh);
if (sgh->match_array != NULL) {
detect_siggroup_matcharray_free_cnt++;
detect_siggroup_matcharray_memory -= (sgh->sig_cnt * sizeof(Signature *));
SCFree(sgh->match_array);
sgh->match_array = NULL;
}
@ -202,9 +172,6 @@ void SigGroupHeadFree(SigGroupHead *sgh)
SCFree(sgh);
detect_siggroup_head_free_cnt++;
detect_siggroup_head_memory -= sizeof(SigGroupHead);
return;
}
@ -476,62 +443,6 @@ void SigGroupHeadSetProtoAndDirection(SigGroupHead *sgh,
}
}
/**
* \brief Prints the memory statistics for the detect-engine-siggroup.[ch] module.
*/
void DetectSigGroupPrintMemory(void)
{
SCLogDebug(" * Sig group head memory stats (SigGroupHead %" PRIuMAX "):",
(uintmax_t)sizeof(SigGroupHead));
SCLogDebug(" - detect_siggroup_head_memory %" PRIu32,
detect_siggroup_head_memory);
SCLogDebug(" - detect_siggroup_head_init_cnt %" PRIu32,
detect_siggroup_head_init_cnt);
SCLogDebug(" - detect_siggroup_head_free_cnt %" PRIu32,
detect_siggroup_head_free_cnt);
SCLogDebug(" - outstanding sig group heads %" PRIu32,
detect_siggroup_head_init_cnt - detect_siggroup_head_free_cnt);
SCLogDebug(" * Sig group head memory stats done");
SCLogDebug(" * Sig group head initdata memory stats (SigGroupHeadInitData %" PRIuMAX "):",
(uintmax_t)sizeof(SigGroupHeadInitData));
SCLogDebug(" - detect_siggroup_head_initdata_memory %" PRIu32,
detect_siggroup_head_initdata_memory);
SCLogDebug(" - detect_siggroup_head_initdata_init_cnt %" PRIu32,
detect_siggroup_head_initdata_init_cnt);
SCLogDebug(" - detect_siggroup_head_initdata_free_cnt %" PRIu32,
detect_siggroup_head_initdata_free_cnt);
SCLogDebug(" - outstanding sig group head initdatas %" PRIu32,
detect_siggroup_head_initdata_init_cnt - detect_siggroup_head_initdata_free_cnt);
SCLogDebug(" * Sig group head memory initdata stats done");
SCLogDebug(" * Sig group sigarray memory stats:");
SCLogDebug(" - detect_siggroup_sigarray_memory %" PRIu32,
detect_siggroup_sigarray_memory);
SCLogDebug(" - detect_siggroup_sigarray_init_cnt %" PRIu32,
detect_siggroup_sigarray_init_cnt);
SCLogDebug(" - detect_siggroup_sigarray_free_cnt %" PRIu32,
detect_siggroup_sigarray_free_cnt);
SCLogDebug(" - outstanding sig group sigarrays %" PRIu32,
(detect_siggroup_sigarray_init_cnt -
detect_siggroup_sigarray_free_cnt));
SCLogDebug(" * Sig group sigarray memory stats done");
SCLogDebug(" * Sig group matcharray memory stats:");
SCLogDebug(" - detect_siggroup_matcharray_memory %" PRIu32,
detect_siggroup_matcharray_memory);
SCLogDebug(" - detect_siggroup_matcharray_init_cnt %" PRIu32,
detect_siggroup_matcharray_init_cnt);
SCLogDebug(" - detect_siggroup_matcharray_free_cnt %" PRIu32,
detect_siggroup_matcharray_free_cnt);
SCLogDebug(" - outstanding sig group matcharrays %" PRIu32,
(detect_siggroup_matcharray_init_cnt -
detect_siggroup_matcharray_free_cnt));
SCLogDebug(" * Sig group sigarray memory stats done");
SCLogDebug(" X Total %" PRIu32,
(detect_siggroup_head_memory + detect_siggroup_sigarray_memory +
detect_siggroup_matcharray_memory));
return;
}
/**
* \brief Helper function used to print the list of sids for the Signatures
* present in this SigGroupHead.
@ -589,9 +500,6 @@ int SigGroupHeadBuildMatchArray(DetectEngineCtx *de_ctx, SigGroupHead *sgh,
memset(sgh->match_array,0, sgh->sig_cnt * sizeof(Signature *));
detect_siggroup_matcharray_init_cnt++;
detect_siggroup_matcharray_memory += (sgh->sig_cnt * sizeof(Signature *));
for (sig = 0; sig < max_idx + 1; sig++) {
if (!(sgh->init->sig_array[(sig / 8)] & (1 << (sig % 8))) )
continue;

2
src/detect-engine-siggroup.h
Unescape Escape View File

@ -24,8 +24,6 @@
#ifndef __DETECT_ENGINE_SIGGROUP_H__
#define __DETECT_ENGINE_SIGGROUP_H__
void DetectSigGroupPrintMemory(void);
int SigGroupHeadAppendSig(const DetectEngineCtx *, SigGroupHead **, const Signature *);
int SigGroupHeadClearSigs(SigGroupHead *);
int SigGroupHeadCopySigs(DetectEngineCtx *, SigGroupHead *, SigGroupHead **);

1
src/detect-ipproto.c
Unescape Escape View File

@ -9269,7 +9269,6 @@ static int DetectIPProtoTestSig1(void)
UTHFreePacket(p);
end:
DetectSigGroupPrintMemory();
DetectAddressPrintMemory();
return result;
}

1
src/detect-rpc.c
Unescape Escape View File

@ -585,7 +585,6 @@ cleanup:
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
DetectSigGroupPrintMemory();
DetectAddressPrintMemory();
UTHFreePackets(&p, 1);
end:

8
src/detect.c
Unescape Escape View File

@ -3528,7 +3528,6 @@ int SigAddressPrepareStage1(DetectEngineCtx *de_ctx)
uint32_t cnt_deonly = 0;
//DetectAddressPrintMemory();
//DetectSigGroupPrintMemory();
//DetectPortPrintMemory();
if (!(de_ctx->flags & DE_QUIET)) {
@ -3624,7 +3623,6 @@ int SigAddressPrepareStage1(DetectEngineCtx *de_ctx)
}
//DetectAddressPrintMemory();
//DetectSigGroupPrintMemory();
//DetectPortPrintMemory();
if (!(de_ctx->flags & DE_QUIET)) {
@ -4180,7 +4178,6 @@ int SigGroupBuild(DetectEngineCtx *de_ctx)
DetectMpmPrepareAppMpms(de_ctx);
// DetectAddressPrintMemory();
// DetectSigGroupPrintMemory();
// DetectPortPrintMemory();
if (SigMatchPrepare(de_ctx) != 0) {
@ -8542,7 +8539,6 @@ static int SigTestMemory01 (void)
DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
printf("@pre cleanup\n\n");
DetectSigGroupPrintMemory();
DetectAddressPrintMemory();
DetectPortPrintMemory();
@ -8551,7 +8547,6 @@ printf("@pre cleanup\n\n");
DetectEngineCtxFree(de_ctx);
printf("@exit\n\n");
DetectSigGroupPrintMemory();
DetectAddressPrintMemory();
DetectPortPrintMemory();
@ -8592,11 +8587,9 @@ printf("@cleanup\n\n");
DetectEngineCtxFree(de_ctx);
printf("@exit\n\n");
DetectSigGroupPrintMemory();
DetectAddressPrintMemory();
DetectPortPrintMemory();
printf("@exit\n\n");
DetectSigGroupPrintMemory();
DetectAddressPrintMemory();
DetectPortPrintMemory();
@ -8641,7 +8634,6 @@ printf("@cleanup\n\n");
DetectEngineCtxFree(de_ctx);
printf("@exit\n\n");
DetectSigGroupPrintMemory();
DetectAddressPrintMemory();
DetectPortPrintMemory();

Write Preview
Loading…
Cancel
Save