diff options
| author | Mark H Weaver <mhw@netris.org> | 2013-02-28 17:56:58 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2013-03-05 16:04:55 -0500 |
| commit | f57ea23ac8e1436f37ceeda3ea8625243c20e645 (patch) | |
| tree | 9770b54992f625abae89964d8b6efea62d09dea6 /libguile/strports.c | |
| parent | 29ace173b170a5d77e6becb30fb1d9f253a373d5 (diff) | |
| download | guile-f57ea23ac8e1436f37ceeda3ea8625243c20e645.tar.gz | |
Fix thread-unsafe lazy initializations.
* libguile/debug.c (scm_local_eval):
libguile/ports.c (scm_current_warning_port):
libguile/strports.c (scm_eval_string_in_module): Perform
lazy-initialization while holding a mutex. Use SCM_UNDEFINED as the
uninitialized value. Use 'scm_c_*_variable'.
* doc/ref/api-modules.texi (Accessing Modules from C): Fix
'my_eval_string' example to be thread-safe.
Diffstat (limited to 'libguile/strports.c')
| -rw-r--r-- | libguile/strports.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libguile/strports.c b/libguile/strports.c index 14cc93f81..d1b293c21 100644 --- a/libguile/strports.c +++ b/libguile/strports.c @@ -534,13 +534,16 @@ SCM_DEFINE (scm_eval_string_in_module, "eval-string", 1, 1, 0, "procedure returns.") #define FUNC_NAME s_scm_eval_string_in_module { - static SCM eval_string = SCM_BOOL_F, k_module = SCM_BOOL_F; + static SCM eval_string = SCM_UNDEFINED, k_module = SCM_UNDEFINED; + static scm_i_pthread_mutex_t init_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER; - if (scm_is_false (eval_string)) + scm_i_scm_pthread_mutex_lock (&init_mutex); + if (SCM_UNBNDP (eval_string)) { - eval_string = scm_c_public_lookup ("ice-9 eval-string", "eval-string"); + eval_string = scm_c_public_variable ("ice-9 eval-string", "eval-string"); k_module = scm_from_locale_keyword ("module"); } + scm_i_pthread_mutex_unlock (&init_mutex); if (SCM_UNBNDP (module)) module = scm_current_module (); |