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

profiling: fix some profiling info missing from output

Browse Source
pull/101/merge
Victor Julien 14 years ago
parent ffbbff9d6c
commit ee5d6fdb6f
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

32
src/util-profiling-rules.c
Unescape Escape View File

@ -300,32 +300,32 @@ SCProfilingRuleDump(SCProfileDetectCtx *rules_ctx)
SCLogInfo("Dumping profiling data for %u rules.", count); SCLogInfo("Dumping profiling data for %u rules.", count);
memset(summary, 0, summary_size); memset(summary, 0, summary_size);
for (i = 1; i < count + 1; i++) { for (i = 0; i < count; i++) {
summary[i - 1].sid = rules_profile_data[i].sid; summary[i].sid = rules_profile_data[i].sid;
summary[i - 1].rev = rules_profile_data[i].rev; summary[i].rev = rules_profile_data[i].rev;
summary[i - 1].gid = rules_profile_data[i].gid; summary[i].gid = rules_profile_data[i].gid;
summary[i - 1].ticks = rules_profile_data[i].ticks_match + rules_profile_data[i].ticks_no_match; summary[i].ticks = rules_profile_data[i].ticks_match + rules_profile_data[i].ticks_no_match;
summary[i - 1].checks = rules_profile_data[i].checks; summary[i].checks = rules_profile_data[i].checks;
if (summary[i - 1].ticks > 0) { if (summary[i].ticks > 0) {
summary[i - 1].avgticks = (long double)summary[i - 1].ticks / (long double)rules_profile_data[i].checks; summary[i].avgticks = (long double)summary[i].ticks / (long double)rules_profile_data[i].checks;
} }
summary[i - 1].matches = rules_profile_data[i].matches; summary[i].matches = rules_profile_data[i].matches;
summary[i - 1].max = rules_profile_data[i].max; summary[i].max = rules_profile_data[i].max;
summary[i - 1].ticks_match = rules_profile_data[i].ticks_match; summary[i].ticks_match = rules_profile_data[i].ticks_match;
summary[i - 1].ticks_no_match = rules_profile_data[i].ticks_no_match; summary[i].ticks_no_match = rules_profile_data[i].ticks_no_match;
if (rules_profile_data[i].ticks_match > 0) { if (rules_profile_data[i].ticks_match > 0) {
summary[i - 1].avgticks_match = (long double)rules_profile_data[i].ticks_match / summary[i].avgticks_match = (long double)rules_profile_data[i].ticks_match /
(long double)rules_profile_data[i].matches; (long double)rules_profile_data[i].matches;
} }
if (rules_profile_data[i].ticks_no_match > 0) { if (rules_profile_data[i].ticks_no_match > 0) {
summary[i - 1].avgticks_no_match = (long double)rules_profile_data[i].ticks_no_match / summary[i].avgticks_no_match = (long double)rules_profile_data[i].ticks_no_match /
((long double)rules_profile_data[i].checks - (long double)rules_profile_data[i].matches); ((long double)rules_profile_data[i].checks - (long double)rules_profile_data[i].matches);
} }
total_ticks += summary[i - 1].ticks; total_ticks += summary[i].ticks;
} }
switch (profiling_rules_sort_order) { switch (profiling_rules_sort_order) {
@ -440,7 +440,7 @@ SCProfilingRegisterRuleCounter(SCProfileDetectCtx *ctx)
void void
SCProfilingRuleUpdateCounter(DetectEngineThreadCtx *det_ctx, uint16_t id, uint64_t ticks, int match) SCProfilingRuleUpdateCounter(DetectEngineThreadCtx *det_ctx, uint16_t id, uint64_t ticks, int match)
{ {
if (det_ctx != NULL && det_ctx->rule_perf_data != NULL && det_ctx->rule_perf_data_size >= id) { if (det_ctx != NULL && det_ctx->rule_perf_data != NULL && det_ctx->rule_perf_data_size > id) {
SCProfileData *p = &det_ctx->rule_perf_data[id]; SCProfileData *p = &det_ctx->rule_perf_data[id];
p->checks++; p->checks++;

Write Preview
Loading…
Cancel
Save