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.

diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index e66bb336d2da00284d6937c1fbc2ad502b0d9605..b38334c77ee3b79ae3def27e0936a25001ae56fa 100644 (file)
--- 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 e6be0be08dc6b10ac796c1cf34436dfaa9b5f6fc..8bd446f7b754dfaff7213ab46b8839b56920ef6a 100644 (file)
--- 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 37435de0c0947fe338b01d1883edfc0106d740cb..90388a6cda77aa8203ace630a029509679a332e3 100644 (file)
--- 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 bb3d99f611178bdef142ace5393b973351b01b19..eb1cc555880a8cd5f0971fd5ffbf6a5afd837a5b 100644 (file)
--- 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 af19f82cd298e75bac1c2f1bfe5c7827baa2daaa..f55d0de3f0fd930000bb1ebc1ff662c11274dcaf 100644 (file)
--- 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 e7ea9566c9fd0d3262582e922f6e1c792838b2fb..943b99edfbb2a502bf71d1f1ebebb3482135648f 100644 (file)
--- 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 9ca4f0c24e185c0be32a21ed31d85b37aee3a296..0116b3515494fe23bd1e4bd2c89e4f2f6bbe3862 100644 (file)
--- 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 740b06cb2a24f15631adcf8f56ca5e649003638d..10b4d208363ec2b172f9a8374f8f19ba169f9461 100644 (file)
--- 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 cd8f74ef436fa75dbd9aabe9bae6f79dca19cdf2..e7398fbf132d7aa7f8991fca4318f69c3f06687b 100644 (file)
--- 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 bd540378bde202b6e4c0f396ddd17efeebc78a39..d6b3863a591ab9e60bd308ca1d390815f5096d39 100644 (file)
--- 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 c466fe097c6590b4272051d6de5995491521d509..8ae7d13d75913c3c269035bf055a65166cf1be5b 100644 (file)
--- 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 a95a0d5b2f2134e785924a16a0d17044a4d9f045..74be9fe75b35cfc210569b979164e3e1519cb246 100644 (file)
--- 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 7bcf6a18ae5e970514b80bb00144c5fdfda61a8d..c81a0f26d1503668e61649bccfdeb8ca904ee16a 100644 (file)
--- 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 c3950078b4458ede4c5e8ff0acf751d82e4fd623..00ac24eeed8846e515f406b60a7370cf81d9da2a 100644 (file)
--- 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 8511f91e85d75d1df3c9d5a10c74c33d686418eb..9d953b1fba88182671c0ba97575d591ab67f99d3 100644 (file)
--- 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 e7df3f4e7fd67912e28d1fb3284cfb1431bb3ed8..2b46cfef23594f4f5fe78fd9aeaad542f2806b92 100644 (file)
--- 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 136bd8225e14a6244a8a44912645aa1f5d084fa4..339adf833a10a68a5e05d91fac9e50421a2a9818 100644 (file)
--- 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 ce79d0fa8574312ae139e877b68b348c1cc48671..5b00d8a96f373e5c5b2b341da7894ff76fad4b20 100644 (file)
--- 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 46065ef973d08cf01ec402557971bd68c9f0ad0f..1737eceffa95a0bea1ca96124ec123dd2a67f4f1 100644 (file)
--- 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;