summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2009-03-10 23:55:31 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2009-09-30 21:44:02 +0100
commit87f30eda98b9c84807d54af6c76b6195c5cbd009 (patch)
tree68c075350ed8489ac6230115359c6a31db95474f
parent09d978f3f81d7ae43ba952de8dc568f54f5f80b6 (diff)
downloadguile-87f30eda98b9c84807d54af6c76b6195c5cbd009.tar.gz
Fix spurious `throw from within critical section' errors
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.
-rw-r--r--libguile/async.h8
-rw-r--r--libguile/continuations.c2
-rw-r--r--libguile/threads.c2
-rw-r--r--libguile/threads.h3
-rw-r--r--libguile/throw.c2
5 files changed, 9 insertions, 8 deletions
diff --git a/libguile/async.h b/libguile/async.h
index 427d9b4c8..b9b795f4f 100644
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -60,20 +60,18 @@ void scm_dynwind_unblock_asyncs (void);
the manual.
*/
-/* Defined in threads.c. scm_i_critical_section_level is only used
- for error checking and will go away eventually. */
+/* Defined in threads.c. */
extern scm_i_pthread_mutex_t scm_i_critical_section_mutex;
-extern int scm_i_critical_section_level;
#define SCM_CRITICAL_SECTION_START \
do { \
scm_i_pthread_mutex_lock (&scm_i_critical_section_mutex);\
SCM_I_CURRENT_THREAD->block_asyncs++; \
- scm_i_critical_section_level++; \
+ SCM_I_CURRENT_THREAD->critical_section_level++; \
} while (0)
#define SCM_CRITICAL_SECTION_END \
do { \
- scm_i_critical_section_level--; \
+ SCM_I_CURRENT_THREAD->critical_section_level--; \
SCM_I_CURRENT_THREAD->block_asyncs--; \
scm_i_pthread_mutex_unlock (&scm_i_critical_section_mutex); \
scm_async_click (); \
diff --git a/libguile/continuations.c b/libguile/continuations.c
index aa1fb334e..a0e2f6d4f 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -225,7 +225,7 @@ scm_dynthrow (SCM cont, SCM val)
SCM_STACKITEM *dst = thread->continuation_base;
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");
abort ();
diff --git a/libguile/threads.c b/libguile/threads.c
index 8dce6043c..901695cfe 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -318,6 +318,7 @@ guilify_self_1 (SCM_STACKITEM *base)
t->active_asyncs = SCM_EOL;
t->block_asyncs = 1;
t->pending_asyncs = 1;
+ t->critical_section_level = 0;
t->last_debug_frame = NULL;
t->base = base;
#ifdef __ia64__
@@ -1855,7 +1856,6 @@ static int threads_initialized_p = 0;
/* This mutex is used by SCM_CRITICAL_SECTION_START/END.
*/
scm_i_pthread_mutex_t scm_i_critical_section_mutex;
-int scm_i_critical_section_level = 0;
static SCM dynwind_critical_section_mutex;
diff --git a/libguile/threads.h b/libguile/threads.h
index 55102df17..842f0d9d0 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -117,6 +117,9 @@ typedef struct scm_i_thread {
scm_t_contregs *pending_rbs_continuation;
#endif
+ /* Whether this thread is in a critical section. */
+ int critical_section_level;
+
} scm_i_thread;
#define SCM_I_IS_THREAD(x) SCM_SMOB_PREDICATE (scm_tc16_thread, x)
diff --git a/libguile/throw.c b/libguile/throw.c
index cf6ea4a49..07d215f41 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -732,7 +732,7 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED)
SCM dynpair = SCM_UNDEFINED;
SCM winds;
- if (scm_i_critical_section_level)
+ if (SCM_I_CURRENT_THREAD->critical_section_level)
{
SCM s = args;
int i = 0;