diff options
author | Han-Wen Nienhuys <hanwen@lilypond.org> | 2007-08-26 18:11:24 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@lilypond.org> | 2007-08-26 18:11:24 +0000 |
commit | b87e6d0412ab54a30d133db19c01d3de2e61ddee (patch) | |
tree | a2d4ed5107be5f08ab5b1269280faddcf5625371 /libguile/init.c | |
parent | 492faee1e5bdc59fff23a3a60c9a1d05cfb976a2 (diff) | |
download | guile-b87e6d0412ab54a30d133db19c01d3de2e61ddee.tar.gz |
(cleanup_for_exit): abort cleanup if init_mutex is still
held.
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libguile/init.c b/libguile/init.c index ff69ab9d1..25cff62a5 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -395,6 +395,14 @@ really_cleanup_for_exit (void *unused) static void cleanup_for_exit () { + if (scm_i_pthread_mutex_trylock (&scm_i_init_mutex) == 0) + scm_i_pthread_mutex_unlock (&scm_i_init_mutex); + else + { + fprintf (stderr, "Cannot exit gracefully when init is in progress; aborting.\n"); + abort (); + } + /* This function might be called in non-guile mode, so we need to enter it temporarily. */ @@ -472,6 +480,7 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_backtrace (); /* Requires fluids */ scm_init_fports (); scm_init_strports (); + scm_init_ports (); scm_init_gdbint (); /* Requires strports */ scm_init_hash (); scm_init_hashtab (); @@ -490,7 +499,6 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_numbers (); scm_init_options (); scm_init_pairs (); - scm_init_ports (); #ifdef HAVE_POSIX scm_init_filesys (); scm_init_posix (); |