output-flow: remove ThreadExitPrintStats callback

The callback, ThreadExitPrintStats is not used in the flow loggers.

Ticket: #7227

diff --git a/src/output-flow.c b/src/output-flow.c
index 5d7a08c8835862ad94a974415d7132ec647d95f7..ae309777aba4d7f0986e1073e3c7da47aa5afd67 100644 (file)
--- a/src/output-flow.c
+++ b/src/output-flow.c
@@ -51,7 +51,6 @@ typedef struct OutputFlowLogger_ {
 
     TmEcode (*ThreadInit)(ThreadVars *, const void *, void **);
     TmEcode (*ThreadDeinit)(ThreadVars *, void *);
-    void (*ThreadExitPrintStats)(ThreadVars *, void *);
 } OutputFlowLogger;
 
 static OutputFlowLogger *list = NULL;
@@ -65,8 +64,7 @@ static OutputFlowLogger *list = NULL;
  * \retval 0 on success, -1 on failure.
  */
 int OutputRegisterFlowLogger(const char *name, FlowLogger LogFunc, void *initdata,
-        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
-        ThreadExitPrintStatsFunc ThreadExitPrintStats)
+        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit)
 {
     OutputFlowLogger *op = SCCalloc(1, sizeof(*op));
     if (op == NULL)
@@ -77,7 +75,6 @@ int OutputRegisterFlowLogger(const char *name, FlowLogger LogFunc, void *initdat
     op->name = name;
     op->ThreadInit = ThreadInit;
     op->ThreadDeinit = ThreadDeinit;
-    op->ThreadExitPrintStats = ThreadExitPrintStats;
 
     if (list == NULL)
         list = op;

diff --git a/src/output-flow.h b/src/output-flow.h
index c3dd3335cbd3df12f606ed45e53b1545dee6becc..fc6ba5b39ef43deba240319d7275b5ee2e8561d9 100644 (file)
--- a/src/output-flow.h
+++ b/src/output-flow.h
@@ -32,8 +32,7 @@
 typedef int (*FlowLogger)(ThreadVars *, void *thread_data, Flow *f);
 
 int OutputRegisterFlowLogger(const char *name, FlowLogger LogFunc, void *initdata,
-        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
-        ThreadExitPrintStatsFunc ThreadExitPrintStats);
+        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit);
 
 void OutputFlowShutdown(void);
 

diff --git a/src/output-json-flow.c b/src/output-json-flow.c
index 487185f2ed5b7b5cbfa9f21b5f03dab20c5e3cb7..e1d500067b31e6e198767aa2c46a0ff158db01f0 100644 (file)
--- a/src/output-json-flow.c
+++ b/src/output-json-flow.c
@@ -349,5 +349,5 @@ void JsonFlowLogRegister (void)
 {
     /* register as child of eve-log */
     OutputRegisterFlowSubModule(LOGGER_JSON_FLOW, "eve-log", "JsonFlowLog", "eve-log.flow",
-            OutputJsonLogInitSub, JsonFlowLogger, JsonLogThreadInit, JsonLogThreadDeinit, NULL);
+            OutputJsonLogInitSub, JsonFlowLogger, JsonLogThreadInit, JsonLogThreadDeinit);
 }

diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index 98873e5f063f16ab6e5d85a8eee5f5b743fe6f8d..ef0937b854ffc1076596cdf681c58ecab6a588aa 100644 (file)
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -296,5 +296,5 @@ void JsonNetFlowLogRegister(void)
 {
     /* register as child of eve-log */
     OutputRegisterFlowSubModule(LOGGER_JSON_NETFLOW, "eve-log", "JsonNetFlowLog", "eve-log.netflow",
-            OutputJsonLogInitSub, JsonNetFlowLogger, JsonLogThreadInit, JsonLogThreadDeinit, NULL);
+            OutputJsonLogInitSub, JsonNetFlowLogger, JsonLogThreadInit, JsonLogThreadDeinit);
 }

diff --git a/src/output.c b/src/output.c
index b18832afa524393b4903dc6e3549e97711f15a1b..a6ca3e1ae0465abcb2efeb59a42a342059ef5778 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -500,11 +500,9 @@ error:
  *
  * \retval Returns 0 on success, -1 on failure.
  */
-void OutputRegisterFlowSubModule(LoggerId id, const char *parent_name,
-    const char *name, const char *conf_name, OutputInitSubFunc InitFunc,
-    FlowLogger FlowLogFunc, ThreadInitFunc ThreadInit,
-    ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats)
+void OutputRegisterFlowSubModule(LoggerId id, const char *parent_name, const char *name,
+        const char *conf_name, OutputInitSubFunc InitFunc, FlowLogger FlowLogFunc,
+        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit)
 {
     if (unlikely(FlowLogFunc == NULL)) {
         goto error;
@@ -523,7 +521,6 @@ void OutputRegisterFlowSubModule(LoggerId id, const char *parent_name,
     module->FlowLogFunc = FlowLogFunc;
     module->ThreadInit = ThreadInit;
     module->ThreadDeinit = ThreadDeinit;
-    module->ThreadExitPrintStats = ThreadExitPrintStats;
     TAILQ_INSERT_TAIL(&output_modules, module, entries);
 
     SCLogDebug("Flow logger \"%s\" registered.", name);

diff --git a/src/output.h b/src/output.h
index 074d20bf5bf2bcd8fb3c581dc198a9bd9b15a408..bedb34b0318c3408b8b1552862fff13a911554ce 100644 (file)
--- a/src/output.h
+++ b/src/output.h
@@ -142,11 +142,9 @@ void OutputRegisterFiledataModule(LoggerId id, const char *name, const char *con
         OutputInitFunc InitFunc, FiledataLogger FiledataLogFunc, ThreadInitFunc ThreadInit,
         ThreadDeinitFunc ThreadDeinit, ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
-void OutputRegisterFlowSubModule(LoggerId id, const char *parent_name,
-    const char *name, const char *conf_name, OutputInitSubFunc InitFunc,
-    FlowLogger FlowLogFunc, ThreadInitFunc ThreadInit,
-    ThreadDeinitFunc ThreadDeinit,
-    ThreadExitPrintStatsFunc ThreadExitPrintStats);
+void OutputRegisterFlowSubModule(LoggerId id, const char *parent_name, const char *name,
+        const char *conf_name, OutputInitSubFunc InitFunc, FlowLogger FlowLogFunc,
+        ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit);
 
 void OutputRegisterStreamingModule(LoggerId id, const char *name, const char *conf_name,
         OutputInitFunc InitFunc, StreamingLogger StreamingLogFunc,

diff --git a/src/runmodes.c b/src/runmodes.c
index 0fc8285eb4ff4bcb04ee7b67ea317e1cda90c024..c702184e59414ba721f9ea833c9f855dd77900f0 100644 (file)
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -600,9 +600,8 @@ static void SetupOutput(
 {
     /* flow logger doesn't run in the packet path */
     if (module->FlowLogFunc) {
-        OutputRegisterFlowLogger(module->name, module->FlowLogFunc,
-            output_ctx, module->ThreadInit, module->ThreadDeinit,
-            module->ThreadExitPrintStats);
+        OutputRegisterFlowLogger(module->name, module->FlowLogFunc, output_ctx, module->ThreadInit,
+                module->ThreadDeinit);
         return;
     }
     /* stats logger doesn't run in the packet path */