stats: turn sync macros into functions

2 years ago · 74bc27ecd5
parent 3107a4953d
commit 74bc27ecd5
2 changed files with 14 additions and 10 deletions
--- 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
--- 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,