profiling: when config is missing, keyword profiling is disabled

pull/638/head
Victor Julien 12 years ago
parent 2982408155
commit 660636c5bc

@ -61,7 +61,7 @@ typedef struct SCProfileKeywordDetectCtx_ {
} SCProfileKeywordDetectCtx; } SCProfileKeywordDetectCtx;
static int profiling_keywords_output_to_file = 0; static int profiling_keywords_output_to_file = 0;
int profiling_keyword_enabled = 1; int profiling_keyword_enabled = 0;
__thread int profiling_keyword_entered = 0; __thread int profiling_keyword_entered = 0;
static char *profiling_file_name = ""; static char *profiling_file_name = "";
static const char *profiling_file_mode = "a"; static const char *profiling_file_mode = "a";
@ -155,6 +155,9 @@ SCProfilingKeywordDump(DetectEngineCtx *de_ctx) {
struct tm *tms; struct tm *tms;
struct tm local_tm; struct tm local_tm;
if (profiling_keyword_enabled == 0)
return;
gettimeofday(&tval, NULL); gettimeofday(&tval, NULL);
tms = SCLocalTime(tval.tv_sec, &local_tm); tms = SCLocalTime(tval.tv_sec, &local_tm);
@ -350,6 +353,9 @@ void SCProfilingKeywordThreadCleanup(DetectEngineThreadCtx *det_ctx) {
void void
SCProfilingKeywordInitCounters(DetectEngineCtx *de_ctx) SCProfilingKeywordInitCounters(DetectEngineCtx *de_ctx)
{ {
if (profiling_keyword_enabled == 0)
return;
de_ctx->profile_keyword_ctx = SCProfilingKeywordInitCtx(); de_ctx->profile_keyword_ctx = SCProfilingKeywordInitCtx();
BUG_ON(de_ctx->profile_keyword_ctx == NULL); BUG_ON(de_ctx->profile_keyword_ctx == NULL);

Loading…
Cancel
Save