/* classes: h_files */
-#ifndef COOP_DEFSH
-#define COOP_DEFSH
-
-/* Copyright (C) 1996, 1997, 1998, 1999 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.
+#ifndef SCM_COOP_DEFS_H
+#define SCM_COOP_DEFS_H
+
+/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2006 Free Software Foundation, Inc.
*
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * 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.
+ * This library 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
+ * Lesser General Public License for more details.
*
- * 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. */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
- gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
-# ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-# else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# ifdef HAVE_TIME_H
-# include <time.h>
-# endif
-# endif
-# endif
-
-#ifdef GUILE_ISELECT
-#include "iselect.h"
+#include "libguile/__scm.h"
+#include "libguile/iselect.h"
+
+#if SCM_HAVE_WINSOCK2_H
+# include <winsock2.h>
#endif
-/* #define GUILE_PTHREAD_COMPAT 1 */
#ifdef GUILE_PTHREAD_COMPAT
-#include <pthread.h>
+# include <pthread.h>
+
+# define GC_THREADS 1
+# include <gc/gc.h>
#endif
/* This file is included by threads.h, which, in turn, is included by
void *joining; /* A queue of threads waiting to join this
thread */
-#ifdef GUILE_ISELECT
+ SCM handle; /* SCM handle, protected via scm_all_threads. */
+
int nfds;
SELECT_TYPE *readfds;
SELECT_TYPE *writefds;
struct timeval wakeup_time; /* Time to stop sleeping */
int _errno;
int retval;
-#else
- time_t wakeup_time; /* Time to stop sleeping */
-#endif
#ifdef GUILE_PTHREAD_COMPAT
pthread_t dummy_thread;
pthread_mutex_t dummy_mutex;
- pthread_cond_t dummy_cond;
#endif
} coop_t;
typedef struct coop_m {
coop_t *owner; /* Mutex owner */
+ int level; /* for recursive locks. */
coop_q_t waiting; /* Queue of waiting threads */
} coop_m;
typedef int coop_mattr;
-typedef coop_m scm_mutex_t;
-
-extern int coop_mutex_init (coop_m*);
-extern int coop_new_mutex_init (coop_m*, coop_mattr*);
-extern int coop_mutex_lock (coop_m*);
-extern int coop_mutex_trylock (coop_m*);
-extern int coop_mutex_unlock (coop_m*);
-extern int coop_mutex_destroy (coop_m*);
-#define scm_mutex_init coop_new_mutex_init
-#define scm_mutex_lock coop_mutex_lock
-#define scm_mutex_trylock coop_mutex_lock
-#define scm_mutex_unlock coop_mutex_unlock
-#define scm_mutex_destroy coop_mutex_destroy
+SCM_API int coop_mutex_init (coop_m*);
+SCM_API int coop_new_mutex_init (coop_m*, coop_mattr*);
+SCM_API int coop_mutex_lock (coop_m*);
+SCM_API int coop_mutex_trylock (coop_m*);
+SCM_API int coop_mutex_unlock (coop_m*);
+SCM_API int coop_mutex_destroy (coop_m*);
/* A Condition variable is made up of a list of threads waiting on the
condition. */
typedef int coop_cattr;
-typedef coop_c scm_cond_t;
-
-extern int coop_condition_variable_init (coop_c*);
-extern int coop_new_condition_variable_init (coop_c*, coop_cattr*);
-extern int coop_condition_variable_wait_mutex (coop_c*, coop_m*);
-extern int coop_condition_variable_timed_wait_mutex (coop_c*,
- coop_m*,
- const struct timespec *abstime);
-extern int coop_condition_variable_signal (coop_c*);
-extern int coop_condition_variable_destroy (coop_c*);
-#define scm_cond_init coop_new_condition_variable_init
-#define scm_cond_wait coop_condition_variable_wait_mutex
-#define scm_cond_timedwait coop_condition_variable_timed_wait_mutex
-#define scm_cond_signal coop_condition_variable_signal
-#define scm_cond_broadcast coop_condition_variable_signal /* yes */
-#define scm_cond_destroy coop_condition_variable_destroy
+SCM_API int coop_condition_variable_init (coop_c*);
+SCM_API int coop_new_condition_variable_init (coop_c*, coop_cattr*);
+SCM_API int coop_condition_variable_wait_mutex (coop_c*, coop_m*);
+SCM_API int coop_condition_variable_timed_wait_mutex (coop_c*,
+ coop_m*,
+ const scm_t_timespec *abstime);
+SCM_API int coop_condition_variable_signal (coop_c*);
+SCM_API int coop_condition_variable_broadcast (coop_c*);
+SCM_API int coop_condition_variable_destroy (coop_c*);
typedef int coop_k;
-typedef coop_k scm_key_t;
+typedef coop_k scm_t_key;
-extern int coop_key_create (coop_k *keyp, void (*destructor) (void *value));
-extern int coop_setspecific (coop_k key, const void *value);
-extern void *coop_getspecific (coop_k key);
-extern int coop_key_delete (coop_k);
+SCM_API int coop_key_create (coop_k *keyp, void (*destruktor) (void *value));
+SCM_API int coop_setspecific (coop_k key, const void *value);
+SCM_API void *coop_getspecific (coop_k key);
+SCM_API int coop_key_delete (coop_k);
#define scm_key_create coop_key_create
#define scm_setspecific coop_setspecific
#define scm_getspecific coop_getspecific
#define scm_key_delete coop_key_delete
-extern coop_t *coop_global_curr; /* Currently-executing thread. */
+SCM_API coop_t *coop_global_curr; /* Currently-executing thread. */
-extern void coop_join (coop_t *t);
-extern void coop_yield (void);
+SCM_API void coop_join (coop_t *t);
+SCM_API void coop_yield (void);
-extern size_t scm_switch_counter;
-extern size_t scm_thread_count;
+SCM_API size_t scm_switch_counter;
+SCM_API size_t scm_thread_count;
\f
/* Some iselect functions. */
iselect.h, but they use coop_t, defined above, which uses things
defined in iselect.h. Basically, we're making at best a flailing
(and failing) attempt at modularity here, and I don't have time to
- rethink this at the moment. This code awaits a Hero. --JimB */
-#ifdef GUILE_ISELECT
-void coop_timeout_qinsert (coop_q_t *, coop_t *);
-#endif
-extern coop_t *coop_next_runnable_thread (void);
-extern coop_t *coop_wait_for_runnable_thread_now (struct timeval *);
-extern coop_t *coop_wait_for_runnable_thread (void);
+ rethink this at the moment. This code awaits a Hero. --JimB
+ */
+SCM_API void coop_timeout_qinsert (coop_q_t *, coop_t *);
+SCM_API coop_t *coop_next_runnable_thread (void);
+SCM_API coop_t *coop_wait_for_runnable_thread_now (struct timeval *);
+SCM_API coop_t *coop_wait_for_runnable_thread (void);
\f
/* Cooperative threads don't need to have these defined */
-#define SCM_THREAD_CRITICAL_SECTION_START
-#define SCM_THREAD_CRITICAL_SECTION_END
+#define SCM_CRITICAL_SECTION_START
+#define SCM_CRITICAL_SECTION_END
\f
\f
-#define SCM_THREAD_DEFER
-#define SCM_THREAD_ALLOW
-#define SCM_THREAD_REDEFER
-#define SCM_THREAD_REALLOW_1
-#define SCM_THREAD_REALLOW_2
-
#if 0
#define SCM_THREAD_SWITCHING_CODE \
do { \
#define SCM_THREAD_LOCAL_DATA (coop_global_curr->data)
#define SCM_SET_THREAD_LOCAL_DATA(ptr) (coop_global_curr->data = (ptr))
-#endif /* COOP_DEFSH */
+#endif /* SCM_COOP_DEFS_H */
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/