Changeset 2fbd49c in mainline for uspace/srv/audio/hound/audio_sink.c

Timestamp:

2022-09-22T09:01:32Z (19 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2139676

Parents:

a76e76b

git-author:

Jiri Svoboda <jiri@…> (2022-09-21 18:01:20)

git-committer:

Jiri Svoboda <jiri@…> (2022-09-22 09:01:32)

Message:

Audio synk needs locking

Without locking the list of sink connections, we are exposed
to a race between removing a connection at the end of playback
(typically while destroying a hound context) and audio device
event PCM_EVENT_FRAMES_PLAYED which causes audio mixing to occur
via audio_sink_mix_inputs(), causing hound to crash often at
the end of playback.

File:

• uspace/srv/audio/hound/audio_sink.c (modified) (4 diffs)

uspace/srv/audio/hound/audio_sink.c

@@ -36 +36 @@
 #include <assert.h>
 #include <errno.h>
+#include <fibril_synch.h>
 #include <stdlib.h>
 #include <str.h>
@@ -64 +65 @@
                 return EINVAL;
         link_initialize(&sink->link);
+        fibril_mutex_initialize(&sink->lock);
         list_initialize(&sink->connections);
         sink->name = str_dup(name);
@@ -139 +141 @@
 
         pcm_format_silence(dest, size, &sink->format);
+        fibril_mutex_lock(&sink->lock);
         list_foreach(sink->connections, sink_link, connection_t, conn) {
                 const errno_t ret = connection_add_source_data(
@@ -147 +150 @@
                 }
         }
+        fibril_mutex_unlock(&sink->lock);
 }