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

Timestamp:

2022-09-22T09:01:32Z (3 years 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/connection.c (modified) (2 diffs)

uspace/srv/audio/hound/connection.c

@@ -61 +61 @@
                 conn->source = source;
                 list_append(&conn->source_link, &source->connections);
+                fibril_mutex_lock(&sink->lock);
                 list_append(&conn->sink_link, &sink->connections);
+                fibril_mutex_unlock(&sink->lock);
                 audio_sink_set_format(sink, audio_source_format(source));
                 if (source->connection_change)
@@ -83 +85 @@
         assert(!link_in_use(&connection->hound_link));
         list_remove(&connection->source_link);
+        fibril_mutex_lock(&connection->sink->lock);
         list_remove(&connection->sink_link);
+        fibril_mutex_unlock(&connection->sink->lock);
         if (connection->sink && connection->sink->connection_change)
                 connection->sink->connection_change(connection->sink, false);