From: Victor Julien <vjulien@oisf.net>
Date: Wed, 22 Nov 2023 08:31:09 +0000 (+0100)
Subject: stats: turn sync macros into functions
X-Git-Tag: suricata-8.0.0-beta1~2033
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74bc27ecd5a6b5d4b862c25397486ce5e82d44e0;p=thirdparty%2Fsuricata.git

stats: turn sync macros into functions
---

diff --git a/src/counters.c b/src/counters.c
index e3ed5244cd..56332430d8 100644
--- a/src/counters.c
+++ b/src/counters.c
@@ -453,6 +453,18 @@ static void *StatsMgmtThread(void *arg)
     return NULL;
 }
 
+void StatsSyncCounters(ThreadVars *tv)
+{
+    StatsUpdateCounterArray(&tv->perf_private_ctx, &tv->perf_public_ctx);
+}
+
+void StatsSyncCountersIfSignalled(ThreadVars *tv)
+{
+    if (tv->perf_public_ctx.perf_flag == 1) {
+        StatsUpdateCounterArray(&tv->perf_private_ctx, &tv->perf_public_ctx);
+    }
+}
+
 /**
  * \brief Wake up thread.  This thread wakes up every TTS(time to sleep) seconds
  *        and sets the flag for every ThreadVars' StatsPublicThreadContext
diff --git a/src/counters.h b/src/counters.h
index b1505e750a..100fec94f7 100644
--- a/src/counters.h
+++ b/src/counters.h
@@ -135,16 +135,8 @@ uint64_t StatsGetLocalCounterValue(struct ThreadVars_ *, uint16_t);
 int StatsSetupPrivate(struct ThreadVars_ *);
 void StatsThreadCleanup(struct ThreadVars_ *);
 
-#define StatsSyncCounters(tv) \
-    StatsUpdateCounterArray(&(tv)->perf_private_ctx, &(tv)->perf_public_ctx);  \
-
-#define StatsSyncCountersIfSignalled(tv)                                       \
-    do {                                                                        \
-        if ((tv)->perf_public_ctx.perf_flag == 1) {                             \
-            StatsUpdateCounterArray(&(tv)->perf_private_ctx,                   \
-                                     &(tv)->perf_public_ctx);                   \
-        }                                                                       \
-    } while (0)
+void StatsSyncCounters(struct ThreadVars_ *tv);
+void StatsSyncCountersIfSignalled(struct ThreadVars_ *tv);
 
 #ifdef BUILD_UNIX_SOCKET
 TmEcode StatsOutputCounterSocket(json_t *cmd,