summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/ChangeLog7
-rw-r--r--libguile/async.h4
-rw-r--r--libguile/threads.c9
3 files changed, 10 insertions, 10 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 2900c450c..157ba34e9 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-24 Mikael Djurfeldt <djurfeldt@nada.kth.se>
+
+ * async.h (scm_mask_ints): Removed left over reference to
+ scm_root.
+
+ * threads.c: Removed fprintf debug statements.
+
2005-03-24 Neil Jerram <neil@ossau.uklinux.net>
* debug.c (scm_make_memoized): Restore use of SCM_UNPACK.
diff --git a/libguile/async.h b/libguile/async.h
index e6d71520e..791d71b72 100644
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -3,7 +3,7 @@
#ifndef SCM_ASYNC_H
#define SCM_ASYNC_H
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2005 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
-#define scm_mask_ints (scm_root->block_asyncs != 0)
+#define scm_mask_ints (SCM_I_CURRENT_THREAD->block_asyncs != 0)
diff --git a/libguile/threads.c b/libguile/threads.c
index 8b394584e..a9e5df1ec 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -1076,8 +1076,6 @@ fat_cond_timedwait (SCM cond, SCM mutex,
while (1)
{
- fprintf (stderr, "cond wait on %p\n", &c->lock);
-
scm_i_scm_pthread_mutex_lock (&c->lock);
msg = fat_mutex_unlock (m);
t->block_asyncs++;
@@ -1085,7 +1083,6 @@ fat_cond_timedwait (SCM cond, SCM mutex,
{
err = block_self (c->waiting, cond, &c->lock, waittime);
scm_i_pthread_mutex_unlock (&c->lock);
- fprintf (stderr, "locking mutex\n");
fat_mutex_lock (mutex);
}
else
@@ -1093,8 +1090,6 @@ fat_cond_timedwait (SCM cond, SCM mutex,
t->block_asyncs--;
scm_async_click ();
- fprintf (stderr, "back: %s, %d\n", msg, err);
-
if (msg)
scm_misc_error (NULL, msg, SCM_EOL);
@@ -1152,8 +1147,6 @@ SCM_DEFINE (scm_timed_wait_condition_variable, "wait-condition-variable", 2, 1,
static void
fat_cond_signal (fat_cond *c)
{
- fprintf (stderr, "cond signal on %p\n", &c->lock);
-
scm_i_scm_pthread_mutex_lock (&c->lock);
unblock_from_queue (c->waiting);
scm_i_pthread_mutex_unlock (&c->lock);