colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m-lua-scripting: do stop the lua engine on deactivate()

Browse Source 
deactivate() is normally called from WpCore's dispose() and
that's too late to convert a weak WpCore ref to a strong one,
so we cannot find the WpConfiguration and remove the engine.
So, keep a reference to the WpConfiguration earlier.

If the engine is not stopped on time, proxies on the export_core
are destroyed after their core and pipewire complains
This commit is contained in:
George Kiagiadakis
2021-01-20 16:38:40 +02:00
parent c0f13fe0f6
commit 38f65ca960
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/module-lua-scripting.c
View File

@@ -25,6 +25,8 @@ struct _WpLuaScriptingPlugin
/* data */ /* data */
WpCore *export_core; WpCore *export_core;
gchar *config_ext; gchar *config_ext;
WpConfiguration *config;
}; };
enum { enum {
@@ -106,9 +108,10 @@ wp_lua_scripting_plugin_activate (WpPlugin * plugin)
{ {
WpLuaScriptingPlugin * self = WP_LUA_SCRIPTING_PLUGIN (plugin); WpLuaScriptingPlugin * self = WP_LUA_SCRIPTING_PLUGIN (plugin);
g_autoptr (WpCore) core = wp_plugin_get_core (plugin); g_autoptr (WpCore) core = wp_plugin_get_core (plugin);
g_autoptr (WpConfiguration) config = wp_configuration_get_instance (core);
g_autoptr (WpConfigParser) engine = NULL; g_autoptr (WpConfigParser) engine = NULL;
self->config = wp_configuration_get_instance (core);
/* initialize secondary connection to pipewire */ /* initialize secondary connection to pipewire */
self->export_core = wp_core_clone (core); self->export_core = wp_core_clone (core);
wp_core_update_properties (self->export_core, wp_properties_new ( wp_core_update_properties (self->export_core, wp_properties_new (
@@ -121,26 +124,24 @@ wp_lua_scripting_plugin_activate (WpPlugin * plugin)
/* load the lua scripts & execute them via the engine */ /* load the lua scripts & execute them via the engine */
self->config_ext = g_strdup_printf ("%s/lua", self->profile); self->config_ext = g_strdup_printf ("%s/lua", self->profile);
wp_configuration_add_extension (config, self->config_ext, wp_configuration_add_extension (self->config, self->config_ext,
WP_TYPE_LUA_SCRIPTING_ENGINE); WP_TYPE_LUA_SCRIPTING_ENGINE);
engine = wp_configuration_get_parser (config, self->config_ext); engine = wp_configuration_get_parser (self->config, self->config_ext);
g_signal_connect (engine, "init-lua-context", g_signal_connect_object (engine, "init-lua-context",
G_CALLBACK (wp_lua_scripting_plugin_init_lua_ctx), plugin); G_CALLBACK (wp_lua_scripting_plugin_init_lua_ctx), self, 0);
wp_configuration_reload (config, self->config_ext); wp_configuration_reload (self->config, self->config_ext);
} }
static void static void
wp_lua_scripting_plugin_deactivate (WpPlugin * plugin) wp_lua_scripting_plugin_deactivate (WpPlugin * plugin)
{ {
WpLuaScriptingPlugin * self = WP_LUA_SCRIPTING_PLUGIN (plugin); WpLuaScriptingPlugin * self = WP_LUA_SCRIPTING_PLUGIN (plugin);
g_autoptr (WpCore) core = wp_plugin_get_core (plugin);
if (core) { if (self->config && self->config_ext)
g_autoptr (WpConfiguration) config = wp_configuration_get_instance (core); wp_configuration_remove_extension (self->config, self->config_ext);
wp_configuration_remove_extension (config, self->config_ext); g_clear_object (&self->config);
}
g_clear_pointer (&self->config_ext, g_free); g_clear_pointer (&self->config_ext, g_free);
g_clear_object (&self->export_core); g_clear_object (&self->export_core);
} }