X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fsignal.c;h=31cf3b7e2ca24b42db71f2ebd7bc7832d0a1ee7c;hb=99fafc49f3b2d50abb2d7b8b4cbbd3be8e107bef;hp=0af4f3992510ac07861bf7af9622026c0391c859;hpb=d6f35150fc5cdd120673ee4e245f28bac51e1d7a;p=bertos.git

diff --git a/kern/signal.c b/kern/signal.c
old mode 100755
new mode 100644
index 0af4f399..31cf3b7e
--- a/kern/signal.c
+++ b/kern/signal.c
@@ -1,9 +1,34 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * 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.
+ *
  * -->
  *
  * \brief IPC signals implementation.
@@ -64,62 +89,44 @@
  * \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.
- *
- */
-
 #include "signal.h"
-#include "proc.h"
-#include "proc_p.h"
-#include "hw.h"
 
-// FIXME
+#include <cfg/debug.h>
+#include <drv/timer.h>
+#include <kern/proc.h>
+#include <kern/proc_p.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.
+ * \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;
 }
 
 
-/*!
+/**
  * Sleep until any of the signals in \a sigs occurs.
- * Return the signal(s) that have awaked the process.
+ * \return the signal(s) that have awoken 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,30 +134,65 @@ 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;
 }
 
+/**
+ * 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)
+{
+	Timer t;
+	sigmask_t res;
+	cpuflags_t flags;
+
+	ASSERT(!sig_check(SIG_TIMEOUT));
+	ASSERT(!(sigs & SIG_TIMEOUT));
+ 	/* IRQ are needed to run timer */
+	ASSERT(IRQ_ENABLED());
+
+	timer_set_event_signal(&t, proc_current(), SIG_TIMEOUT);
+	timer_setDelay(&t, timeout);
+	timer_add(&t);
+	res = sig_wait(SIG_TIMEOUT | sigs);
+
+	IRQ_SAVE_DISABLE(flags);
+	/* Remove timer if sigs occur before timer signal */
+	if (!(res & SIG_TIMEOUT) && !sig_check(SIG_TIMEOUT))
+		timer_abort(&t);
+	IRQ_RESTORE(flags);
+	return res;
+}
+
 
-/*!
+/**
  * Send the signals \a sigs to the process \a proc.
- * The process will be awaken if it was waiting for any of them.
+ * The process will be awoken if it was waiting for any of them.
  *
  * \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;
 
-	/* Check if process needs to be awaken */
+	/* Check if process needs to be awoken */
 	if (proc->sig_recv & proc->sig_wait)
 	{
 		/* Wake up process and enqueue in ready list */
@@ -158,7 +200,7 @@ void sig_signal(Process *proc, sigset_t sigs)
 		SCHED_ENQUEUE(proc);
 	}
 
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 }
 
 #endif /* CONFIG_KERN_SIGNALS */