Browse Source

MT#55283 use proper atomic ops

Change-Id: I7075100d7a7d1644fa74456e282cf9a414bb5324
pull/1967/head
Richard Fuchs 5 months ago
parent
commit
d14db53420
3 changed files with 6 additions and 6 deletions
  1. +2
    -2
      recording-daemon/metafile.c
  2. +2
    -2
      recording-daemon/stream.c
  3. +2
    -2
      recording-daemon/types.h

+ 2
- 2
recording-daemon/metafile.c View File

@ -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;
}


+ 2
- 2
recording-daemon/stream.c View File

@ -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


+ 2
- 2
recording-daemon/types.h View File

@ -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];


Loading…
Cancel
Save