2001-11-04 Stefan Jahn <stefan@lkcc.org>
[bpt/guile.git] / libguile / coop-defs.h
index c3bab14..3863b16 100644 (file)
@@ -1,20 +1,20 @@
 /* classes: h_files */
 
-#ifndef COOP_DEFSH
-#define COOP_DEFSH
+#ifndef SCM_COOP_DEFS_H
+#define SCM_COOP_DEFS_H
 
-/*     Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1996,1997,1998,1999,2000,2001 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,
@@ -44,8 +44,6 @@
  * 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
 
 # ifdef TIME_WITH_SYS_TIME
 #include "libguile/iselect.h"
 #endif
 
+#if HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
 #ifdef GUILE_PTHREAD_COMPAT
 #include <pthread.h>
 #endif
@@ -143,14 +145,14 @@ typedef struct coop_m {
 
 typedef int coop_mattr;
 
-typedef coop_m scm_mutex_t;
+typedef coop_m scm_t_mutex;
 
-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*);
+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*);
 #define scm_mutex_init coop_mutex_init
 #define scm_mutex_lock coop_mutex_lock
 #define scm_mutex_trylock coop_mutex_lock
@@ -166,7 +168,7 @@ typedef struct coop_c {
 
 typedef int coop_cattr;
 
-typedef coop_c scm_cond_t;
+typedef coop_c scm_t_cond;
 
 #ifndef HAVE_STRUCT_TIMESPEC
 /* POSIX.4 structure for a time value.  This is like a `struct timeval' but
@@ -178,14 +180,14 @@ struct timespec
 };
 #endif
 
-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*);
+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 struct timespec *abstime);
+SCM_API int coop_condition_variable_signal (coop_c*);
+SCM_API 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
@@ -195,24 +197,24 @@ extern 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 (*destruktor) (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.  */ 
@@ -224,19 +226,19 @@ extern size_t scm_thread_count;
    (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 *);
+SCM_API 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);
+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
 
@@ -245,12 +247,6 @@ extern coop_t *coop_wait_for_runnable_thread (void);
 
 \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 { \
@@ -280,7 +276,7 @@ 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: