opensourcemirror
/
pipewire
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pipewire: use dlclose unless PIPEWIRE_DLCLOSE is set to false 

Always dlclose the libraries but use PIPEWIRE_DLCLOSE to override this
behaviour.

Fixes #2786
This commit is contained in:
Wim Taymans 2022-12-12 17:11:04 +01:00
parent b29200ee82
commit b5c21c1fbc
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -38,7 +38,7 @@ gdb:
$(MAKE) run DBG=gdb
valgrind:
$(MAKE) run DBG="DISABLE_RTKIT=1 valgrind --trace-children=yes"
$(MAKE) run DBG="DISABLE_RTKIT=1 PIPEWIRE_DLCLOSE=false valgrind --trace-children=yes"
test: all
ninja -C $(BUILD_ROOT) test

9
src/pipewire/pipewire.c
View File

@ -93,6 +93,7 @@ struct support {
unsigned int in_valgrind:1;
unsigned int no_color:1;
unsigned int no_config:1;
unsigned int do_dlclose:1;
};
static pthread_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER;
@ -167,7 +168,7 @@ unref_plugin(struct plugin *plugin)
if (--plugin->ref == 0) {
spa_list_remove(&plugin->link);
pw_log_debug("unloaded plugin:'%s'", plugin->filename);
if (!global_support.in_valgrind)
if (global_support.do_dlclose)
dlclose(plugin->hnd);
free(plugin->filename);
free(plugin);
@ -591,6 +592,10 @@ void pw_init(int *argc, char **argv[])
pthread_mutex_lock(&support_lock);
support->in_valgrind = RUNNING_ON_VALGRIND;
support->do_dlclose = true;
if ((str = getenv("PIPEWIRE_DLCLOSE")) != NULL)
support->do_dlclose = pw_properties_parse_bool(str);
if (getenv("NO_COLOR") != NULL)
support->no_color = true;
@ -821,6 +826,8 @@ bool pw_check_option(const char *option, const char *value)
return global_support.no_color == spa_atob(value);
else if (spa_streq(option, "no-config"))
return global_support.no_config == spa_atob(value);
else if (spa_streq(option, "do-dlclose"))
return global_support.do_dlclose == spa_atob(value);
return false;
}