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

Fix spurious `throw from within critical section' errors

Browse source 
The crux of this problem was that the thread doing a throw, and so
checking scm_i_critical_section_level, was different from the thread
that was in a critical section.

* libguile/async.h (scm_i_critical_section_level): Removed, replaced
  by per-thread critical_section_level.
  (SCM_CRITICAL_SECTION_START, SCM_CRITICAL_SECTION_END): Use
  per-thread critical_section_level.

* libguile/continuations.c (scm_dynthrow): Check per-thread
  critical_section_level.

* libguile/threads.c (guilify_self_1): Init per-thread
  critical_section_level.
  (scm_i_critical_section_level): Removed.

* libguile/threads.h (scm_i_thread): New critical_section_level field.

* libguile/throw.c (scm_ithrow): Check per-thread critical_section_level.
This commit is contained in:
Neil Jerram 2009-03-10 23:55:31 +00:00
parent ced1987c77
commit 3009b5d557
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/async.h
View file

@ -58,20 +58,18 @@ void scm_dynwind_unblock_asyncs (void);
the manual. the manual.
*/ */
/* Defined in threads.c. scm_i_critical_section_level is only used /* Defined in threads.c. */
for error checking and will go away eventually. */
extern scm_i_pthread_mutex_t scm_i_critical_section_mutex; extern scm_i_pthread_mutex_t scm_i_critical_section_mutex;
extern int scm_i_critical_section_level;
#define SCM_CRITICAL_SECTION_START \ #define SCM_CRITICAL_SECTION_START \
do { \ do { \
scm_i_pthread_mutex_lock (&scm_i_critical_section_mutex);\ scm_i_pthread_mutex_lock (&scm_i_critical_section_mutex);\
SCM_I_CURRENT_THREAD->block_asyncs++; \ SCM_I_CURRENT_THREAD->block_asyncs++; \
scm_i_critical_section_level++; \ SCM_I_CURRENT_THREAD->critical_section_level++; \
} while (0) } while (0)
#define SCM_CRITICAL_SECTION_END \ #define SCM_CRITICAL_SECTION_END \
do { \ do { \
scm_i_critical_section_level--; \ SCM_I_CURRENT_THREAD->critical_section_level--; \
SCM_I_CURRENT_THREAD->block_asyncs--; \ SCM_I_CURRENT_THREAD->block_asyncs--; \
scm_i_pthread_mutex_unlock (&scm_i_critical_section_mutex); \ scm_i_pthread_mutex_unlock (&scm_i_critical_section_mutex); \
scm_async_click (); \ scm_async_click (); \

2
libguile/continuations.c
View file

@ -256,7 +256,7 @@ scm_dynthrow (SCM cont, SCM val)
SCM_STACKITEM *dst = thread->continuation_base; SCM_STACKITEM *dst = thread->continuation_base;
SCM_STACKITEM stack_top_element; SCM_STACKITEM stack_top_element;
if (scm_i_critical_section_level) if (thread->critical_section_level)
{ {
fprintf (stderr, "continuation invoked from within critical section.\n"); fprintf (stderr, "continuation invoked from within critical section.\n");
abort (); abort ();

2
libguile/threads.c
View file

@ -422,6 +422,7 @@ guilify_self_1 (SCM_STACKITEM *base)
t->active_asyncs = SCM_EOL; t->active_asyncs = SCM_EOL;
t->block_asyncs = 1; t->block_asyncs = 1;
t->pending_asyncs = 1; t->pending_asyncs = 1;
t->critical_section_level = 0;
t->last_debug_frame = NULL; t->last_debug_frame = NULL;
t->base = base; t->base = base;
#ifdef __ia64__ #ifdef __ia64__
@ -1667,7 +1668,6 @@ scm_i_thread_sleep_for_gc ()
/* This mutex is used by SCM_CRITICAL_SECTION_START/END. /* This mutex is used by SCM_CRITICAL_SECTION_START/END.
*/ */
scm_i_pthread_mutex_t scm_i_critical_section_mutex; scm_i_pthread_mutex_t scm_i_critical_section_mutex;
int scm_i_critical_section_level = 0;
static SCM dynwind_critical_section_mutex; static SCM dynwind_critical_section_mutex;

3
libguile/threads.h
View file

@ -113,6 +113,9 @@ typedef struct scm_i_thread {
scm_t_contregs *pending_rbs_continuation; scm_t_contregs *pending_rbs_continuation;
#endif #endif
/* Whether this thread is in a critical section. */
int critical_section_level;
} scm_i_thread; } scm_i_thread;
#define SCM_I_IS_THREAD(x) SCM_SMOB_PREDICATE (scm_tc16_thread, x) #define SCM_I_IS_THREAD(x) SCM_SMOB_PREDICATE (scm_tc16_thread, x)

2
libguile/throw.c
View file

@ -692,7 +692,7 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED)
SCM dynpair = SCM_UNDEFINED; SCM dynpair = SCM_UNDEFINED;
SCM winds; SCM winds;
if (scm_i_critical_section_level) if (SCM_I_CURRENT_THREAD->critical_section_level)
{ {
fprintf (stderr, "throw from within critical section.\n"); fprintf (stderr, "throw from within critical section.\n");
abort (); abort ();