[PATCH]: Critical section checked for incorrect thread.

["Linas Vepstas" <linasvepstas@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1277 bytes --]

The patch below was previously submitted:
http://www.mail-archive.com/bug-guile@gnu.org/msg04618.html
but was never applied, I don't know why; there was no
'yea' or 'nay' response.  Please apply; this provides at
least some stability for multi-threaded operation.

--linas

At any given time, some thread might be in a critical section.
Some other thread may be throwing an error for some utterly
unrelated reason.  Yet, when the error is thrown, the
"critical section" check will trip, and it will do so for an
utterly bogus reason. This patch performs the critical section
check, for only for the current thread.

Signed-off-by: Linas Vepstas <linasvepstas@gmail.com>

---
 libguile/throw.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: guile-1.8.6/libguile/throw.c
===================================================================
--- guile-1.8.6.orig/libguile/throw.c  2008-12-08 11:42:56.000000000 -0600
+++ guile-1.8.6/libguile/throw.c 2008-12-13 17:28:27.000000000 -0600
@@ -692,7 +692,7 @@ scm_ithrow (SCM key, SCM args, int noret
   SCM dynpair = SCM_UNDEFINED;
   SCM winds;

-  if (scm_i_critical_section_level)
+  if (SCM_I_CURRENT_THREAD->block_asyncs)
     {
       fprintf (stderr, "throw from within critical section.\n");
       abort ();

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: crit-section.patch --]
[-- Type: text/x-diff; name=crit-section.patch, Size: 1210 bytes --]

Date: 13 Nov 2008
To: guile-devel@gnu.org
Subject: Re: Does anyone actually use threads with guile?

Missed 1.8.6, resubmit on 13 Dec 2008
Subject: [PATCH]: Critical section checked for incorrect thread.

At any given time, some thread might be in a critical section. 
Some other thread may be throwing an error for some utterly
unrelated reason.  Yet, when the error is thrown, the 
"critical section" check will trip, and it will do so for an
utterly bogus reason. This patch performs the critical section
check, for only for the current thread.

Signed-off-by: Linas Vepstas <linasvepstas@gmail.com>

---
 libguile/throw.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: guile-1.8.6/libguile/throw.c
===================================================================
--- guile-1.8.6.orig/libguile/throw.c	2008-12-08 11:42:56.000000000 -0600
+++ guile-1.8.6/libguile/throw.c	2008-12-13 17:28:27.000000000 -0600
@@ -692,7 +692,7 @@ scm_ithrow (SCM key, SCM args, int noret
   SCM dynpair = SCM_UNDEFINED;
   SCM winds;
 
-  if (scm_i_critical_section_level)
+  if (SCM_I_CURRENT_THREAD->block_asyncs)
     {
       fprintf (stderr, "throw from within critical section.\n");
       abort ();