Use a better name.

[bertos.git] / bertos / kern / signal.c

diff --git a/bertos/kern/signal.c b/bertos/kern/signal.c
index d7633a147809b582c64b2e300489ac2917658b12..dbe1261f2053381e7a4127e67ee084504f00bca3 100644 (file)
--- a/bertos/kern/signal.c
+++ b/bertos/kern/signal.c
@@ -28,7 +28,6 @@
  *
  * Copyright 2004, 2008 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999, 2000, 2001 Bernie Innocenti <bernie@codewiz.org>
- *
  * -->
  *
  * \brief IPC signals implementation.
@@ -93,31 +92,37 @@
  *  - Do not sleep between starting the asynchronous task that will fire
  *    SIG_SINGLE, and the call to  sig_wait().
  *  - Do not call system functions that may implicitly sleep, such as
- *    timer_delayTickes().
+ *    timer_delayTicks().
  *
  * \version $Id$
- *
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #include "signal.h"
 
+#include "cfg/cfg_timer.h"
 #include <cfg/debug.h>
-#include <drv/timer.h>
+#include <cfg/depend.h>
+
+#include <cpu/irq.h>
 #include <kern/proc.h>
 #include <kern/proc_p.h>
- 
+
 
 #if CONFIG_KERN_SIGNALS
 
+// Check config dependencies
+CONFIG_DEPEND(CONFIG_KERN_SIGNALS, CONFIG_KERN);
+
 /**
  * Check if any of the signals in \a sigs has occurred and clear them.
+ *
  * \return the signals that have occurred.
  */
 sigmask_t sig_check(sigmask_t sigs)
 {
        sigmask_t result;
-       cpuflags_t flags;
+       cpu_flags_t flags;
 
        IRQ_SAVE_DISABLE(flags);
        result = CurrentProcess->sig_recv & sigs;
@@ -135,18 +140,22 @@ sigmask_t sig_check(sigmask_t sigs)
 sigmask_t sig_wait(sigmask_t sigs)
 {
        sigmask_t result;
-       cpuflags_t flags;
+       cpu_flags_t flags;
+
+       /* Sleeping with IRQs disabled or preemption forbidden is illegal */
+       IRQ_ASSERT_ENABLED();
+       ASSERT(proc_preemptAllowed());
 
        /*
         * This is subtle: there's a race condition where a concurrent
-        * process or an interrupt calls sig_signal() to set a bit in
-        * out sig_recv just after we have checked for it, but before
-        * we've set sig_wait to tell them we want to be awaken.
+        * process or an interrupt may call sig_signal() to set a bit in
+        * Process.sig_recv just after we have checked for it, but before
+        * we've set Process.sig_wait to let them know we want to be awaken.
         *
-        * In this case, we'd deadlock with the signal bit already
-        * set and the process never being reinserted into the ready
-        * list.
+        * In this case, we'd deadlock with the signal bit already set
+        * and the process never being reinserted into the ready list.
         */
+       // FIXME: just use IRQ_DISABLE() here
        IRQ_SAVE_DISABLE(flags);
 
        /* Loop until we get at least one of the signals */
@@ -159,13 +168,13 @@ sigmask_t sig_wait(sigmask_t sigs)
                CurrentProcess->sig_wait = sigs;
 
                /*
-                * Go to sleep and proc_schedule() another process.
+                * Go to sleep and proc_switch() to another process.
                 *
-                * We re-enable IRQs because proc_schedule() does not
+                * We re-enable IRQs because proc_switch() does not
                 * guarantee to save and restore the interrupt mask.
                 */
                IRQ_RESTORE(flags);
-               proc_schedule();
+               proc_switch();
                IRQ_SAVE_DISABLE(flags);
 
                /*
@@ -185,6 +194,9 @@ sigmask_t sig_wait(sigmask_t sigs)
        return result;
 }
 
+#if CONFIG_TIMER_EVENTS
+
+#include <drv/timer.h>
 /**
  * Sleep until any of the signals in \a sigs or \a timeout ticks elapse.
  * If the timeout elapse a SIG_TIMEOUT is added to the received signal(s).
@@ -195,7 +207,7 @@ sigmask_t sig_waitTimeout(sigmask_t sigs, ticks_t timeout)
 {
        Timer t;
        sigmask_t res;
-       cpuflags_t flags;
+       cpu_flags_t flags;
 
        ASSERT(!sig_check(SIG_TIMEOUT));
        ASSERT(!(sigs & SIG_TIMEOUT));
@@ -215,6 +227,8 @@ sigmask_t sig_waitTimeout(sigmask_t sigs, ticks_t timeout)
        return res;
 }
 
+#endif // CONFIG_TIMER_EVENTS
+
 
 /**
  * Send the signals \a sigs to the process \a proc.
@@ -224,7 +238,7 @@ sigmask_t sig_waitTimeout(sigmask_t sigs, ticks_t timeout)
  */
 void sig_signal(Process *proc, sigmask_t sigs)
 {
-       cpuflags_t flags;
+       cpu_flags_t flags;
 
        /* See comment in sig_wait() for why this protection is necessary */
        IRQ_SAVE_DISABLE(flags);