threads: seal after setup; unseal at shutdown

The idea of sealing the thread store is that its members can be accessed
w/o holding a lock to the whole store at runtime.

diff --git a/src/runmodes.c b/src/runmodes.c
index 006199bb94c6381760a1f0a83af5e832d387d4f8..cd5eed32b5184f8940b3c11ef66fdd39c0a7dda7 100644 (file)
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -436,6 +436,7 @@ void RunModeDispatch(int runmode, const char *custom_mode, const char *capture_p
             BypassedFlowManagerThreadSpawn();
         }
         StatsSpawnThreads();
+        TmThreadsSealThreads();
     }
 }
 

diff --git a/src/suricata.c b/src/suricata.c
index 12224e64b66f1872bf087a65296e08b8f196e375..7c238c48cc5e6b6d3059113d431c2f4f4b656c5c 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2258,6 +2258,8 @@ void PostRunDeinit(const int runmode, struct timeval *start_time)
     if (runmode == RUNMODE_UNIX_SOCKET)
         return;
 
+    TmThreadsUnsealThreads();
+
     /* needed by FlowWorkToDoCleanup */
     PacketPoolInit();
 

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 84ae12513e23be1d347b7c2e4e265174d6206715..42200dbd4325aed67cce1ddbda4bb9dd9b3a3d31 100644 (file)
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2022 Open Information Security Foundation
+/* Copyright (C) 2007-2024 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -2083,9 +2083,26 @@ typedef struct Threads_ {
     int threads_cnt;
 } Threads;
 
+static bool thread_store_sealed = false;
 static Threads thread_store = { NULL, 0, 0 };
 static SCMutex thread_store_lock = SCMUTEX_INITIALIZER;
 
+void TmThreadsSealThreads(void)
+{
+    SCMutexLock(&thread_store_lock);
+    DEBUG_VALIDATE_BUG_ON(thread_store_sealed);
+    thread_store_sealed = true;
+    SCMutexUnlock(&thread_store_lock);
+}
+
+void TmThreadsUnsealThreads(void)
+{
+    SCMutexLock(&thread_store_lock);
+    DEBUG_VALIDATE_BUG_ON(!thread_store_sealed);
+    thread_store_sealed = false;
+    SCMutexUnlock(&thread_store_lock);
+}
+
 void TmThreadsListThreads(void)
 {
     SCMutexLock(&thread_store_lock);
@@ -2113,6 +2130,7 @@ void TmThreadsListThreads(void)
 int TmThreadsRegisterThread(ThreadVars *tv, const int type)
 {
     SCMutexLock(&thread_store_lock);
+    DEBUG_VALIDATE_BUG_ON(thread_store_sealed);
     if (thread_store.threads == NULL) {
         thread_store.threads = SCCalloc(STEP, sizeof(Thread));
         BUG_ON(thread_store.threads == NULL);
@@ -2162,6 +2180,7 @@ int TmThreadsRegisterThread(ThreadVars *tv, const int type)
 void TmThreadsUnregisterThread(const int id)
 {
     SCMutexLock(&thread_store_lock);
+    DEBUG_VALIDATE_BUG_ON(thread_store_sealed);
     if (id <= 0 || id > (int)thread_store.threads_size) {
         SCMutexUnlock(&thread_store_lock);
         return;

diff --git a/src/tm-threads.h b/src/tm-threads.h
index 1e9d43c21871e94f2a5edc6a6842f092ba998f16..dde0f2029ee9e2a9e8c1cda00bedc2bf369f1c9b 100644 (file)
--- a/src/tm-threads.h
+++ b/src/tm-threads.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2011 Open Information Security Foundation
+/* Copyright (C) 2007-2024 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -276,6 +276,8 @@ static inline void TmThreadsCaptureBreakLoop(ThreadVars *tv)
     }
 }
 
+void TmThreadsSealThreads(void);
+void TmThreadsUnsealThreads(void);
 void TmThreadsListThreads(void);
 int TmThreadsRegisterThread(ThreadVars *tv, const int type);
 void TmThreadsUnregisterThread(const int id);