detect: remove unused non-pf stats counters

Remove unused rule prefilter-related stats counters that aren't in use.

94644ac960 (detect: move non-pf rules into special prefilter engines)
removed the logic that made use of and incremented the stats counters:
- det_ctx->counter_fnonmpm_list
- det_ctx->counter_nonmpm_list

Some code was left, registering them, and mentioning them in the
json schema.

Ticket #7834
pull/13693/head
Juliana Fajardini 4 months ago committed by Victor Julien
parent a024ede9ba
commit a8453d73cd

@ -180,6 +180,9 @@ Major changes
Removals Removals
~~~~~~~~ ~~~~~~~~
- The ssh keywords ``ssh.protoversion`` and ``ssh.softwareversion`` have been removed. - The ssh keywords ``ssh.protoversion`` and ``ssh.softwareversion`` have been removed.
- The detect engine stats counters for non-mpm-prefiltered rules ``fnonmpm_list``
and ``nonmpm_list`` were not in use since Suricata 8.0.0 and **were thus removed
in 8.0.1.**
Deprecations Deprecations
~~~~~~~~~~~~ ~~~~~~~~~~~~

@ -6470,9 +6470,6 @@
} }
} }
}, },
"fnonmpm_list": {
"type": "integer"
},
"lua": { "lua": {
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
@ -6502,9 +6499,6 @@
}, },
"mpm_list": { "mpm_list": {
"type": "integer" "type": "integer"
},
"nonmpm_list": {
"type": "integer"
} }
} }
}, },

@ -3425,8 +3425,6 @@ TmEcode DetectEngineThreadCtxInit(ThreadVars *tv, void *initdata, void **data)
#ifdef PROFILING #ifdef PROFILING
det_ctx->counter_mpm_list = StatsRegisterAvgCounter("detect.mpm_list", tv); det_ctx->counter_mpm_list = StatsRegisterAvgCounter("detect.mpm_list", tv);
det_ctx->counter_nonmpm_list = StatsRegisterAvgCounter("detect.nonmpm_list", tv);
det_ctx->counter_fnonmpm_list = StatsRegisterAvgCounter("detect.fnonmpm_list", tv);
det_ctx->counter_match_list = StatsRegisterAvgCounter("detect.match_list", tv); det_ctx->counter_match_list = StatsRegisterAvgCounter("detect.match_list", tv);
#endif #endif
@ -3484,12 +3482,8 @@ DetectEngineThreadCtx *DetectEngineThreadCtxInitForReload(
det_ctx->counter_alerts_suppressed = StatsRegisterCounter("detect.alerts_suppressed", tv); det_ctx->counter_alerts_suppressed = StatsRegisterCounter("detect.alerts_suppressed", tv);
#ifdef PROFILING #ifdef PROFILING
uint16_t counter_mpm_list = StatsRegisterAvgCounter("detect.mpm_list", tv); uint16_t counter_mpm_list = StatsRegisterAvgCounter("detect.mpm_list", tv);
uint16_t counter_nonmpm_list = StatsRegisterAvgCounter("detect.nonmpm_list", tv);
uint16_t counter_fnonmpm_list = StatsRegisterAvgCounter("detect.fnonmpm_list", tv);
uint16_t counter_match_list = StatsRegisterAvgCounter("detect.match_list", tv); uint16_t counter_match_list = StatsRegisterAvgCounter("detect.match_list", tv);
det_ctx->counter_mpm_list = counter_mpm_list; det_ctx->counter_mpm_list = counter_mpm_list;
det_ctx->counter_nonmpm_list = counter_nonmpm_list;
det_ctx->counter_fnonmpm_list = counter_fnonmpm_list;
det_ctx->counter_match_list = counter_match_list; det_ctx->counter_match_list = counter_match_list;
#endif #endif

@ -1293,8 +1293,6 @@ typedef struct DetectEngineThreadCtx_ {
uint16_t counter_alerts_suppressed; uint16_t counter_alerts_suppressed;
#ifdef PROFILING #ifdef PROFILING
uint16_t counter_mpm_list; uint16_t counter_mpm_list;
uint16_t counter_nonmpm_list;
uint16_t counter_fnonmpm_list;
uint16_t counter_match_list; uint16_t counter_match_list;
#endif #endif

Loading…
Cancel
Save