Misc fixes 20250103

src/flow-worker.c

@@ -556,7 +556,7 @@ static TmEcode FlowWorker(ThreadVars *tv, Packet *p, void *data)
 
     /* update time */
     if (!(PKT_IS_PSEUDOPKT(p))) {
-        TimeSetByThread(tv->id, p->ts);
+        TimeSetByThread(tv, p->ts);
     }
 
     /* handle Flow */

src/threadvars.h

@@ -63,6 +63,11 @@ typedef struct ThreadVars_ {
      *  void pointers in and out. */
     void *(*tm_func)(void *);
 
+    SCTime_t pktts;         /**< current packet time of this thread
+                             *   (offline mode) */
+    SCTime_t sys_sec_stamp; /**< timestamp in real system
+                             *   time when the pktts was last updated. */
+
     char name[16];
     char *printable_name;
     char *thread_group_name;
@@ -139,6 +144,8 @@ typedef struct ThreadVars_ {
     Storage storage[];
 } ThreadVars;
 
+void TimeSetByThread(ThreadVars *thread_v, SCTime_t tv);
+
 /** Thread setup flags: */
 #define THREAD_SET_AFFINITY     0x01 /** CPU/Core affinity */
 #define THREAD_SET_PRIORITY     0x02 /** Real time priority */

src/tm-threads.c

@@ -2070,10 +2070,6 @@ typedef struct Thread_ {
     int type;
     int in_use;         /**< bool to indicate this is in use */
 
-    SCTime_t pktts;         /**< current packet time of this thread
-                             *   (offline mode) */
-    SCTime_t sys_sec_stamp; /**< timestamp in real system
-                             *   time when the pktts was last updated. */
 } Thread;
 
 typedef struct Threads_ {
@@ -2185,30 +2181,21 @@ void TmThreadsUnregisterThread(const int id)
     SCMutexUnlock(&thread_store_lock);
 }
 
-void TmThreadsSetThreadTimestamp(const int id, const SCTime_t ts)
+void TmThreadsSetThreadTimestamp(ThreadVars *thread_v, const SCTime_t ts)
 {
-    SCMutexLock(&thread_store_lock);
-    if (unlikely(id <= 0 || id > (int)thread_store.threads_size)) {
-        SCMutexUnlock(&thread_store_lock);
-        return;
-    }
-
-    int idx = id - 1;
-    Thread *t = &thread_store.threads[idx];
-    t->pktts = ts;
+    thread_v->pktts = ts;
     SCTime_t now = SCTimeGetTime();
 
 #ifdef DEBUG
-    if (t->sys_sec_stamp.secs != 0) {
-        SCTime_t tmpts = SCTIME_ADD_SECS(t->sys_sec_stamp, 3);
+    if (thread_v->sys_sec_stamp.secs != 0) {
+        SCTime_t tmpts = SCTIME_ADD_SECS(thread_v->sys_sec_stamp, 3);
         if (SCTIME_CMP_LT(tmpts, now)) {
             SCLogDebug("%s: thread slept for %u secs", t->name, (uint32_t)(now.secs - tmpts.secs));
         }
     }
 #endif
 
-    t->sys_sec_stamp = now;
-    SCMutexUnlock(&thread_store_lock);
+    thread_v->sys_sec_stamp = now;
 }
 
 bool TmThreadsTimeSubsysIsReady(void)
@@ -2222,7 +2209,7 @@ bool TmThreadsTimeSubsysIsReady(void)
             break;
         if (t->type != TVT_PPT)
             continue;
-        if (SCTIME_CMP_EQ(t->sys_sec_stamp, nullts)) {
+        if (SCTIME_CMP_EQ(t->tv->sys_sec_stamp, nullts)) {
             ready = false;
             break;
         }
@@ -2241,8 +2228,8 @@ void TmThreadsInitThreadsTimestamp(const SCTime_t ts)
             break;
         if (t->type != TVT_PPT)
             continue;
-        t->pktts = ts;
-        t->sys_sec_stamp = now;
+        t->tv->pktts = ts;
+        t->tv->sys_sec_stamp = now;
     }
     SCMutexUnlock(&thread_store_lock);
 }
@@ -2263,18 +2250,18 @@ void TmThreadsGetMinimalTimestamp(struct timeval *ts)
         /* only packet threads set timestamps based on packets */
         if (t->type != TVT_PPT)
             continue;
-        if (SCTIME_CMP_NEQ(t->pktts, nullts)) {
-            SCTime_t sys_sec_stamp = SCTIME_ADD_SECS(t->sys_sec_stamp, 1);
+        if (SCTIME_CMP_NEQ(t->tv->pktts, nullts)) {
+            SCTime_t sys_sec_stamp = SCTIME_ADD_SECS(t->tv->sys_sec_stamp, 1);
             /* ignore sleeping threads */
             if (SCTIME_CMP_LT(sys_sec_stamp, now))
                 continue;
 
             if (!set) {
-                SCTIME_TO_TIMEVAL(&local, t->pktts);
+                SCTIME_TO_TIMEVAL(&local, t->tv->pktts);
                 set = true;
             } else {
-                if (SCTIME_CMP_LT(t->pktts, SCTIME_FROM_TIMEVAL(&local))) {
-                    SCTIME_TO_TIMEVAL(&local, t->pktts);
+                if (SCTIME_CMP_LT(t->tv->pktts, SCTIME_FROM_TIMEVAL(&local))) {
+                    SCTIME_TO_TIMEVAL(&local, t->tv->pktts);
                 }
             }
         }
@@ -2324,3 +2311,11 @@ void TmThreadsInjectFlowById(Flow *f, const int id)
         TmThreadsCaptureBreakLoop(tv);
     }
 }
+
+void TimeSetByThread(ThreadVars *thread_v, SCTime_t tv)
+{
+    if (TimeModeIsLive())
+        return;
+
+    TmThreadsSetThreadTimestamp(thread_v, tv);
+}

src/tm-threads.h

@@ -282,7 +282,7 @@ void TmThreadsUnregisterThread(const int id);
 void TmThreadsInjectFlowById(Flow *f, const int id);
 
 void TmThreadsInitThreadsTimestamp(const SCTime_t ts);
-void TmThreadsSetThreadTimestamp(const int id, const SCTime_t ts);
+void TmThreadsSetThreadTimestamp(ThreadVars *thread_v, const SCTime_t ts);
 void TmThreadsGetMinimalTimestamp(struct timeval *ts);
 uint16_t TmThreadsGetWorkerThreadMax(void);
 bool TmThreadsTimeSubsysIsReady(void);

src/util-hash.c

@@ -148,16 +148,19 @@ int HashTableRemove(HashTable *ht, void *data, uint16_t datalen)
     }
 
     if (ht->array[hash]->next == NULL) {
-        if (ht->Free != NULL)
-            ht->Free(ht->array[hash]->data);
-        SCFree(ht->array[hash]);
-        ht->array[hash] = NULL;
-        return 0;
+        if (ht->Compare(ht->array[hash]->data, ht->array[hash]->size, data, datalen) == 1) {
+            if (ht->Free != NULL)
+                ht->Free(ht->array[hash]->data);
+            SCFree(ht->array[hash]);
+            ht->array[hash] = NULL;
+            return 0;
+        }
+        return -1;
     }
 
     HashTableBucket *hashbucket = ht->array[hash], *prev_hashbucket = NULL;
     do {
-        if (ht->Compare(hashbucket->data,hashbucket->size,data,datalen) == 1) {
+        if (ht->Compare(hashbucket->data, hashbucket->size, data, datalen) == 1) {
             if (prev_hashbucket == NULL) {
                 /* root bucket */
                 ht->array[hash] = hashbucket->next;

src/util-time.c

@@ -113,14 +113,6 @@ bool TimeModeIsLive(void)
     return live_time_tracking;
 }
 
-void TimeSetByThread(const int thread_id, SCTime_t tv)
-{
-    if (live_time_tracking)
-        return;
-
-    TmThreadsSetThreadTimestamp(thread_id, tv);
-}
-
 #ifdef UNITTESTS
 void TimeSet(SCTime_t ts)
 {

src/util-time.h

@@ -117,7 +117,6 @@ static inline SCTime_t SCTimeGetTime(void)
 void TimeInit(void);
 void TimeDeinit(void);
 
-void TimeSetByThread(const int thread_id, SCTime_t tv);
 SCTime_t TimeGet(void);
 
 /** \brief initialize a 'struct timespec' from a 'struct timeval'. */