From: Victor Julien <victor@inliniac.net>
Date: Sun, 12 Apr 2020 10:02:56 +0000 (+0200)
Subject: atomics: remove useless SC_ATOMIC_DESTROY
X-Git-Tag: suricata-6.0.0-beta1~512
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6607571533e6013f51fd1b2555baca27daede86;p=thirdparty%2Fsuricata.git

atomics: remove useless SC_ATOMIC_DESTROY
---

diff --git a/src/app-layer-htp-mem.c b/src/app-layer-htp-mem.c
index ff36ca937c..e1893f1e90 100644
--- a/src/app-layer-htp-mem.c
+++ b/src/app-layer-htp-mem.c
@@ -195,13 +195,6 @@ void HTPFree(void *ptr, size_t size)
     HTPDecrMemuse((uint64_t)size);
 }
 
-void HTPDestroyMemcap(void)
-{
-    SC_ATOMIC_DESTROY(htp_config_memcap);
-    SC_ATOMIC_DESTROY(htp_memcap);
-    SC_ATOMIC_DESTROY(htp_memuse);
-}
-
 /**
  * @}
  */
diff --git a/src/app-layer-htp-mem.h b/src/app-layer-htp-mem.h
index 8c5112e1e8..414b48821a 100644
--- a/src/app-layer-htp-mem.h
+++ b/src/app-layer-htp-mem.h
@@ -22,7 +22,6 @@ void *HTPMalloc(size_t size);
 void *HTPCalloc(size_t n, size_t size);
 void *HTPRealloc(void *ptr, size_t orig_size, size_t size);
 void HTPFree(void *ptr, size_t size);
-void HTPDestroyMemcap(void);
 
 int HTPSetMemcap(uint64_t size);
 uint64_t HTPGetMemcap(void);
diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index cb10867fd4..1bf5b2fa17 100644
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -2083,7 +2083,6 @@ void HTPFreeConfig(void)
         htp_config_destroy(htprec->cfg);
         SCFree(htprec);
     }
-    HTPDestroyMemcap();
     SCReturn;
 }
 
diff --git a/src/defrag-hash.c b/src/defrag-hash.c
index 227977c57b..88a8228560 100644
--- a/src/defrag-hash.c
+++ b/src/defrag-hash.c
@@ -156,7 +156,6 @@ void DefragTrackerRelease(DefragTracker *t)
 void DefragTrackerClearMemory(DefragTracker *dt)
 {
     DefragTrackerFreeFrags(dt);
-    SC_ATOMIC_DESTROY(dt->use_cnt);
 }
 
 #define DEFRAG_DEFAULT_HASHSIZE 4096
@@ -329,12 +328,6 @@ void DefragHashShutdown(void)
     }
     (void) SC_ATOMIC_SUB(defrag_memuse, defrag_config.hash_size * sizeof(DefragTrackerHashRow));
     DefragTrackerQueueDestroy(&defragtracker_spare_q);
-
-    SC_ATOMIC_DESTROY(defragtracker_prune_idx);
-    SC_ATOMIC_DESTROY(defrag_memuse);
-    SC_ATOMIC_DESTROY(defragtracker_counter);
-    SC_ATOMIC_DESTROY(defrag_config.memcap);
-    //SC_ATOMIC_DESTROY(flow_flags);
     return;
 }
 
diff --git a/src/detect-engine-tag.c b/src/detect-engine-tag.c
index df96473573..f2ede4cee0 100644
--- a/src/detect-engine-tag.c
+++ b/src/detect-engine-tag.c
@@ -75,7 +75,6 @@ void TagDestroyCtx(void)
 #ifdef DEBUG
     BUG_ON(SC_ATOMIC_GET(num_tags) != 0);
 #endif
-    SC_ATOMIC_DESTROY(num_tags);
 }
 
 /** \brief Reset the tagging engine context
diff --git a/src/flow-util.h b/src/flow-util.h
index 33c465d005..96ed814c74 100644
--- a/src/flow-util.h
+++ b/src/flow-util.h
@@ -120,8 +120,6 @@
 
 #define FLOW_DESTROY(f) do { \
         FlowCleanupAppLayer((f)); \
-        SC_ATOMIC_DESTROY((f)->flow_state); \
-        SC_ATOMIC_DESTROY((f)->use_cnt); \
         \
         FLOWLOCK_DESTROY((f)); \
         GenericVarFree((f)->flowvar); \
diff --git a/src/flow-worker.c b/src/flow-worker.c
index 35bfe36700..c65483d715 100644
--- a/src/flow-worker.c
+++ b/src/flow-worker.c
@@ -170,7 +170,6 @@ static TmEcode FlowWorkerThreadDeinit(ThreadVars *tv, void *data)
     /* free pq */
     BUG_ON(fw->pq.len);
 
-    SC_ATOMIC_DESTROY(fw->detect_thread);
     SCFree(fw);
     return TM_ECODE_OK;
 }
diff --git a/src/flow.c b/src/flow.c
index 7f7ea6f8c0..899e4fad86 100644
--- a/src/flow.c
+++ b/src/flow.c
@@ -714,7 +714,6 @@ void FlowShutdown(void)
             }
 
             FBLOCK_DESTROY(&flow_hash[u]);
-            SC_ATOMIC_DESTROY(flow_hash[u].next_ts);
         }
         SCFreeAligned(flow_hash);
         flow_hash = NULL;
@@ -722,11 +721,6 @@ void FlowShutdown(void)
     (void) SC_ATOMIC_SUB(flow_memuse, flow_config.hash_size * sizeof(FlowBucket));
     FlowQueueDestroy(&flow_spare_q);
     FlowQueueDestroy(&flow_recycle_q);
-
-    SC_ATOMIC_DESTROY(flow_config.memcap);
-    SC_ATOMIC_DESTROY(flow_prune_idx);
-    SC_ATOMIC_DESTROY(flow_memuse);
-    SC_ATOMIC_DESTROY(flow_flags);
     return;
 }
 
diff --git a/src/host.c b/src/host.c
index 6b294a8e67..efbc1528aa 100644
--- a/src/host.c
+++ b/src/host.c
@@ -132,8 +132,6 @@ void HostFree(Host *h)
 {
     if (h != NULL) {
         HostClearMemory(h);
-
-        SC_ATOMIC_DESTROY(h->use_cnt);
         SCMutexDestroy(&h->m);
         SCFree(h);
         (void) SC_ATOMIC_SUB(host_memuse, g_host_size);
@@ -334,12 +332,6 @@ void HostShutdown(void)
     }
     (void) SC_ATOMIC_SUB(host_memuse, host_config.hash_size * sizeof(HostHashRow));
     HostQueueDestroy(&host_spare_q);
-
-    SC_ATOMIC_DESTROY(host_prune_idx);
-    SC_ATOMIC_DESTROY(host_memuse);
-    SC_ATOMIC_DESTROY(host_counter);
-    SC_ATOMIC_DESTROY(host_config.memcap);
-    //SC_ATOMIC_DESTROY(flow_flags);
     return;
 }
 
diff --git a/src/ippair.c b/src/ippair.c
index 0af92d2692..900cb2fb85 100644
--- a/src/ippair.c
+++ b/src/ippair.c
@@ -131,8 +131,6 @@ void IPPairFree(IPPair *h)
 {
     if (h != NULL) {
         IPPairClearMemory(h);
-
-        SC_ATOMIC_DESTROY(h->use_cnt);
         SCMutexDestroy(&h->m);
         SCFree(h);
         (void) SC_ATOMIC_SUB(ippair_memuse, g_ippair_size);
@@ -329,12 +327,6 @@ void IPPairShutdown(void)
     }
     (void) SC_ATOMIC_SUB(ippair_memuse, ippair_config.hash_size * sizeof(IPPairHashRow));
     IPPairQueueDestroy(&ippair_spare_q);
-
-    SC_ATOMIC_DESTROY(ippair_prune_idx);
-    SC_ATOMIC_DESTROY(ippair_memuse);
-    SC_ATOMIC_DESTROY(ippair_counter);
-    SC_ATOMIC_DESTROY(ippair_config.memcap);
-    //SC_ATOMIC_DESTROY(flow_flags);
     return;
 }
 
diff --git a/src/source-af-packet.c b/src/source-af-packet.c
index e64af60b81..c380661558 100644
--- a/src/source-af-packet.c
+++ b/src/source-af-packet.c
@@ -384,9 +384,6 @@ static void AFPPeerClean(AFPPeer *peer)
 {
     if (peer->flags & AFP_SOCK_PROTECT)
         SCMutexDestroy(&peer->sock_protect);
-    SC_ATOMIC_DESTROY(peer->socket);
-    SC_ATOMIC_DESTROY(peer->if_idx);
-    SC_ATOMIC_DESTROY(peer->state);
     SCFree(peer);
 }
 
diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 51fe213c7b..ec3b7fa896 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -668,9 +668,6 @@ void StreamTcpInitConfig(char quiet)
 
 void StreamTcpFreeConfig(char quiet)
 {
-    SC_ATOMIC_DESTROY(stream_config.memcap);
-    SC_ATOMIC_DESTROY(stream_config.reassembly_memcap);
-
     StreamTcpReassembleFree(quiet);
 
     SCMutexLock(&ssn_pool_mutex);
diff --git a/src/suricata.c b/src/suricata.c
index 84e3b83406..bb92e2cf6c 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -371,8 +371,6 @@ static void GlobalsDestroy(SCInstance *suri)
     NFQContextsClean();
 #endif
 
-    SC_ATOMIC_DESTROY(engine_stage);
-
 #ifdef BUILD_HYPERSCAN
     MpmHSGlobalCleanup();
 #endif
diff --git a/src/tmqh-packetpool.c b/src/tmqh-packetpool.c
index cea1212197..b8b9630223 100644
--- a/src/tmqh-packetpool.c
+++ b/src/tmqh-packetpool.c
@@ -433,8 +433,6 @@ void PacketPoolDestroy(void)
         PacketFree(p);
     }
 
-    SC_ATOMIC_DESTROY(my_pool->return_stack.sync_now);
-
 #ifdef DEBUG_VALIDATION
     my_pool->initialized = 0;
     my_pool->destroyed = 1;
diff --git a/src/util-atomic.h b/src/util-atomic.h
index 3424d04f01..ba38ffc1b1 100644
--- a/src/util-atomic.h
+++ b/src/util-atomic.h
@@ -178,11 +178,6 @@
 #define SC_ATOMIC_RESET(name) \
     (name ## _sc_atomic__) = 0
 
-/**
- *  \brief No-op.
- */
-#define SC_ATOMIC_DESTROY(name)
-
 /**
  *  \brief add a value to our atomic variable
  *
diff --git a/src/util-device.c b/src/util-device.c
index 4c0779ea63..67f47a7934 100644
--- a/src/util-device.c
+++ b/src/util-device.c
@@ -364,9 +364,6 @@ int LiveDeviceListClean()
 
         if (pd->dev)
             SCFree(pd->dev);
-        SC_ATOMIC_DESTROY(pd->pkts);
-        SC_ATOMIC_DESTROY(pd->drop);
-        SC_ATOMIC_DESTROY(pd->invalid_checksums);
         LiveDevFreeStorage(pd);
         SCFree(pd);
     }
diff --git a/src/util-thash.c b/src/util-thash.c
index cdce4edbd4..abe6131c7e 100644
--- a/src/util-thash.c
+++ b/src/util-thash.c
@@ -189,8 +189,6 @@ static void THashDataFree(THashTableContext *ctx, THashData *h)
         if (h->data != NULL) {
             ctx->config.DataFree(h->data);
         }
-
-        SC_ATOMIC_DESTROY(h->use_cnt);
         SCMutexDestroy(&h->m);
         SCFree(h);
         (void) SC_ATOMIC_SUB(ctx->memuse, THASH_DATA_SIZE(ctx));
@@ -352,11 +350,6 @@ void THashShutdown(THashTableContext *ctx)
     }
     (void) SC_ATOMIC_SUB(ctx->memuse, ctx->config.hash_size * sizeof(THashHashRow));
     THashDataQueueDestroy(&ctx->spare_q);
-
-    SC_ATOMIC_DESTROY(ctx->prune_idx);
-    SC_ATOMIC_DESTROY(ctx->memuse);
-    SC_ATOMIC_DESTROY(ctx->counter);
-
     SCFree(ctx);
     return;
 }