X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fsem.c;h=0f31fa067b9fff651945b60076adaf3e855e05f4;hb=4654a69f5df97af36ee5456d20cbccdc19012dc2;hp=9b2f9743b6146d8de757b3c2ece16de102465e87;hpb=cebc456cf0a1cae84c416712fbb2ff69659ae54f;p=bertos.git

diff --git a/kern/sem.c b/kern/sem.c
old mode 100755
new mode 100644
index 9b2f9743..0f31fa06
--- a/kern/sem.c
+++ b/kern/sem.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 2001, 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 Semaphore based synchronization services.
@@ -13,46 +38,34 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.6  2004/10/21 10:57:21  bernie
- *#* Use proc_forbid()/proc_permit().
- *#*
- *#* Revision 1.5  2004/10/21 10:48:57  bernie
- *#* sem_release(): Simplify (made by rasky on scfirm).
- *#*
- *#* Revision 1.4  2004/08/25 14:12:09  rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.3  2004/08/08 05:53:23  bernie
- *#* Use DISABLE_IRQSAVE/ENABLE_IRQRESTORE; Cleanup documentation.
- *#*
- *#* 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 "sem.h"
-#include "proc.h"
-#include "proc_p.h"
-#include "signal.h"
-#include "hw.h"
+#include <kern/proc.h>
+#include <kern/proc_p.h>
+#include <kern/signal.h>
+#include <cfg/debug.h>
+
+INLINE void sem_verify(struct Semaphore *s)
+{
+	(void)s;
+	ASSERT(s);
+	LIST_ASSERT_VALID(&s->wait_queue);
+	ASSERT(s->nest_count >= 0);
+	ASSERT(s->nest_count < 128);   // heuristic max
+}
 
 
-/*!
+/**
  * \brief Initialize a Semaphore structure.
  */
 void sem_init(struct Semaphore *s)
 {
-	INITLIST(&s->wait_queue);
+	LIST_INIT(&s->wait_queue);
 	s->owner = NULL;
 	s->nest_count = 0;
 }
 
 
-/*!
+/**
  * \brief Attempt to lock a semaphore without waiting.
  *
  * \return true in case of success, false if the semaphore
@@ -68,6 +81,7 @@ bool sem_attempt(struct Semaphore *s)
 	bool result = false;
 
 	proc_forbid();
+	sem_verify(s);
 	if ((!s->owner) || (s->owner == CurrentProcess))
 	{
 		s->owner = CurrentProcess;
@@ -80,7 +94,7 @@ bool sem_attempt(struct Semaphore *s)
 }
 
 
-/*!
+/**
  * \brief Lock a semaphore.
  *
  * If the semaphore is already owned by another process, the caller
@@ -100,6 +114,7 @@ bool sem_attempt(struct Semaphore *s)
 void sem_obtain(struct Semaphore *s)
 {
 	proc_forbid();
+	sem_verify(s);
 
 	/* Is the semaphore already locked by another process? */
 	if (UNLIKELY(s->owner && (s->owner != CurrentProcess)))
@@ -117,6 +132,8 @@ void sem_obtain(struct Semaphore *s)
 	}
 	else
 	{
+		ASSERT(LIST_EMPTY(&s->wait_queue));
+
 		/* The semaphore was free: lock it */
 		s->owner = CurrentProcess;
 		s->nest_count++;
@@ -125,7 +142,7 @@ void sem_obtain(struct Semaphore *s)
 }
 
 
-/*!
+/**
  * \brief Release a lock on a previously locked semaphore.
  *
  * If the nesting count of the semaphore reaches zero,
@@ -141,6 +158,9 @@ void sem_obtain(struct Semaphore *s)
 void sem_release(struct Semaphore *s)
 {
 	proc_forbid();
+	sem_verify(s);
+
+	ASSERT(s->owner == CurrentProcess);
 
 	/*
 	 * Decrement nesting count and check if the semaphore
@@ -154,7 +174,7 @@ void sem_release(struct Semaphore *s)
 		s->owner = NULL;
 
 		/* Give semaphore to the first applicant, if any */
-		if (UNLIKELY((proc = (Process *)REMHEAD(&s->wait_queue))))
+		if (UNLIKELY((proc = (Process *)list_remHead(&s->wait_queue))))
 		{
 			s->nest_count = 1;
 			s->owner = proc;