summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>2002-12-16 09:28:38 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>2002-12-16 09:28:38 +0000
commit93cd4dcd9c37f3ee1401742dcc81ec192209b5ff (patch)
tree7f01ce64b2b3bcd4bef27559777c39f39f115f5f
parent09841c77838b6263c666036f1e81c82cbe8e152e (diff)
downloadguile-93cd4dcd9c37f3ee1401742dcc81ec192209b5ff.tar.gz
* pthread-threads.c, pthread-threads.h, threads.c: Fixes to
pthread "native" recursive mutex support.
-rw-r--r--libguile/ChangeLog5
-rw-r--r--libguile/pthread-threads.c165
-rw-r--r--libguile/pthread-threads.h20
-rw-r--r--libguile/threads.c7
4 files changed, 187 insertions, 10 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 907d12826..cc9764ae1 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-16 Mikael Djurfeldt <djurfeldt@nada.kth.se>
+
+ * pthread-threads.c, pthread-threads.h, threads.c: Fixes to
+ pthread "native" recursive mutex support.
+
2002-12-15 Mikael Djurfeldt <djurfeldt@nada.kth.se>
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
diff --git a/libguile/pthread-threads.c b/libguile/pthread-threads.c
new file mode 100644
index 000000000..cfb5ed5e7
--- /dev/null
+++ b/libguile/pthread-threads.c
@@ -0,0 +1,165 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
+ *
+ * As a special exception, the Free Software Foundation gives permission
+ * for additional uses of the text contained in its release of GUILE.
+ *
+ * The exception is that, if you link the GUILE library with other files
+ * to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the GUILE library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the
+ * Free Software Foundation under the name GUILE. If you copy
+ * code from other Free Software Foundation releases into a copy of
+ * GUILE, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way. To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for GUILE, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice. */
+
+
+
+
+#include "libguile/scmconfig.h"
+
+scm_t_mutexattr scm_i_plugin_mutex;
+
+scm_t_mutexattr scm_i_plugin_rec_mutex;
+
+#ifndef SCM_MUTEX_RECURSIVE
+#error hej
+typedef struct rec_mutex {
+ scm_t_mutex mutex;
+ scm_thread *owner;
+ int count;
+} rec_mutex;
+
+/* Mutex for recursive mutex administration */
+static scm_t_mutex rec_mutex_mutex;
+
+int
+scm_i_plugin_rec_mutex_init (scm_t_rec_mutex *mx, const scm_t_mutexattr *a)
+{
+ rec_mutex *m = (rec_mutex *) mx;
+ scm_i_plugin_mutex_init (&m->mutex, &scm_i_plugin_mutex);
+ m->owner = 0;
+ m->count = 0;
+ return 0;
+}
+
+int
+scm_i_plugin_rec_mutex_lock (scm_t_rec_mutex *mx)
+{
+ rec_mutex *m = (rec_mutex *) mx;
+ scm_thread *t = SCM_CURRENT_THREAD;
+ scm_i_plugin_mutex_lock (&rec_mutex_mutex);
+ if (m->count && m->owner == t)
+ {
+ ++m->count;
+ scm_i_plugin_mutex_unlock (&rec_mutex_mutex);
+ }
+ else
+ {
+ scm_i_plugin_mutex_unlock (&rec_mutex_mutex);
+ scm_i_plugin_mutex_lock (&m->mutex);
+ m->count = 1;
+ m->owner = t;
+ }
+ return 0;
+}
+
+int
+scm_i_plugin_rec_mutex_trylock (scm_t_rec_mutex *mx)
+{
+ rec_mutex *m = (rec_mutex *) mx;
+ scm_thread *t = SCM_CURRENT_THREAD;
+ scm_i_plugin_mutex_lock (&rec_mutex_mutex);
+ if (m->owner != 0 && m->owner != t)
+ return EBUSY;
+ else if (m->count)
+ {
+ ++m->count;
+ scm_i_plugin_mutex_unlock (&rec_mutex_mutex);
+ }
+ else
+ {
+ scm_i_plugin_mutex_unlock (&rec_mutex_mutex);
+ scm_i_plugin_mutex_lock (&m->mutex);
+ m->count = 1;
+ m->owner = t;
+ }
+ return 0;
+}
+
+int
+scm_i_plugin_rec_mutex_unlock (scm_t_rec_mutex *mx)
+{
+ rec_mutex *m = (rec_mutex *) mx;
+ scm_i_plugin_mutex_lock (&rec_mutex_mutex);
+ if (!--m->count)
+ {
+ m->owner = 0;
+ scm_i_plugin_mutex_unlock (&m->mutex);
+ }
+ scm_i_plugin_mutex_unlock (&rec_mutex_mutex);
+ return 0;
+}
+
+#endif /* !PTHREAD_MUTEX_RECURSIVE */
+
+#ifndef SCM_MUTEXATTR_SETTYPE_DECLARED
+int pthread_mutexattr_settype (pthread_mutexattr_t *, int);
+#endif
+
+void
+scm_init_pthread_threads ()
+{
+ if (sizeof (scm_t_rec_mutex) > SCM_REC_MUTEX_MAXSIZE)
+ {
+ fprintf (stderr, "Internal error: Need to upgrade mutex size\n");
+ abort ();
+ }
+
+ pthread_mutexattr_init (&scm_i_plugin_mutex);
+#ifdef SCM_MUTEX_FAST
+ pthread_mutexattr_settype (&scm_i_plugin_mutex, SCM_MUTEX_FAST);
+#endif
+
+#ifdef SCM_MUTEX_RECURSIVE /* Use the POSIX 1003.1c identifier */
+ pthread_mutexattr_init (&scm_i_plugin_rec_mutex);
+ pthread_mutexattr_settype (&scm_i_plugin_rec_mutex, SCM_MUTEX_RECURSIVE);
+#else
+ /* If PTHREAD_MUTEX_RECURSIVE is not defined,
+ scm_i_plugin_rec_mutex_init won't pay attention to it anyway
+ */
+ scm_i_plugin_mutex_init (&rec_mutex_mutex, &scm_i_plugin_mutex);
+#endif
+}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
diff --git a/libguile/pthread-threads.h b/libguile/pthread-threads.h
index 1dd7e5bc4..006d06b3c 100644
--- a/libguile/pthread-threads.h
+++ b/libguile/pthread-threads.h
@@ -78,17 +78,23 @@ extern scm_t_mutexattr scm_i_plugin_mutex; /* The "fast" mutex. */
#define scm_i_plugin_mutex_trylock pthread_mutex_trylock
#define scm_i_plugin_mutex_unlock pthread_mutex_unlock
+/* Size is checked in scm_init_pthread_threads */
#define SCM_REC_MUTEX_MAXSIZE (8 * sizeof (long))
typedef struct { char _[SCM_REC_MUTEX_MAXSIZE]; } scm_t_rec_mutex;
extern scm_t_mutexattr scm_i_plugin_rec_mutex;
-#ifdef PTHREAD_MUTEX_RECURSIVE /* pthreads has recursive mutexes! */
-#define scm_i_plugin_rec_mutex_init pthread_mutex_init
-#define scm_i_plugin_rec_mutex_destroy pthread_mutex_destroy
-#define scm_i_plugin_rec_mutex_lock pthread_mutex_lock
-#define scm_i_plugin_rec_mutex_trylock pthread_mutex_trylock
-#define scm_i_plugin_rec_mutex_unlock pthread_mutex_unlock
+#ifdef SCM_MUTEX_RECURSIVE /* pthreads has recursive mutexes! */
+#define scm_i_plugin_rec_mutex_init(m,a) \
+ pthread_mutex_init ((pthread_mutex_t *) (m), (a))
+#define scm_i_plugin_rec_mutex_destroy(m) \
+ pthread_mutex_destroy ((pthread_mutex_t *) (m))
+#define scm_i_plugin_rec_mutex_lock(m) \
+ pthread_mutex_lock ((pthread_mutex_t *) (m))
+#define scm_i_plugin_rec_mutex_trylock(m) \
+ pthread_mutex_trylock ((pthread_mutex_t *) (m))
+#define scm_i_plugin_rec_mutex_unlock(m) \
+ pthread_mutex_unlock ((pthread_mutex_t *) (m))
#else
int scm_i_plugin_rec_mutex_init (scm_t_rec_mutex *, const scm_t_mutexattr *);
#define scm_i_plugin_rec_mutex_destroy(mx) do { (void) (mx); } while (0)
@@ -117,7 +123,7 @@ int scm_i_plugin_rec_mutex_unlock (scm_t_rec_mutex *);
void scm_init_pthread_threads (void);
-#endif /* SCM_THREADS_NULL_H */
+#endif /* SCM_THREADS_PTHREADS_H */
/*
Local Variables:
diff --git a/libguile/threads.c b/libguile/threads.c
index 1fdf77f5e..cafe680c4 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1329,6 +1329,10 @@ void
scm_threads_prehistory ()
{
scm_thread *t;
+#ifdef USE_PTHREAD_THREADS
+ /* Must be called before any initialization of a mutex. */
+ scm_init_pthread_threads ();
+#endif
scm_i_plugin_mutex_init (&thread_admin_mutex, &scm_i_plugin_mutex);
scm_i_plugin_rec_mutex_init (&gc_section_mutex, &scm_i_plugin_rec_mutex);
scm_i_plugin_cond_init (&wake_up_cond, 0);
@@ -1342,9 +1346,6 @@ scm_threads_prehistory ()
t->base = NULL;
t->clear_freelists_p = 0;
scm_setspecific (scm_i_thread_key, t);
-#ifdef USE_PTHREAD_THREADS
- scm_init_pthread_threads ();
-#endif
}
scm_t_bits scm_tc16_thread;