#ifndef THREADSH
#define THREADSH
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000 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
* 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. */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
#include "libguile/__scm.h"
#include "libguile/procs.h"
+#include "libguile/throw.h"
+
+\f
/* smob tags for the thread datatypes */
-extern long scm_tc16_thread;
-extern long scm_tc16_mutex;
-extern long scm_tc16_condvar;
+extern scm_bits_t scm_tc16_thread;
+extern scm_bits_t scm_tc16_mutex;
+extern scm_bits_t scm_tc16_condvar;
-#define SCM_THREADP(obj) (scm_tc16_thread == SCM_TYP16 (obj))
-#define SCM_THREAD_DATA(obj) ((void *) SCM_CDR (obj))
+#define SCM_THREADP(x) SCM_TYP16_PREDICATE (scm_tc16_thread, x)
+#define SCM_THREAD_DATA(x) ((void *) SCM_CELL_WORD_1 (x))
-#define SCM_MUTEXP(obj) (scm_tc16_mutex == SCM_TYP16 (obj))
-#define SCM_MUTEX_DATA(obj) ((void *) SCM_CDR (obj))
+#define SCM_MUTEXP(x) SCM_TYP16_PREDICATE (scm_tc16_mutex, x))
+#define SCM_MUTEX_DATA(x) ((void *) SCM_CELL_WORD_1 (x))
-#define SCM_CONDVARP(obj) (scm_tc16_condvar == SCM_TYP16 (obj))
-#define SCM_CONDVAR_DATA(obj) ((void *) SCM_CDR (obj))
+#define SCM_CONDVARP(x) SCM_TYP16_PREDICATE (scm_tc16_condvar, x)
+#define SCM_CONDVAR_DATA(x) ((void *) SCM_CELL_WORD_1 (x))
/* Initialize implementation specific details of the threads support */
-void scm_threads_init SCM_P ((SCM_STACKITEM *));
-void scm_threads_mark_stacks SCM_P ((void));
-void scm_init_threads SCM_P ((SCM_STACKITEM *));
+void scm_threads_init (SCM_STACKITEM *);
+void scm_threads_mark_stacks (void);
+void scm_init_threads (SCM_STACKITEM *);
/* */
-SCM scm_threads_make_mutex SCM_P ((void));
-SCM scm_threads_lock_mutex SCM_P ((SCM));
-SCM scm_threads_unlock_mutex SCM_P ((SCM));
-SCM scm_threads_monitor SCM_P ((void));
+SCM scm_threads_make_mutex (void);
+SCM scm_threads_lock_mutex (SCM);
+SCM scm_threads_unlock_mutex (SCM);
+SCM scm_threads_monitor (void);
SCM scm_spawn_thread (scm_catch_body_t body, void *body_data,
scm_catch_handler_t handler, void *handler_data);
-#if 0
-/* These don't work any more. */
-#ifdef USE_MIT_PTHREADS
-#include "mit-pthreads.h"
-#endif
+/* These are versions of the ordinary sleep and usleep functions,
+ that play nicely with the thread system. */
+unsigned long scm_thread_sleep (unsigned long);
+unsigned long scm_thread_usleep (unsigned long);
-#ifdef USE_FSU_PTHREADS
-#include "fsu-pthreads.h"
-#endif
+
+/* The C versions of the Scheme-visible thread functions. */
+#ifdef USE_COOP_THREADS
+extern SCM scm_single_thread_p (void);
#endif
+extern SCM scm_yield (void);
+extern SCM scm_call_with_new_thread (SCM argl);
+extern SCM scm_join_thread (SCM t);
+extern SCM scm_make_mutex (void);
+extern SCM scm_lock_mutex (SCM m);
+extern SCM scm_unlock_mutex (SCM m);
+extern SCM scm_make_condition_variable (void);
+extern SCM scm_wait_condition_variable (SCM cond, SCM mutex);
+extern SCM scm_signal_condition_variable (SCM cond);
#ifdef USE_COOP_THREADS
#include "libguile/coop-defs.h"
#endif
#endif /* THREADSH */
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/