Hunk sfuggito al commit precedente (aggiornamento kernel)

[bertos.git] / kern / signal.c

diff --git a/kern/signal.c b/kern/signal.c
index 3bc9aab7f8cb1b5bdd27e48366c5c8e4ab3de178..62cfd74c1a9425d3c861a7bd290174817f0f8576 100755 (executable)
--- a/kern/signal.c
+++ b/kern/signal.c
@@ -1,9 +1,9 @@
-/**
+/*!
  * \file
  * <!--
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999,2000,2001 Bernardo Innocenti <bernie@develer.com>
- * All Rights Reserved.
+ * This file is part of DevLib - See devlib/README for information.
  * -->
  *
  * \brief IPC signals implementation.
@@ -19,6 +19,17 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -39,11 +50,12 @@
 sigset_t sig_check(sigset_t sigs)
 {
        sigset_t result;
+       cpuflags_t flags;
 
-       DISABLE_INTS;
+       DISABLE_IRQSAVE(flags);
        result = CurrentProcess->sig_recv & sigs;
        CurrentProcess->sig_recv &= ~sigs;
-       ENABLE_INTS;
+       ENABLE_IRQRESTORE(flags);
        return result;
 }
 
@@ -55,24 +67,22 @@ sigset_t sig_check(sigset_t sigs)
 sigset_t sig_wait(sigset_t sigs)
 {
        sigset_t result;
+       cpuflags_t flags;
 
-       DISABLE_INTS;
+       DISABLE_IRQSAVE(flags);
 
-       for(;;)
+       /* Loop until we get at least one of the signals */
+       while (!(result = CurrentProcess->sig_recv & sigs))
        {
-               /* Check if we got at least one of the signals */
-               if ((result = CurrentProcess->sig_recv & sigs))
-               {
-                       /* Yes, clear signals and return */
-                       CurrentProcess->sig_recv &= ~sigs;
-                       ENABLE_INTS;
-                       return result;
-               }
-
-               /* No, go to sleep and proc_schedule() another process */
+               /* go to sleep and proc_schedule() another process */
                CurrentProcess->sig_wait = sigs;
                proc_schedule();
        }
+
+       /* Signals found: clear them and return */
+       CurrentProcess->sig_recv &= ~sigs;
+       ENABLE_IRQRESTORE(flags);
+       return result;
 }
 
 
@@ -80,32 +90,12 @@ sigset_t sig_wait(sigset_t sigs)
  * Send the signals \a sigs to the process \a proc.
  * The process will be awaken if it was waiting for any of them.
  *
- * This call is interrupt safe (no \c DISABLE_INTS/ENABLE_INTS protection)
- */
-void _sig_signal(Process *proc, sigset_t sigs)
-{
-       /* Set the signals */
-       proc->sig_recv |= sigs;
-
-       /* Check if process needs to be awaken */
-       if (proc->sig_recv & proc->sig_wait)
-       {
-               /* Wake up process and enqueue in ready list */
-               proc->sig_wait = 0;
-               SCHED_ENQUEUE(proc);
-       }
-}
-
-
-/*!
- * Same as _sig_signal() with interrupt protection.
- *
- * \note Inlined manually because some compilers are too
- *       stupid to it automatically.
+ * \note This call is interrupt safe.
  */
 void sig_signal(Process *proc, sigset_t sigs)
 {
-       DISABLE_INTS;
+       cpuflags_t flags;
+       DISABLE_IRQSAVE(flags);
 
        /* Set the signals */
        proc->sig_recv |= sigs;
@@ -118,7 +108,7 @@ void sig_signal(Process *proc, sigset_t sigs)
                SCHED_ENQUEUE(proc);
        }
 
-       ENABLE_INTS;
+       ENABLE_IRQRESTORE(flags);
 }
 
 #endif /* CONFIG_KERN_SIGNALS */