diff options
author | Lennart Poettering <lennart@poettering.net> | 2007-09-04 02:25:44 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2007-09-04 02:25:44 +0000 |
commit | d1927c7f37ad4481b54469b963bf783c208afb72 (patch) | |
tree | 719d67c43ab086e0c1f7b5f3765fd695ada1a7d7 | |
parent | 65ac0ea99aa340aa1afd38277186443c5c5eb4eb (diff) |
initialize libltdl for multi-thread support
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1763 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r-- | src/daemon/main.c | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 77487dc2..b754ee73 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -81,6 +81,9 @@ #include <pulsecore/rtsig.h> #include <pulsecore/rtclock.h> #include <pulsecore/macro.h> +#include <pulsecore/mutex.h> +#include <pulsecore/thread.h> +#include <pulsecore/once.h> #include "cmdline.h" #include "cpulimit.h" @@ -311,6 +314,39 @@ static void set_all_rlimits(const pa_daemon_conf *conf) { } #endif +static pa_mutex *libtool_mutex = NULL; + +static void libtool_lock(void) { + pa_mutex_lock(libtool_mutex); +} + +static void libtool_unlock(void) { + pa_mutex_unlock(libtool_mutex); +} + +PA_STATIC_TLS_DECLARE(libtool_tls, NULL); + +static void libtool_set_error(const char * error) { + pa_tls_set(PA_STATIC_TLS_GET(libtool_tls), (char*) error); +} + +static const char *libtool_get_error(void) { + return pa_tls_get(PA_STATIC_TLS_GET(libtool_tls)); +} + +static void libtool_init(void) { + pa_assert_se(libtool_mutex = pa_mutex_new(1)); + libtool_lock(); /* Hmm, somehow libtool expects this mutex to be initialized in locking state! */ + pa_assert_se(lt_dlmutex_register(libtool_lock, libtool_unlock, libtool_set_error, libtool_get_error) == 0); + pa_assert_se(lt_dlinit() == 0); +} + +static void libtool_done(void) { + pa_assert_se(lt_dlexit() == 0); + pa_mutex_free(libtool_mutex); + libtool_mutex = NULL; +} + int main(int argc, char *argv[]) { pa_core *c = NULL; pa_strbuf *buf = NULL; @@ -365,7 +401,7 @@ int main(int argc, char *argv[]) { LTDL_SET_PRELOADED_SYMBOLS(); - pa_assert_se(lt_dlinit() == 0); + libtool_init(); #ifdef OS_IS_WIN32 { @@ -714,7 +750,7 @@ finish: WSACleanup(); #endif - lt_dlexit(); + libtool_done(); return retval; } |