Update for new emulator.

[bertos.git] / kern / signal.c

diff --git a/kern/signal.c b/kern/signal.c
index 0af4f3992510ac07861bf7af9622026c0391c859..841ac6eb9d37c0a00135aecfb2efa39b2e2fe125 100755 (executable)
--- a/kern/signal.c
+++ b/kern/signal.c
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999, 2000, 2001 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief IPC signals implementation.
@@ -64,48 +64,73 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*
- * $Log$
- * Revision 1.5  2004/08/04 21:50:33  bernie
- * Add extensive documentation.
- *
- * Revision 1.4  2004/07/30 14:30:27  rasky
- * Resa la sig_signal interrupt safe (con il nuovo scheduler IRQ-safe)
- * Rimossa event_doIntr (ora inutile) e semplificata la logica delle macro con funzioni inline
- *
- * Revision 1.3  2004/07/30 14:24:16  rasky
- * Task switching con salvataggio perfetto stato di interrupt (SR)
- * Kernel monitor per dump informazioni su stack dei processi
- *
- * Revision 1.2  2004/06/03 11:27:09  bernie
- * Add dual-license information.
- *
- * Revision 1.1  2004/05/23 17:27:00  bernie
- * Import kern/ subdirectory.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.13  2006/02/24 01:17:05  bernie
+ *#* Update for new emulator.
+ *#*
+ *#* Revision 1.12  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.11  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.10  2004/12/13 12:07:06  bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
+ *#* Revision 1.9  2004/12/08 08:57:35  bernie
+ *#* Rename sigset_t to sigmask_t.
+ *#*
+ *#* Revision 1.8  2004/09/14 21:06:44  bernie
+ *#* Use debug.h instead of kdebug.h.
+ *#*
+ *#* Revision 1.7  2004/08/25 14:12:09  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.6  2004/08/14 19:37:57  rasky
+ *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *#*
+ *#* Revision 1.5  2004/08/04 21:50:33  bernie
+ *#* Add extensive documentation.
+ *#*
+ *#* Revision 1.4  2004/07/30 14:30:27  rasky
+ *#* Resa la sig_signal interrupt safe (con il nuovo scheduler IRQ-safe)
+ *#* Rimossa event_doIntr (ora inutile) e semplificata la logica delle macro con funzioni inline
+ *#*
+ *#* Revision 1.3  2004/07/30 14:24:16  rasky
+ *#* Task switching con salvataggio perfetto stato di interrupt (SR)
+ *#* Kernel monitor per dump informazioni su stack dei processi
+ *#*
+ *#* Revision 1.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1  2004/05/23 17:27:00  bernie
+ *#* Import kern/ subdirectory.
+ *#*
+ *#*/
 
 #include "signal.h"
-#include "proc.h"
-#include "proc_p.h"
-#include "hw.h"
 
-// FIXME
+#include <kern/proc.h>
+#include <kern/proc_p.h>
+#include <cfg/debug.h>
+
 #if CONFIG_KERN_SIGNALS
 
 /*!
  * Check if any of the signals in \a sigs has occurred and clear them.
  * Return the signals that have occurred.
  */
-sigset_t sig_check(sigset_t sigs)
+sigmask_t sig_check(sigmask_t sigs)
 {
-       sigset_t result;
+       sigmask_t result;
        cpuflags_t flags;
 
-       DISABLE_IRQSAVE(flags);
+       IRQ_SAVE_DISABLE(flags);
        result = CurrentProcess->sig_recv & sigs;
        CurrentProcess->sig_recv &= ~sigs;
-       ENABLE_IRQRESTORE(flags);
+       IRQ_RESTORE(flags);
+
        return result;
 }
 
@@ -114,12 +139,12 @@ sigset_t sig_check(sigset_t sigs)
  * Sleep until any of the signals in \a sigs occurs.
  * Return the signal(s) that have awaked the process.
  */
-sigset_t sig_wait(sigset_t sigs)
+sigmask_t sig_wait(sigmask_t sigs)
 {
-       sigset_t result;
+       sigmask_t result;
        cpuflags_t flags;
 
-       DISABLE_IRQSAVE(flags);
+       IRQ_SAVE_DISABLE(flags);
 
        /* Loop until we get at least one of the signals */
        while (!(result = CurrentProcess->sig_recv & sigs))
@@ -127,11 +152,16 @@ sigset_t sig_wait(sigset_t sigs)
                /* go to sleep and proc_schedule() another process */
                CurrentProcess->sig_wait = sigs;
                proc_schedule();
+
+               /* When we come back here, a signal must be arrived */
+               ASSERT(!CurrentProcess->sig_wait);
+               ASSERT(CurrentProcess->sig_recv);
        }
 
        /* Signals found: clear them and return */
        CurrentProcess->sig_recv &= ~sigs;
-       ENABLE_IRQRESTORE(flags);
+
+       IRQ_RESTORE(flags);
        return result;
 }
 
@@ -142,10 +172,10 @@ sigset_t sig_wait(sigset_t sigs)
  *
  * \note This call is interrupt safe.
  */
-void sig_signal(Process *proc, sigset_t sigs)
+void sig_signal(Process *proc, sigmask_t sigs)
 {
        cpuflags_t flags;
-       DISABLE_IRQSAVE(flags);
+       IRQ_SAVE_DISABLE(flags);
 
        /* Set the signals */
        proc->sig_recv |= sigs;
@@ -158,7 +188,7 @@ void sig_signal(Process *proc, sigset_t sigs)
                SCHED_ENQUEUE(proc);
        }
 
-       ENABLE_IRQRESTORE(flags);
+       IRQ_RESTORE(flags);
 }
 
 #endif /* CONFIG_KERN_SIGNALS */