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

Merge remote-tracking branch 'origin/stable-2.0'

Browse source
This commit is contained in:
Andy Wingo 2013-11-28 16:24:38 +01:00
commit d511a2e160
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libguile/guardians.c
View file

@ -50,7 +50,6 @@
#endif #endif
#include "libguile/_scm.h" #include "libguile/_scm.h"
#include "libguile/async.h"
#include "libguile/ports.h" #include "libguile/ports.h"
#include "libguile/print.h" #include "libguile/print.h"
#include "libguile/smob.h" #include "libguile/smob.h"
@ -147,7 +146,7 @@ finalize_guarded (void *ptr, void *finalizer_data)
g = GUARDIAN_DATA (guardian); g = GUARDIAN_DATA (guardian);
scm_i_pthread_mutex_lock_block_asyncs (&g->mutex); scm_i_pthread_mutex_lock (&g->mutex);
if (g->live == 0) if (g->live == 0)
abort (); abort ();
@ -163,7 +162,7 @@ finalize_guarded (void *ptr, void *finalizer_data)
g->live--; g->live--;
scm_i_pthread_mutex_unlock_unblock_asyncs (&g->mutex); scm_i_pthread_mutex_unlock (&g->mutex);
} }
if (scm_is_true (proxied_finalizer)) if (scm_is_true (proxied_finalizer))
@ -214,7 +213,7 @@ scm_i_guard (SCM guardian, SCM obj)
void *prev_data; void *prev_data;
SCM guardians_for_obj, finalizer_data; SCM guardians_for_obj, finalizer_data;
scm_i_pthread_mutex_lock_block_asyncs (&g->mutex); scm_i_pthread_mutex_lock (&g->mutex);
g->live++; g->live++;
@ -260,7 +259,7 @@ scm_i_guard (SCM guardian, SCM obj)
SCM_SETCAR (finalizer_data, proxied_finalizer); SCM_SETCAR (finalizer_data, proxied_finalizer);
} }
scm_i_pthread_mutex_unlock_unblock_asyncs (&g->mutex); scm_i_pthread_mutex_unlock (&g->mutex);
} }
} }
@ -270,7 +269,7 @@ scm_i_get_one_zombie (SCM guardian)
t_guardian *g = GUARDIAN_DATA (guardian); t_guardian *g = GUARDIAN_DATA (guardian);
SCM res = SCM_BOOL_F; SCM res = SCM_BOOL_F;
scm_i_pthread_mutex_lock_block_asyncs (&g->mutex); scm_i_pthread_mutex_lock (&g->mutex);
if (!scm_is_null (g->zombies)) if (!scm_is_null (g->zombies))
{ {
@ -279,7 +278,7 @@ scm_i_get_one_zombie (SCM guardian)
g->zombies = SCM_CDR (g->zombies); g->zombies = SCM_CDR (g->zombies);
} }
scm_i_pthread_mutex_unlock_unblock_asyncs (&g->mutex); scm_i_pthread_mutex_unlock (&g->mutex);
return res; return res;
} }