From: Victor Julien Date: Mon, 17 Sep 2012 08:34:34 +0000 (+0200) Subject: profiling: minor cleanup X-Git-Tag: suricata-1.4beta2~70 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f923075171f29d005b203c440841b77590c0895;p=thirdparty%2Fsuricata.git profiling: minor cleanup --- diff --git a/src/util-profiling-rules.c b/src/util-profiling-rules.c index fc28077465..fffbf5df09 100644 --- a/src/util-profiling-rules.c +++ b/src/util-profiling-rules.c @@ -42,9 +42,6 @@ #define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif -#define DEFAULT_LOG_FILENAME "profile.log" -#define DEFAULT_LOG_MODE_APPEND "yes" - typedef struct SCProfileDetectCtx_ { uint32_t size; uint32_t id; @@ -437,7 +434,7 @@ SCProfilingRegisterRuleCounter(SCProfileDetectCtx *ctx) * \param match Did the rule match? */ void -SCProfilingUpdateRuleCounter(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) { SCProfileData *p = &det_ctx->rule_perf_data[id]; diff --git a/src/util-profiling.h b/src/util-profiling.h index 274a1d97f1..2cae4c3bca 100644 --- a/src/util-profiling.h +++ b/src/util-profiling.h @@ -52,7 +52,7 @@ void SCProfilingAddPacket(Packet *); #define RULE_PROFILING_END(ctx, r, m) \ if (profiling_rules_enabled) { \ profile_rule_end_ = UtilCpuGetTicks(); \ - SCProfilingUpdateRuleCounter(ctx, r->profiling_id, \ + SCProfilingRuleUpdateCounter(ctx, r->profiling_id, \ profile_rule_end_ - profile_rule_start_, m); \ profiling_rules_entered--; \ } @@ -199,7 +199,7 @@ void SCProfilingAddPacket(Packet *); void SCProfilingRulesGlobalInit(void); void SCProfilingRuleDestroyCtx(SCProfileDetectCtx *); void SCProfilingRuleInitCounters(DetectEngineCtx *); -void SCProfilingUpdateRuleCounter(DetectEngineThreadCtx *, uint16_t, uint64_t, int); +void SCProfilingRuleUpdateCounter(DetectEngineThreadCtx *, uint16_t, uint64_t, int); void SCProfilingRuleThreadSetup(SCProfileDetectCtx *, DetectEngineThreadCtx *); void SCProfilingRuleThreadCleanup(DetectEngineThreadCtx *);