Destroy PCM controller IO watch upon PCM release

src/ba-transport-pcm.c

@@ -1,6 +1,6 @@
 /*
  * BlueALSA - ba-transport-pcm.c
- * Copyright (c) 2016-2023 Arkadiusz Bokowy
+ * Copyright (c) 2016-2024 Arkadiusz Bokowy
  *
  * This file is a part of bluez-alsa.
  *
@@ -437,19 +437,22 @@ void ba_transport_pcm_stop(
 int ba_transport_pcm_release(struct ba_transport_pcm *pcm) {
 
 #if DEBUG
-	if (pcm->t->profile != BA_TRANSPORT_PROFILE_NONE)
-		/* assert that we were called with the lock held */
-		g_assert_cmpint(pthread_mutex_trylock(&pcm->mutex), !=, 0);
+	/* assert that we were called with the lock held */
+	g_assert_cmpint(pthread_mutex_trylock(&pcm->mutex), !=, 0);
 #endif
 
-	if (pcm->fd == -1)
-		goto final;
+	if (pcm->fd != -1) {
+		debug("Closing PCM: %d", pcm->fd);
+		close(pcm->fd);
+		pcm->fd = -1;
+	}
 
-	debug("Closing PCM: %d", pcm->fd);
-	close(pcm->fd);
-	pcm->fd = -1;
+	if (pcm->controller != NULL) {
+		g_source_destroy(pcm->controller);
+		g_source_unref(pcm->controller);
+		pcm->controller = NULL;
+	}
 
-final:
 	return 0;
 }
 

src/ba-transport-pcm.h

@@ -1,6 +1,6 @@
 /*
  * BlueALSA - ba-transport-pcm.h
- * Copyright (c) 2016-2023 Arkadiusz Bokowy
+ * Copyright (c) 2016-2024 Arkadiusz Bokowy
  *
  * This file is a part of bluez-alsa.
  *
@@ -133,6 +133,9 @@ struct ba_transport_pcm {
 	/* new PCM client mutex */
 	pthread_mutex_t client_mtx;
 
+	/* source watch for controller socket */
+	GSource *controller;
+
 	/* actual thread ID */
 	pthread_t tid;
 

src/bluealsa-dbus.c

@@ -1,6 +1,6 @@
 /*
  * BlueALSA - bluealsa-dbus.c
- * Copyright (c) 2016-2023 Arkadiusz Bokowy
+ * Copyright (c) 2016-2024 Arkadiusz Bokowy
  *
  * This file is a part of bluez-alsa.
  *
@@ -475,22 +475,24 @@ static void bluealsa_pcm_open(GDBusMethodInvocation *inv, void *userdata) {
 	}
 
 	pthread_mutex_lock(&pcm->mutex);
+
 	/* get correct PIPE endpoint - PIPE is unidirectional */
 	pcm->fd = pcm_fds[is_sink ? 0 : 1];
 	/* set newly opened PCM as active */
 	pcm->paused = false;
-	pthread_mutex_unlock(&pcm->mutex);
 
 	GIOChannel *ch = g_io_channel_unix_new(pcm_fds[2]);
 	g_io_channel_set_close_on_unref(ch, TRUE);
 	g_io_channel_set_encoding(ch, NULL, NULL);
 	g_io_channel_set_buffered(ch, FALSE);
 
-	g_io_add_watch_full(ch, G_PRIORITY_DEFAULT, G_IO_IN,
-			bluealsa_pcm_controller, ba_transport_pcm_ref(pcm),
+	pcm->controller = g_io_create_watch_full(ch, G_PRIORITY_DEFAULT,
+			G_IO_IN, bluealsa_pcm_controller, ba_transport_pcm_ref(pcm),
 			(GDestroyNotify)ba_transport_pcm_unref);
 	g_io_channel_unref(ch);
 
+	pthread_mutex_unlock(&pcm->mutex);
+
 	/* notify our audio thread that the FIFO is ready */
 	ba_transport_pcm_signal_send(pcm, BA_TRANSPORT_PCM_SIGNAL_OPEN);
 

src/utils.c

@@ -1,6 +1,6 @@
 /*
  * BlueALSA - utils.c
- * Copyright (c) 2016-2023 Arkadiusz Bokowy
+ * Copyright (c) 2016-2024 Arkadiusz Bokowy
  *
  * This file is a part of bluez-alsa.
  *
@@ -9,7 +9,10 @@
  */
 
 #include "utils.h"
-/* IWYU pragma: no_include "config.h" */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <ctype.h>
 #include <stdbool.h>
@@ -95,6 +98,25 @@ bool g_variant_validate_value(GVariant *value, const GVariantType *type,
 	return false;
 }
 
+/**
+ * Create a new watch source for the given I/O channel.
+ *
+ * @param channel A pointer to the GIOChannel.
+ * @param priority The priority of the source.
+ * @param cond The condition to watch for.
+ * @param func The function to call when the condition is satisfied.
+ * @param userdata Data to pass to the function.
+ * @param notify Function to call when the source is destroyed.
+ * @return New watch source. */
+GSource *g_io_create_watch_full(GIOChannel *channel, int priority,
+		GIOCondition cond, GIOFunc func, void *userdata, GDestroyNotify notify) {
+	GSource *watch = g_io_create_watch(channel, cond);
+	g_source_set_callback(watch, G_SOURCE_FUNC(func), userdata, notify);
+	g_source_set_priority(watch, priority);
+	g_source_attach(watch, NULL);
+	return watch;
+}
+
 /**
  * Convert a pointer to BT address to a hash value.
  *

src/utils.h

@@ -30,6 +30,9 @@ char *g_variant_sanitize_object_path(char *path);
 bool g_variant_validate_value(GVariant *value, const GVariantType *type,
 		const char *name);
 
+GSource *g_io_create_watch_full(GIOChannel *channel, int priority,
+		GIOCondition cond, GIOFunc func, void *userdata, GDestroyNotify notify);
+
 unsigned int g_bdaddr_hash(const void *v);
 gboolean g_bdaddr_equal(const void *v1, const void *v2);
 

test/test-io.c

@@ -261,7 +261,7 @@ static void *pcm_write_frames_sndfile_async(void *userdata) {
 	};
 
 	if (aging_duration == 0) {
-		/* If we are not performign aging test, close the PCM right
+		/* If we are not performing aging test, close the PCM right
 		 * away. The reading loop will not wait for timeout. */
 		pthread_mutex_lock(&pcm->mutex);
 		ba_transport_pcm_release(pcm);
@@ -329,7 +329,7 @@ static void pcm_write_frames(struct ba_transport_pcm *pcm, size_t frames) {
 	}
 
 	if (aging_duration == 0) {
-		/* If we are not performign aging test, close the PCM right
+		/* If we are not performing aging test, close the PCM right
 		 * away. The reading loop will not wait for timeout. */
 		pthread_mutex_lock(&pcm->mutex);
 		ba_transport_pcm_release(pcm);