X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fsignal.c;h=2b3a191fe06b7a94194d45e9adc142b511cffcf2;hb=97e93eec653e38a04e94e5191bdbf5ea48edde96;hp=37a37a255196d5655ee35ce45273932a54c81475;hpb=6a3c9d13073fcab59f86255408e5371804d5d455;p=bertos.git
diff --git a/bertos/kern/signal.c b/bertos/kern/signal.c
index 37a37a25..2b3a191f 100644
--- a/bertos/kern/signal.c
+++ b/bertos/kern/signal.c
@@ -75,9 +75,7 @@
*
* - Synchronous-signal delivery:
*
- * P1__ __P2
- * \ /
- * \__sig_send()____proc_wakeup()__/
+ * [P1]____sig_send()____proc_wakeup()____[P2]
*
*
* In the asynchronous case, the process is scheduled for execution as a
@@ -87,9 +85,7 @@
*
* - Asynchronous-signal delivery:
*
- * P1__ __P1__ __P2
- * \ / \ /
- * \__sig_post()__/ \__proc_schedule()__/
+ * [P1]____sig_post()____[P1]____proc_schedule()____[P2]
*
*
* In this way, any execution context, including an interrupt handler, can
@@ -126,7 +122,6 @@
* - Do not call system functions that may implicitly sleep, such as
* timer_delayTicks().
*
- * \version $Id$
* \author Bernie Innocenti
*/
@@ -146,30 +141,7 @@
// 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;
- cpu_flags_t flags;
-
- IRQ_SAVE_DISABLE(flags);
- result = current_process->sig_recv & sigs;
- current_process->sig_recv &= ~sigs;
- IRQ_RESTORE(flags);
-
- return result;
-}
-
-
-/**
- * Sleep until any of the signals in \a sigs occurs.
- * \return the signal(s) that have awoken the process.
- */
-sigmask_t sig_wait(sigmask_t sigs)
+sigmask_t sig_waitSignal(Signal *s, sigmask_t sigs)
{
sigmask_t result;
@@ -189,13 +161,13 @@ sigmask_t sig_wait(sigmask_t sigs)
IRQ_DISABLE;
/* Loop until we get at least one of the signals */
- while (!(result = current_process->sig_recv & sigs))
+ while (!(result = s->recv & sigs))
{
/*
* Tell "them" that we want to be awaken when any of these
* signals arrives.
*/
- current_process->sig_wait = sigs;
+ s->wait = sigs;
/* Go to sleep and proc_switch() to another process. */
proc_switch();
@@ -205,12 +177,12 @@ sigmask_t sig_wait(sigmask_t sigs)
* least one of the signals we were expecting must have been
* delivered to us.
*/
- ASSERT(!current_process->sig_wait);
- ASSERT(current_process->sig_recv & sigs);
+ ASSERT(!s->wait);
+ ASSERT(s->recv & sigs);
}
/* Signals found: clear them and return */
- current_process->sig_recv &= ~sigs;
+ s->recv &= ~sigs;
IRQ_ENABLE;
return result;
@@ -219,31 +191,30 @@ sigmask_t sig_wait(sigmask_t sigs)
#if CONFIG_TIMER_EVENTS
#include
-/**
- * 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).
- * \return the signal(s) that have awoken the process.
- * \note Caller must check return value to check which signal awoke the process.
- */
-sigmask_t sig_waitTimeout(sigmask_t sigs, ticks_t timeout)
+
+sigmask_t sig_waitTimeoutSignal(Signal *s, sigmask_t sigs, ticks_t timeout,
+ Hook func, iptr_t data)
{
Timer t;
sigmask_t res;
cpu_flags_t flags;
- ASSERT(!sig_check(SIG_TIMEOUT));
+ ASSERT(!sig_checkSignal(s, SIG_TIMEOUT));
ASSERT(!(sigs & SIG_TIMEOUT));
/* IRQ are needed to run timer */
ASSERT(IRQ_ENABLED());
- timer_set_event_signal(&t, proc_current(), SIG_TIMEOUT);
+ if (func)
+ timer_setSoftint(&t, func, data);
+ else
+ timer_set_event_signal(&t, proc_current(), SIG_TIMEOUT);
timer_setDelay(&t, timeout);
timer_add(&t);
- res = sig_wait(SIG_TIMEOUT | sigs);
+ res = sig_waitSignal(s, SIG_TIMEOUT | sigs);
IRQ_SAVE_DISABLE(flags);
/* Remove timer if sigs occur before timer signal */
- if (!(res & SIG_TIMEOUT) && !sig_check(SIG_TIMEOUT))
+ if (!(res & SIG_TIMEOUT) && !sig_checkSignal(s, SIG_TIMEOUT))
timer_abort(&t);
IRQ_RESTORE(flags);
return res;
@@ -251,22 +222,21 @@ sigmask_t sig_waitTimeout(sigmask_t sigs, ticks_t timeout)
#endif // CONFIG_TIMER_EVENTS
-INLINE void __sig_signal(Process *proc, sigmask_t sigs, bool wakeup)
+INLINE void __sig_signal(Signal *s, Process *proc, sigmask_t sigs, bool wakeup)
{
cpu_flags_t flags;
- if (UNLIKELY(proc == current_process))
- return;
-
IRQ_SAVE_DISABLE(flags);
/* Set the signals */
- proc->sig_recv |= sigs;
+ s->recv |= sigs;
/* Check if process needs to be awoken */
- if (proc->sig_recv & proc->sig_wait)
+ if (s->recv & s->wait)
{
- proc->sig_wait = 0;
+ ASSERT(proc != current_process);
+
+ s->wait = 0;
if (wakeup)
proc_wakeup(proc);
else
@@ -275,34 +245,18 @@ INLINE void __sig_signal(Process *proc, sigmask_t sigs, bool wakeup)
IRQ_RESTORE(flags);
}
-/**
- * Send the signals \a sigs to the process \a proc and immeditaly dispatch it
- * for execution.
- *
- * The process will be awoken if it was waiting for any of them and immediately
- * dispatched for execution.
- *
- * \note This function can't be called from IRQ context, use sig_post()
- * instead.
- */
-void sig_send(Process *proc, sigmask_t sigs)
+void sig_sendSignal(Signal *s, Process *proc, sigmask_t sigs)
{
ASSERT_USER_CONTEXT();
IRQ_ASSERT_ENABLED();
ASSERT(proc_preemptAllowed());
- __sig_signal(proc, sigs, true);
+ __sig_signal(s, proc, sigs, true);
}
-/**
- * Send the signals \a sigs to the process \a proc.
- * The process will be awoken if it was waiting for any of them.
- *
- * \note This call is interrupt safe.
- */
-void sig_post(Process *proc, sigmask_t sigs)
+void sig_postSignal(Signal *s, Process *proc, sigmask_t sigs)
{
- __sig_signal(proc, sigs, false);
+ __sig_signal(s, proc, sigs, false);
}
#endif /* CONFIG_KERN_SIGNALS */