mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

(cleanup_for_exit): abort cleanup if init_mutex is still

Browse source 
held.
This commit is contained in:
Han-Wen Nienhuys 2007-08-26 18:11:24 +00:00
parent 492faee1e5
commit b87e6d0412
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libguile/ChangeLog
View file

@ -1,3 +1,8 @@
2007-08-26 Han-Wen Nienhuys <hanwen@lilypond.org>
* init.c (cleanup_for_exit): abort cleanup if init_mutex is still
held.
2007-08-23 Ludovic Courtès <ludo@gnu.org> 2007-08-23 Ludovic Courtès <ludo@gnu.org>
* read.c (scm_read_quote): Record position and copy source * read.c (scm_read_quote): Record position and copy source

10
libguile/init.c
View file

@ -395,6 +395,14 @@ really_cleanup_for_exit (void *unused)
static void static void
cleanup_for_exit () 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 /* This function might be called in non-guile mode, so we need to
enter it temporarily. enter it temporarily.
*/ */
@ -472,6 +480,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_init_backtrace (); /* Requires fluids */ scm_init_backtrace (); /* Requires fluids */
scm_init_fports (); scm_init_fports ();
scm_init_strports (); scm_init_strports ();
scm_init_ports ();
scm_init_gdbint (); /* Requires strports */ scm_init_gdbint (); /* Requires strports */
scm_init_hash (); scm_init_hash ();
scm_init_hashtab (); scm_init_hashtab ();
@ -490,7 +499,6 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_init_numbers (); scm_init_numbers ();
scm_init_options (); scm_init_options ();
scm_init_pairs (); scm_init_pairs ();
scm_init_ports ();
#ifdef HAVE_POSIX #ifdef HAVE_POSIX
scm_init_filesys (); scm_init_filesys ();
scm_init_posix (); scm_init_posix ();