From 639e6ea644e15485f4cfd8a954b7297d48a3099a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 21 Apr 2021 13:17:28 +0200
Subject: [PATCH] pulse-server: use the work-queue to unload modules

This avoids allocating an eventfd for each module.
---
 src/modules/module-protocol-pulse/module.c | 12 +++++-------
 src/modules/module-protocol-pulse/module.h |  1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/modules/module-protocol-pulse/module.c b/src/modules/module-protocol-pulse/module.c
index 5b57c1288..22e5afc22 100644
--- a/src/modules/module-protocol-pulse/module.c
+++ b/src/modules/module-protocol-pulse/module.c
@@ -27,16 +27,16 @@
 
 static int module_unload(struct client *client, struct module *module);
 
-static void on_module_unload(void *data, uint64_t count)
+static void on_module_unload(void *obj, void *data, int res, uint32_t id)
 {
-	struct module *module = data;
-
+	struct module *module = obj;
 	module_unload(NULL, module);
 }
 
 void module_schedule_unload(struct module *module)
 {
-	pw_loop_signal_event(module->impl->loop, module->unload);
+	struct impl *impl = module->impl;
+	pw_work_queue_add(impl->work_queue, module, 0, on_module_unload, impl);
 }
 
 struct module *module_new(struct impl *impl, const struct module_methods *methods, size_t user_data)
@@ -50,7 +50,6 @@ struct module *module_new(struct impl *impl, const struct module_methods *method
 	module->impl = impl;
 	module->methods = methods;
 	spa_hook_list_init(&module->hooks);
-	module->unload = pw_loop_add_event(impl->loop, on_module_unload, module);
 	module->user_data = SPA_MEMBER(module, sizeof(struct module), void);
 
 	return module;
@@ -79,12 +78,11 @@ static void module_free(struct module *module)
 	if (module->idx != SPA_ID_INVALID)
 		pw_map_remove(&impl->modules, module->idx & INDEX_MASK);
 
+	pw_work_queue_cancel(impl->work_queue, module, SPA_ID_INVALID);
 	free((char*)module->name);
 	free((char*)module->args);
 	if (module->props)
 		pw_properties_free(module->props);
-	pw_loop_destroy_source(impl->loop, module->unload);
-
 	free(module);
 }
 
diff --git a/src/modules/module-protocol-pulse/module.h b/src/modules/module-protocol-pulse/module.h
index ad14374e9..9f993fc9d 100644
--- a/src/modules/module-protocol-pulse/module.h
+++ b/src/modules/module-protocol-pulse/module.h
@@ -63,7 +63,6 @@ struct module {
 	struct impl *impl;
 	const struct module_methods *methods;
 	struct spa_hook_list hooks;
-	struct spa_source *unload;
 	void *user_data;
 };