* Makefile.am (EXTRA_libguile_la_SOURCES): New variable to hold

[bpt/guile.git] / libguile / async.c

diff --git a/libguile/async.c b/libguile/async.c
index 17219d3..d2478fd 100644 (file)
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -85,8 +85,6 @@
  */
 
 
-#define min(A,B) ((A) < (B) ? (A) : (B))
-
 
 unsigned int scm_async_clock = 20;
 static unsigned int scm_async_rate = 20;
@@ -121,13 +119,10 @@ static long scm_tc16_async;
 
 \f
 
-#ifdef __STDC__
-static int
-asyncs_pending (void)
-#else
+static int asyncs_pending SCM_P ((void));
+
 static int
 asyncs_pending ()
-#endif
 {
   SCM pos;
   pos = scm_asyncs;
@@ -145,13 +140,9 @@ asyncs_pending ()
 }
 
 
-#ifdef __STDC__
-void
-scm_async_click (void)
-#else
+
 void
 scm_async_click ()
-#endif
 {
   int owe_switch;
   int owe_tick;
@@ -266,24 +257,24 @@ scm_async_click ()
 
 \f
 
-#ifdef __STDC__
-void
-scm_switch (void)
-#else
+
 void
 scm_switch ()
+{
+#if 0 /* Thread switching code should probably reside here, but the
+         async switching code doesn't seem to work, so it's put in the
+         SCM_ASYNC_TICK macro instead. /mdj */
+  SCM_THREAD_SWITCHING_CODE;
 #endif
-{}
+}
 
 
-#ifdef __STDC__
-static void
-scm_deliver_signal (int num)
-#else
+
+static void scm_deliver_signal SCM_P ((int num));
+
 static void
 scm_deliver_signal (num)
      int num;
-#endif
 {
   SCM handler;
   handler = SCM_CDR (handler_var);
@@ -300,16 +291,14 @@ scm_deliver_signal (num)
 
 \f
 
-#ifdef __STDC__
-static int
-print_async (SCM exp, SCM port, int writing)
-#else
+
+static int print_async SCM_P ((SCM exp, SCM port, scm_print_state *pstate));
+
 static int
-print_async (exp, port, writing)
+print_async (exp, port, pstate)
      SCM exp;
      SCM port;
-     int writing;
-#endif
+     scm_print_state *pstate;
 {
   scm_gen_puts (scm_regular_string, "#<async ", port);
   scm_intprint(exp, 16, port);
@@ -317,14 +306,12 @@ print_async (exp, port, writing)
   return 1;
 }
 
-#ifdef __STDC__
-static SCM
-mark_async (SCM obj)
-#else
+
+static SCM mark_async SCM_P ((SCM obj));
+
 static SCM
 mark_async (obj)
      SCM obj;
-#endif
 {
   struct scm_async * it;
   if (SCM_GC8MARKP (obj))
@@ -334,14 +321,12 @@ mark_async (obj)
   return it->thunk;
 }
 
-#ifdef __STDC__
-static scm_sizet
-free_async (SCM obj)
-#else
+
+static scm_sizet free_async SCM_P ((SCM obj));
+
 static scm_sizet
-free_async (SCM obj)
+free_async (obj)
      SCM obj;
-#endif
 {
   struct scm_async * it;
   it = SCM_ASYNC (obj);
@@ -362,14 +347,10 @@ static scm_smobfuns  async_smob =
 \f
 
 SCM_PROC(s_async, "async", 1, 0, 0, scm_async);
-#ifdef __STDC__
-SCM
-scm_async (SCM thunk)
-#else
+
 SCM
 scm_async (thunk)
      SCM thunk;
-#endif
 {
   SCM it;
   struct scm_async * async;
@@ -387,14 +368,10 @@ scm_async (thunk)
 }
 
 SCM_PROC(s_system_async, "system-async", 1, 0, 0, scm_system_async);
-#ifdef __STDC__
-SCM 
-scm_system_async (SCM thunk)
-#else
+
 SCM 
 scm_system_async (thunk)
      SCM thunk;
-#endif
 {
   SCM it;
   SCM list;
@@ -410,14 +387,10 @@ scm_system_async (thunk)
 }
 
 SCM_PROC(s_async_mark, "async-mark", 1, 0, 0, scm_async_mark);
-#ifdef __STDC__
-SCM
-scm_async_mark (SCM a)
-#else
+
 SCM
 scm_async_mark (a)
      SCM a;
-#endif
 {
   struct scm_async * it;
   SCM_ASSERT (SCM_NIMP (a) &&  SCM_ASYNCP (a), a, SCM_ARG1, s_async_mark);
@@ -428,14 +401,10 @@ scm_async_mark (a)
 
 
 SCM_PROC(s_system_async_mark, "system-async-mark", 1, 0, 0, scm_system_async_mark);
-#ifdef __STDC__
-SCM
-scm_system_async_mark (SCM a)
-#else
+
 SCM
 scm_system_async_mark (a)
      SCM a;
-#endif
 {
   struct scm_async * it;
   SCM_ASSERT (SCM_NIMP (a) &&  SCM_ASYNCP (a), a, SCM_ARG1, s_async_mark);
@@ -450,14 +419,10 @@ scm_system_async_mark (a)
 
 
 SCM_PROC(s_run_asyncs, "run-asyncs", 1, 0, 0, scm_run_asyncs);
-#ifdef __STDC__
-SCM
-scm_run_asyncs (SCM list_of_a)
-#else
+
 SCM
 scm_run_asyncs (list_of_a)
      SCM list_of_a;
-#endif
 {
   SCM pos;
 
@@ -488,14 +453,10 @@ scm_run_asyncs (list_of_a)
 
 
 SCM_PROC(s_noop, "noop", 0, 0, 1, scm_noop);
-#ifdef __STDC__
-SCM
-scm_noop (SCM args)
-#else
+
 SCM
 scm_noop (args)
      SCM args;
-#endif
 {
   return (SCM_NULLP (args)
          ? SCM_BOOL_F
@@ -506,14 +467,10 @@ scm_noop (args)
 \f
 
 SCM_PROC(s_set_tick_rate, "set-tick-rate", 1, 0, 0, scm_set_tick_rate);
-#ifdef __STDC__
-SCM
-scm_set_tick_rate (SCM n)
-#else
+
 SCM
 scm_set_tick_rate (n)
      SCM n;
-#endif
 {
   unsigned int old_n;
   SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_set_tick_rate);
@@ -528,14 +485,10 @@ scm_set_tick_rate (n)
 
 
 SCM_PROC(s_set_switch_rate, "set-switch-rate", 1, 0, 0, scm_set_switch_rate);
-#ifdef __STDC__
-SCM
-scm_set_switch_rate (SCM n)
-#else
+
 SCM
 scm_set_switch_rate (n)
      SCM n;
-#endif
 {
   unsigned int old_n;
   SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_set_switch_rate);
@@ -548,97 +501,81 @@ scm_set_switch_rate (n)
 
 \f
 
-#ifdef __STDC__
-static SCM
-scm_sys_hup_async_thunk (void)
-#else
+
+static SCM scm_sys_hup_async_thunk SCM_P ((void));
+
 static SCM
 scm_sys_hup_async_thunk ()
-#endif
 {
   scm_deliver_signal (SCM_HUP_SIGNAL);
   return SCM_BOOL_F;
 }
 
-#ifdef __STDC__
-static SCM
-scm_sys_int_async_thunk (void)
-#else
+
+static SCM scm_sys_int_async_thunk SCM_P ((void));
+
 static SCM
 scm_sys_int_async_thunk ()
-#endif
 {
   scm_deliver_signal (SCM_INT_SIGNAL);
   return SCM_BOOL_F;
 }
 
-#ifdef __STDC__
-static SCM
-scm_sys_fpe_async_thunk (void)
-#else
+
+static SCM scm_sys_fpe_async_thunk SCM_P ((void));
+
 static SCM
 scm_sys_fpe_async_thunk ()
-#endif
 {
   scm_deliver_signal (SCM_FPE_SIGNAL);
   return SCM_BOOL_F;
 }
 
-#ifdef __STDC__
-static SCM
-scm_sys_bus_async_thunk (void)
-#else
+
+static SCM scm_sys_bus_async_thunk SCM_P ((void));
+
 static SCM
 scm_sys_bus_async_thunk ()
-#endif
 {
   scm_deliver_signal (SCM_BUS_SIGNAL);
   return SCM_BOOL_F;
 }
 
-#ifdef __STDC__
-static SCM
-scm_sys_segv_async_thunk (void)
-#else
+
+static SCM scm_sys_segv_async_thunk SCM_P ((void));
+
 static SCM
 scm_sys_segv_async_thunk ()
-#endif
 {
   scm_deliver_signal (SCM_SEGV_SIGNAL);
   return SCM_BOOL_F;
 }
 
-#ifdef __STDC__
-static SCM
-scm_sys_alrm_async_thunk (void)
-#else
+
+static SCM scm_sys_alrm_async_thunk SCM_P ((void));
+
 static SCM
 scm_sys_alrm_async_thunk ()
-#endif
 {
   scm_deliver_signal (SCM_ALRM_SIGNAL);
   return SCM_BOOL_F;
 }
 
-#ifdef __STDC__
-static SCM
-scm_sys_gc_async_thunk (void)
-#else
+
+static SCM scm_sys_gc_async_thunk SCM_P ((void));
+
 static SCM
 scm_sys_gc_async_thunk ()
-#endif
 {
   scm_deliver_signal (SCM_GC_SIGNAL);
   return SCM_BOOL_F;
 }
 
-#ifdef __STDC__
-static SCM
-scm_sys_tick_async_thunk (void)
-#else
+
+static SCM scm_sys_tick_async_thunk SCM_P ((void));
+
 static SCM
 scm_sys_tick_async_thunk ()
-#endif
 {
   scm_deliver_signal (SCM_TICK_SIGNAL);
   return SCM_BOOL_F;
@@ -648,22 +585,26 @@ scm_sys_tick_async_thunk ()
 
 \f
 
-#ifdef __STDC__
-SCM
-scm_take_signal (int n)
-#else
+
 SCM
 scm_take_signal (n)
      int n;
-#endif
 {
   SCM ignored;
   if (!scm_ints_disabled)
     {
-      SCM_NEWCELL (ignored);           /* In case we interrupted SCM_NEWCELL,
-                                        * throw out the possibly already allocated
-                                        * free cell.
-                                        */
+      /* For reasons of speed, the SCM_NEWCELL macro doesn't defer
+        interrupts.  Instead, it first sets its argument to point to
+        the first cell in the list, and then advances the freelist
+        pointer to the next cell.  Now, if this procedure is
+        interrupted, the only anomalous state possible is to have
+        both SCM_NEWCELL's argument and scm_freelist pointing to the
+        same cell.  To deal with this case, we always throw away the
+        first cell in scm_freelist here.
+
+        At least, that's the theory.  I'm not convinced that that's
+        the only anomalous path we need to worry about.  */
+      SCM_NEWCELL (ignored);
     }
   scm_system_async_mark (system_signal_asyncs[SCM_SIG_ORD(n)]);
   return SCM_BOOL_F;
@@ -672,13 +613,9 @@ scm_take_signal (n)
 \f
 
 SCM_PROC(s_unmask_signals, "unmask-signals", 0, 0, 0, scm_unmask_signals);
-#ifdef __STDC__
-SCM
-scm_unmask_signals (void)
-#else
+
 SCM
 scm_unmask_signals ()
-#endif
 {
   scm_mask_ints = 0;
   return SCM_UNSPECIFIED;
@@ -686,13 +623,9 @@ scm_unmask_signals ()
 
 
 SCM_PROC(s_mask_signals, "mask-signals", 0, 0, 0, scm_mask_signals);
-#ifdef __STDC__
-SCM
-scm_mask_signals (void)
-#else
+
 SCM
 scm_mask_signals ()
-#endif
 {
   scm_mask_ints = 1;
   return SCM_UNSPECIFIED;
@@ -700,17 +633,13 @@ scm_mask_signals ()
 
 \f
 
-#ifdef __STDC__
-void
-scm_init_async (void)
-#else
+
 void
 scm_init_async ()
-#endif
 {
   SCM a_thunk;
   scm_tc16_async = scm_newsmob (&async_smob);
-  symbol_signal = SCM_CAR (scm_sysintern ("signal", strlen ("signal")));
+  symbol_signal = SCM_CAR (scm_sysintern ("signal", SCM_UNDEFINED));
   scm_permanent_object (symbol_signal);
 
   /* These are in the opposite order of delivery priortity. 
@@ -738,7 +667,7 @@ scm_init_async ()
   a_thunk = scm_make_gsubr ("%alrm-thunk", 0, 0, 0, scm_sys_alrm_async_thunk);
   system_signal_asyncs[SCM_SIG_ORD(SCM_ALRM_SIGNAL)] = scm_system_async (a_thunk);
 
-  handler_var = scm_sysintern ("signal-handler", strlen ("signal"));
+  handler_var = scm_sysintern ("signal-handler", SCM_UNDEFINED);
   SCM_SETCDR (handler_var, SCM_BOOL_F);
   scm_permanent_object (handler_var);
 #include "async.x"