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.
pull/808/merge
Victor Julien 12 years ago
parent b166e2f0e7
commit a3b0577a1f

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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",

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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",

@ -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,

@ -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,

@ -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;

Loading…
Cancel
Save