1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 06:50:31 +02:00

Critical sections in guardians do not need to block asyncs

* libguile/guardians.c: Critical sections here cannot cause an
  async_tick, so they do not need to block asyncs.
This commit is contained in:
Andy Wingo 2013-11-28 16:20:42 +01:00
parent d364a89718
commit 8f0ecae98c

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"
@ -145,7 +144,7 @@ finalize_guarded (void *ptr, void *finalizer_data)
g = GUARDIAN_DATA (SCM_CAR (guardian_list)); g = GUARDIAN_DATA (SCM_CAR (guardian_list));
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 ();
@ -161,7 +160,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))
@ -212,7 +211,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++;
@ -256,7 +255,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);
} }
} }
@ -266,7 +265,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))
{ {
@ -275,7 +274,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;
} }