From d14db5342065566c96f0606f49765652ea516fef Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Tue, 1 Jul 2025 10:30:36 -0400
Subject: [PATCH] MT#55283 use proper atomic ops

Change-Id: I7075100d7a7d1644fa74456e282cf9a414bb5324
---
 recording-daemon/metafile.c | 4 ++--
 recording-daemon/stream.c   | 4 ++--
 recording-daemon/types.h    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recording-daemon/metafile.c b/recording-daemon/metafile.c
index d2305f4b1..154490a49 100644
--- a/recording-daemon/metafile.c
+++ b/recording-daemon/metafile.c
@@ -71,8 +71,8 @@ static void meta_destroy(metafile_t *mf) {
 	//close forward socket
 	if (mf->forward_fd >= 0) {
 		dbg("call [%s%s%s] forwarded %d packets. %d failed sends.", FMT_M(mf->call_id),
-				(int )g_atomic_int_get(&mf->forward_count),
-				(int )g_atomic_int_get(&mf->forward_failed));
+				__atomic_load_n(&mf->forward_count, __ATOMIC_RELAXED),
+				__atomic_load_n(&mf->forward_failed, __ATOMIC_RELAXED));
 		close(mf->forward_fd);
 		mf->forward_fd = -1;
 	}
diff --git a/recording-daemon/stream.c b/recording-daemon/stream.c
index f6056623f..710696bce 100644
--- a/recording-daemon/stream.c
+++ b/recording-daemon/stream.c
@@ -73,9 +73,9 @@ static void stream_handler(handler_t *handler) {
 
 		if (forward_to){
 			if (forward_packet(stream->metafile,buf,ret)) // leaves buf intact
-				g_atomic_int_inc(&stream->metafile->forward_failed);
+				__atomic_add_fetch(&stream->metafile->forward_failed, 1, __ATOMIC_RELAXED);
 			else
-				g_atomic_int_inc(&stream->metafile->forward_count);
+				__atomic_add_fetch(&stream->metafile->forward_count, 1, __ATOMIC_RELAXED);
 		}
 		if (decoding_enabled)
 			packet_process(stream, buf, ret); // consumes buf
diff --git a/recording-daemon/types.h b/recording-daemon/types.h
index 82c5c0af1..54d3c66a8 100644
--- a/recording-daemon/types.h
+++ b/recording-daemon/types.h
@@ -145,8 +145,8 @@ struct metafile_s {
 	output_t *mix_out;
 
 	int forward_fd;
-	volatile gint forward_count;
-	volatile gint forward_failed;
+	int forward_count;
+	int forward_failed;
 
 	pthread_mutex_t payloads_lock;
 	char *payload_types[128];