threading: remove TM_FLAG_DECODE_TM flag

OISF · Dec 14, 2024 · ee5eab9 · ee5eab9
1 parent 5b4f93b
commit ee5eab9
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 15 deletions.
diff --git a/plugins/napatech/source-napatech.c b/plugins/napatech/source-napatech.c
@@ -163,7 +163,7 @@ void TmModuleDecodeNapatechRegister(int slot)
     tmm_modules[slot].ThreadExitPrintStats = NULL;
     tmm_modules[slot].ThreadDeinit = NapatechDecodeThreadDeinit;
     tmm_modules[slot].cap_flags = 0;
-    tmm_modules[slot].flags = TM_FLAG_DECODE_TM;
+    tmm_modules[slot].flags = 0;
 }
 
 #ifdef NAPATECH_ENABLE_BYPASS

diff --git a/plugins/pfring/source-pfring.c b/plugins/pfring/source-pfring.c
@@ -140,7 +140,7 @@ void TmModuleDecodePfringRegister(int slot)
     tmm_modules[slot].Func = DecodePfring;
     tmm_modules[slot].ThreadExitPrintStats = NULL;
     tmm_modules[slot].ThreadDeinit = DecodePfringThreadDeinit;
-    tmm_modules[slot].flags = TM_FLAG_DECODE_TM;
+    tmm_modules[slot].flags = 0;
 }
 
 static inline void PfringDumpCounters(PfringThreadVars *ptv)

diff --git a/src/source-af-xdp.c b/src/source-af-xdp.c
@@ -96,7 +96,6 @@ void TmModuleDecodeAFXDPRegister(void)
     tmm_modules[TMM_DECODEAFXDP].ThreadExitPrintStats = NULL;
     tmm_modules[TMM_DECODEAFXDP].ThreadDeinit = NULL;
     tmm_modules[TMM_DECODEAFXDP].cap_flags = 0;
-    tmm_modules[TMM_DECODEAFXDP].flags = TM_FLAG_DECODE_TM;
 }
 
 /**
@@ -236,7 +235,6 @@ void TmModuleDecodeAFXDPRegister(void)
     tmm_modules[TMM_DECODEAFXDP].ThreadExitPrintStats = NULL;
     tmm_modules[TMM_DECODEAFXDP].ThreadDeinit = DecodeAFXDPThreadDeinit;
     tmm_modules[TMM_DECODEAFXDP].cap_flags = 0;
-    tmm_modules[TMM_DECODEAFXDP].flags = TM_FLAG_DECODE_TM;
 }
 
 static inline void AFXDPDumpCounters(AFXDPThreadVars *ptv)

diff --git a/src/source-erf-dag.c b/src/source-erf-dag.c
@@ -61,7 +61,6 @@ TmModuleDecodeErfDagRegister(void)
     tmm_modules[TMM_DECODEERFDAG].ThreadExitPrintStats = NULL;
     tmm_modules[TMM_DECODEERFDAG].ThreadDeinit = NULL;
     tmm_modules[TMM_DECODEERFDAG].cap_flags = 0;
-    tmm_modules[TMM_DECODEERFDAG].flags = TM_FLAG_DECODE_TM;
 }
 
 TmEcode
@@ -156,7 +155,6 @@ TmModuleDecodeErfDagRegister(void)
     tmm_modules[TMM_DECODEERFDAG].ThreadExitPrintStats = NULL;
     tmm_modules[TMM_DECODEERFDAG].ThreadDeinit = DecodeErfDagThreadDeinit;
     tmm_modules[TMM_DECODEERFDAG].cap_flags = 0;
-    tmm_modules[TMM_DECODEERFDAG].flags = TM_FLAG_DECODE_TM;
 }
 
 /**

diff --git a/src/source-erf-file.c b/src/source-erf-file.c
@@ -103,7 +103,6 @@ TmModuleDecodeErfFileRegister(void)
     tmm_modules[TMM_DECODEERFFILE].ThreadExitPrintStats = NULL;
     tmm_modules[TMM_DECODEERFFILE].ThreadDeinit = DecodeErfFileThreadDeinit;
     tmm_modules[TMM_DECODEERFFILE].cap_flags = 0;
-    tmm_modules[TMM_DECODEERFFILE].flags = TM_FLAG_DECODE_TM;
 }
 
 /**

diff --git a/src/source-ipfw.c b/src/source-ipfw.c
@@ -77,7 +77,6 @@ void TmModuleDecodeIPFWRegister (void)
     tmm_modules[TMM_DECODEIPFW].ThreadExitPrintStats = NULL;
     tmm_modules[TMM_DECODEIPFW].ThreadDeinit = NULL;
     tmm_modules[TMM_DECODEIPFW].cap_flags = 0;
-    tmm_modules[TMM_DECODEIPFW].flags = TM_FLAG_DECODE_TM;
 }
 
 TmEcode NoIPFWSupportExit(ThreadVars *tv, const void *initdata, void **data)
@@ -190,7 +189,6 @@ void TmModuleDecodeIPFWRegister (void)
     tmm_modules[TMM_DECODEIPFW].Func = DecodeIPFW;
     tmm_modules[TMM_DECODEIPFW].ThreadExitPrintStats = NULL;
     tmm_modules[TMM_DECODEIPFW].ThreadDeinit = DecodeIPFWThreadDeinit;
-    tmm_modules[TMM_DECODEIPFW].flags = TM_FLAG_DECODE_TM;
 }
 
 static inline void IPFWMutexInit(IPFWQueueVars *nq)

diff --git a/src/source-netmap.c b/src/source-netmap.c
@@ -85,7 +85,6 @@ void TmModuleDecodeNetmapRegister (void)
 {
     tmm_modules[TMM_DECODENETMAP].name = "DecodeNetmap";
     tmm_modules[TMM_DECODENETMAP].ThreadInit = NoNetmapSupportExit;
-    tmm_modules[TMM_DECODENETMAP].flags = TM_FLAG_DECODE_TM;
 }
 
 #else /* We have NETMAP support */
@@ -985,7 +984,6 @@ void TmModuleDecodeNetmapRegister(void)
     tmm_modules[TMM_DECODENETMAP].Func = DecodeNetmap;
     tmm_modules[TMM_DECODENETMAP].ThreadDeinit = DecodeNetmapThreadDeinit;
     tmm_modules[TMM_DECODENETMAP].cap_flags = 0;
-    tmm_modules[TMM_DECODENETMAP].flags = TM_FLAG_DECODE_TM;
 }
 
 #endif /* HAVE_NETMAP */

diff --git a/src/source-nflog.c b/src/source-nflog.c
@@ -135,7 +135,6 @@ void TmModuleDecodeNFLOGRegister (void)
     tmm_modules[TMM_DECODENFLOG].Func = DecodeNFLOG;
     tmm_modules[TMM_DECODENFLOG].ThreadExitPrintStats = NULL;
     tmm_modules[TMM_DECODENFLOG].ThreadDeinit = DecodeNFLOGThreadDeinit;
-    tmm_modules[TMM_DECODENFLOG].flags = TM_FLAG_DECODE_TM;
 }
 
 /**

diff --git a/src/source-windivert.c b/src/source-windivert.c
@@ -75,7 +75,6 @@ void TmModuleDecodeWinDivertRegister(void)
 {
     tmm_modules[TMM_DECODEWINDIVERT].name = "DecodeWinDivert";
     tmm_modules[TMM_DECODEWINDIVERT].ThreadInit = NoWinDivertSupportExit;
-    tmm_modules[TMM_DECODEWINDIVERT].flags = TM_FLAG_DECODE_TM;
 }
 
 TmEcode NoWinDivertSupportExit(ThreadVars *tv, const void *initdata,
@@ -392,7 +391,6 @@ void TmModuleDecodeWinDivertRegister(void)
     tm_ptr->ThreadInit = DecodeWinDivertThreadInit;
     tm_ptr->Func = DecodeWinDivert;
     tm_ptr->ThreadDeinit = DecodeWinDivertThreadDeinit;
-    tm_ptr->flags = TM_FLAG_DECODE_TM;
 }
 
 /**

diff --git a/src/tm-modules.h b/src/tm-modules.h
@@ -30,7 +30,7 @@
 
 /* thread flags */
 #define TM_FLAG_RECEIVE_TM      0x01
-#define TM_FLAG_DECODE_TM       0x02
+//
 #define TM_FLAG_STREAM_TM       0x04
 #define TM_FLAG_DETECT_TM       0x08
 #define TM_FLAG_MANAGEMENT_TM   0x10