From a3b0577a1f205c50d4f0776f9002074abb06c896 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 4 Feb 2014 11:49:20 +0100
Subject: [PATCH] output: add TM_FLAG_LOGAPI_TM thread module flag

The TM_FLAG_LOGAPI_TM flag indicates that a module is run by the log
api, not by the 'regular' thread module call functions.

Set flag in all all Log API users' registration code.

Purpose of this flag is in profiling. In profiling output it will be
used to list log api thread modules separately.
---
 src/alert-debuglog.c       | 1 +
 src/alert-fastlog.c        | 1 +
 src/alert-pcapinfo.c       | 1 +
 src/alert-prelude.c        | 1 +
 src/alert-syslog.c         | 1 +
 src/alert-unified2-alert.c | 1 +
 src/log-dnslog.c           | 1 +
 src/log-droplog.c          | 1 +
 src/log-file.c             | 1 +
 src/log-filestore.c        | 1 +
 src/log-httplog.c          | 1 +
 src/log-tlslog.c           | 1 +
 src/output-json-alert.c    | 1 +
 src/output-json-dns.c      | 1 +
 src/output-json-drop.c     | 1 +
 src/output-json-file.c     | 1 +
 src/output-json-http.c     | 1 +
 src/output-json-tls.c      | 1 +
 src/tm-modules.h           | 1 +
 19 files changed, 19 insertions(+)

diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index e66bb336d2..b38334c77e 100644
--- a/src/alert-debuglog.c
+++ b/src/alert-debuglog.c
@@ -515,6 +515,7 @@ void TmModuleAlertDebugLogRegister (void) {
     tmm_modules[TMM_ALERTDEBUGLOG].ThreadDeinit = AlertDebugLogThreadDeinit;
     tmm_modules[TMM_ALERTDEBUGLOG].RegisterTests = NULL;
     tmm_modules[TMM_ALERTDEBUGLOG].cap_flags = 0;
+    tmm_modules[TMM_ALERTDEBUGLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule(MODULE_NAME, "alert-debug",
         AlertDebugLogInitCtx, AlertDebugLogLogger, AlertDebugLogCondition);
diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c
index e6be0be08d..8bd446f7b7 100644
--- a/src/alert-fastlog.c
+++ b/src/alert-fastlog.c
@@ -78,6 +78,7 @@ void TmModuleAlertFastLogRegister (void) {
     tmm_modules[TMM_ALERTFASTLOG].ThreadDeinit = AlertFastLogThreadDeinit;
     tmm_modules[TMM_ALERTFASTLOG].RegisterTests = AlertFastLogRegisterTests;
     tmm_modules[TMM_ALERTFASTLOG].cap_flags = 0;
+    tmm_modules[TMM_ALERTFASTLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule(MODULE_NAME, "fast",
             AlertFastLogInitCtx, AlertFastLogger, AlertFastLogCondition);
diff --git a/src/alert-pcapinfo.c b/src/alert-pcapinfo.c
index 37435de0c0..90388a6cda 100644
--- a/src/alert-pcapinfo.c
+++ b/src/alert-pcapinfo.c
@@ -223,6 +223,7 @@ void TmModuleAlertPcapInfoRegister (void) {
     tmm_modules[TMM_ALERTPCAPINFO].ThreadDeinit = AlertPcapInfoThreadDeinit;
     tmm_modules[TMM_ALERTPCAPINFO].RegisterTests = NULL;
     tmm_modules[TMM_ALERTPCAPINFO].cap_flags = 0;
+    tmm_modules[TMM_ALERTPCAPINFO].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule(MODULE_NAME, "pcap-info",
         AlertPcapInfoInitCtx, AlertPcapInfoLogger, AlertPcapInfoCondition);
diff --git a/src/alert-prelude.c b/src/alert-prelude.c
index bb3d99f611..eb1cc55588 100644
--- a/src/alert-prelude.c
+++ b/src/alert-prelude.c
@@ -873,6 +873,7 @@ void TmModuleAlertPreludeRegister (void) {
     tmm_modules[TMM_ALERTPRELUDE].Func = NULL;
     tmm_modules[TMM_ALERTPRELUDE].ThreadDeinit = AlertPreludeThreadDeinit;
     tmm_modules[TMM_ALERTPRELUDE].cap_flags = 0;
+    tmm_modules[TMM_ALERTPRELUDE].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule("AlertPrelude", "alert-prelude", AlertPreludeInitCtx,
             AlertPreludeLogger, AlertPreludeCondition);
diff --git a/src/alert-syslog.c b/src/alert-syslog.c
index af19f82cd2..f55d0de3f0 100644
--- a/src/alert-syslog.c
+++ b/src/alert-syslog.c
@@ -414,6 +414,7 @@ void TmModuleAlertSyslogRegister (void) {
     tmm_modules[TMM_ALERTSYSLOG].ThreadDeinit = AlertSyslogThreadDeinit;
     tmm_modules[TMM_ALERTSYSLOG].RegisterTests = NULL;
     tmm_modules[TMM_ALERTSYSLOG].cap_flags = 0;
+    tmm_modules[TMM_ALERTSYSLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule(MODULE_NAME, "syslog",
         AlertSyslogInitCtx, AlertSyslogLogger, AlertSyslogCondition);
diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index e7ea9566c9..943b99edfb 100644
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -255,6 +255,7 @@ void TmModuleUnified2AlertRegister (void) {
     tmm_modules[TMM_ALERTUNIFIED2ALERT].ThreadDeinit = Unified2AlertThreadDeinit;
     tmm_modules[TMM_ALERTUNIFIED2ALERT].RegisterTests = Unified2RegisterTests;
     tmm_modules[TMM_ALERTUNIFIED2ALERT].cap_flags = 0;
+    tmm_modules[TMM_ALERTUNIFIED2ALERT].flags = TM_FLAG_LOGAPI_TM;
 
     //OutputRegisterModule(MODULE_NAME, "unified2-alert", Unified2AlertInitCtx);
     OutputRegisterPacketModule(MODULE_NAME, "unified2-alert",
diff --git a/src/log-dnslog.c b/src/log-dnslog.c
index 9ca4f0c24e..0116b35154 100644
--- a/src/log-dnslog.c
+++ b/src/log-dnslog.c
@@ -373,6 +373,7 @@ void TmModuleLogDnsLogRegister (void) {
     tmm_modules[TMM_LOGDNSLOG].ThreadDeinit = LogDnsLogThreadDeinit;
     tmm_modules[TMM_LOGDNSLOG].RegisterTests = NULL;
     tmm_modules[TMM_LOGDNSLOG].cap_flags = 0;
+    tmm_modules[TMM_LOGDNSLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterTxModule(MODULE_NAME, "dns-log", LogDnsLogInitCtx,
             ALPROTO_DNS, LogDnsLogger);
diff --git a/src/log-droplog.c b/src/log-droplog.c
index 740b06cb2a..10b4d20836 100644
--- a/src/log-droplog.c
+++ b/src/log-droplog.c
@@ -495,6 +495,7 @@ void TmModuleLogDropLogRegister (void) {
     tmm_modules[TMM_LOGDROPLOG].RegisterTests = LogDropLogRegisterTests;
 #endif
     tmm_modules[TMM_LOGDROPLOG].cap_flags = 0;
+    tmm_modules[TMM_LOGDROPLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule(MODULE_NAME, "drop", LogDropLogInitCtx,
             LogDropLogger, LogDropCondition);
diff --git a/src/log-file.c b/src/log-file.c
index cd8f74ef43..e7398fbf13 100644
--- a/src/log-file.c
+++ b/src/log-file.c
@@ -398,6 +398,7 @@ void TmModuleLogFileLogRegister (void) {
     tmm_modules[TMM_FILELOG].ThreadDeinit = LogFileLogThreadDeinit;
     tmm_modules[TMM_FILELOG].RegisterTests = NULL;
     tmm_modules[TMM_FILELOG].cap_flags = 0;
+    tmm_modules[TMM_FILELOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterFileModule(MODULE_NAME, "file-log", LogFileLogInitCtx,
             LogFileLogger);
diff --git a/src/log-filestore.c b/src/log-filestore.c
index bd540378bd..d6b3863a59 100644
--- a/src/log-filestore.c
+++ b/src/log-filestore.c
@@ -442,6 +442,7 @@ void TmModuleLogFilestoreRegister (void) {
     tmm_modules[TMM_FILESTORE].ThreadDeinit = LogFilestoreLogThreadDeinit;
     tmm_modules[TMM_FILESTORE].RegisterTests = NULL;
     tmm_modules[TMM_FILESTORE].cap_flags = 0;
+    tmm_modules[TMM_FILESTORE].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterFiledataModule(MODULE_NAME, "file", LogFilestoreLogInitCtx,
             LogFilestoreLogger);
diff --git a/src/log-httplog.c b/src/log-httplog.c
index c466fe097c..8ae7d13d75 100644
--- a/src/log-httplog.c
+++ b/src/log-httplog.c
@@ -70,6 +70,7 @@ void TmModuleLogHttpLogRegister (void) {
     tmm_modules[TMM_LOGHTTPLOG].ThreadDeinit = LogHttpLogThreadDeinit;
     tmm_modules[TMM_LOGHTTPLOG].RegisterTests = NULL;
     tmm_modules[TMM_LOGHTTPLOG].cap_flags = 0;
+    tmm_modules[TMM_LOGHTTPLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterTxModule(MODULE_NAME, "http-log", LogHttpLogInitCtx,
             ALPROTO_HTTP, LogHttpLogger);
diff --git a/src/log-tlslog.c b/src/log-tlslog.c
index a95a0d5b2f..74be9fe75b 100644
--- a/src/log-tlslog.c
+++ b/src/log-tlslog.c
@@ -585,6 +585,7 @@ void TmModuleLogTlsLogRegister(void)
     tmm_modules[TMM_LOGTLSLOG].ThreadDeinit = LogTlsLogThreadDeinit;
     tmm_modules[TMM_LOGTLSLOG].RegisterTests = NULL;
     tmm_modules[TMM_LOGTLSLOG].cap_flags = 0;
+    tmm_modules[TMM_LOGTLSLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule(MODULE_NAME, "tls-log", LogTlsLogInitCtx,
             LogTlsLogger, LogTlsCondition);
diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 7bcf6a18ae..c81a0f26d1 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -317,6 +317,7 @@ void TmModuleJsonAlertLogRegister (void) {
     tmm_modules[TMM_JSONALERTLOG].ThreadInit = JsonAlertLogThreadInit;
     tmm_modules[TMM_JSONALERTLOG].ThreadDeinit = JsonAlertLogThreadDeinit;
     tmm_modules[TMM_JSONALERTLOG].cap_flags = 0;
+    tmm_modules[TMM_JSONALERTLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule(MODULE_NAME, "alert-json-log",
             JsonAlertLogInitCtx, JsonAlertLogger, JsonAlertLogCondition);
diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index c3950078b4..00ac24eeed 100644
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -377,6 +377,7 @@ void TmModuleJsonDnsLogRegister (void) {
     tmm_modules[TMM_JSONDNSLOG].ThreadDeinit = LogDnsLogThreadDeinit;
     tmm_modules[TMM_JSONDNSLOG].RegisterTests = NULL;
     tmm_modules[TMM_JSONDNSLOG].cap_flags = 0;
+    tmm_modules[TMM_JSONDNSLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterTxModule(MODULE_NAME, "dns-json-log", JsonDnsLogInitCtx,
             ALPROTO_DNS, JsonDnsLogger);
diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index 8511f91e85..9d953b1fba 100644
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -312,6 +312,7 @@ void TmModuleJsonDropLogRegister (void) {
     tmm_modules[TMM_JSONDROPLOG].ThreadInit = JsonDropLogThreadInit;
     tmm_modules[TMM_JSONDROPLOG].ThreadDeinit = JsonDropLogThreadDeinit;
     tmm_modules[TMM_JSONDROPLOG].cap_flags = 0;
+    tmm_modules[TMM_JSONDROPLOG].flags = TM_FLAG_LOGAPI_TM;
 
     OutputRegisterPacketModule(MODULE_NAME, "drop-json-log",
             JsonDropLogInitCtx, JsonDropLogger, JsonDropLogCondition);
diff --git a/src/output-json-file.c b/src/output-json-file.c
index e7df3f4e7f..2b46cfef23 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -346,6 +346,7 @@ void TmModuleJsonFileLogRegister (void) {
     tmm_modules[TMM_JSONFILELOG].name = "JsonFileLog";
     tmm_modules[TMM_JSONFILELOG].ThreadInit = JsonFileLogThreadInit;
     tmm_modules[TMM_JSONFILELOG].ThreadDeinit = JsonFileLogThreadDeinit;
+    tmm_modules[TMM_JSONFILELOG].flags = TM_FLAG_LOGAPI_TM;
 
     /* register as child of eve-log */
     OutputRegisterFileSubModule("eve-log", "JsonFileLog", "eve-log.files",
diff --git a/src/output-json-http.c b/src/output-json-http.c
index 136bd8225e..339adf833a 100644
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -358,6 +358,7 @@ void TmModuleJsonHttpLogRegister (void) {
     tmm_modules[TMM_JSONHTTPLOG].ThreadDeinit = JsonHttpLogThreadDeinit;
     tmm_modules[TMM_JSONHTTPLOG].RegisterTests = NULL;
     tmm_modules[TMM_JSONHTTPLOG].cap_flags = 0;
+    tmm_modules[TMM_JSONHTTPLOG].flags = TM_FLAG_LOGAPI_TM;
 
     /* register as separate module */
     OutputRegisterTxModule("JsonHttpLog", "http-json-log", OutputHttpLogInit,
diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index ce79d0fa85..5b00d8a96f 100644
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -349,6 +349,7 @@ void TmModuleJsonTlsLogRegister (void) {
     tmm_modules[TMM_JSONTLSLOG].ThreadDeinit = JsonTlsLogThreadDeinit;
     tmm_modules[TMM_JSONTLSLOG].RegisterTests = NULL;
     tmm_modules[TMM_JSONTLSLOG].cap_flags = 0;
+    tmm_modules[TMM_JSONTLSLOG].flags = TM_FLAG_LOGAPI_TM;
 
     /* register as separate module */
     OutputRegisterPacketModule("JsonTlsLog", "tls-json-log", OutputTlsLogInit,
diff --git a/src/tm-modules.h b/src/tm-modules.h
index 46065ef973..1737eceffa 100644
--- a/src/tm-modules.h
+++ b/src/tm-modules.h
@@ -32,6 +32,7 @@
 #define TM_FLAG_DECODE_TM       0x02
 #define TM_FLAG_STREAM_TM       0x04
 #define TM_FLAG_DETECT_TM       0x08
+#define TM_FLAG_LOGAPI_TM       0x10 /**< TM is run by Log API */
 
 typedef struct TmModule_ {
     char *name;