X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fsem.c;h=05488e4c2fab64d3b057a6d9a5b5c2d526451514;hb=680ecaecd7ed77d044fbf333ce97e533b04bbfa3;hp=2262cb081d8306693cc13036903c1d0a4f92f69f;hpb=e05dacc96872c22d234af216d0728e46e8e222e0;p=bertos.git

diff --git a/kern/sem.c b/kern/sem.c
index 2262cb08..05488e4c 100755
--- a/kern/sem.c
+++ b/kern/sem.c
@@ -1,8 +1,8 @@
 /*!
  * \file
  * <!--
- * Copyright 2001,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999,2000,2001 Bernardo Innocenti <bernie@develer.com>
+ * 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.
  * -->
  *
@@ -15,6 +15,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2004/11/28 23:20:25  bernie
+ *#* Remove obsolete INITLIST macro.
+ *#*
+ *#* 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).
  *#*
@@ -29,7 +35,6 @@
  *#*
  *#* Revision 1.1  2004/05/23 17:27:00  bernie
  *#* Import kern/ subdirectory.
- *#*
  *#*/
 
 #include "sem.h"
@@ -40,11 +45,11 @@
 
 
 /*!
- * \brief Initialize a Semaphore structure
+ * \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;
 }
@@ -63,19 +68,18 @@ void sem_init(struct Semaphore *s)
  */
 bool sem_attempt(struct Semaphore *s)
 {
-	cpuflags_t flags;
-	DISABLE_IRQSAVE(flags);
+	bool result = false;
 
+	proc_forbid();
 	if ((!s->owner) || (s->owner == CurrentProcess))
 	{
 		s->owner = CurrentProcess;
 		s->nest_count++;
-		ENABLE_INTS;
-		return true;
+		result = true;
 	}
+	proc_permit();
 
-	ENABLE_IRQRESTORE(flags);
-	return false;
+	return result;
 }
 
 
@@ -98,21 +102,20 @@ bool sem_attempt(struct Semaphore *s)
  */
 void sem_obtain(struct Semaphore *s)
 {
-	cpuflags_t flags;
-	DISABLE_IRQSAVE(flags);
+	proc_forbid();
 
 	/* Is the semaphore already locked by another process? */
 	if (UNLIKELY(s->owner && (s->owner != CurrentProcess)))
 	{
 		/* Append calling process to the wait queue */
 		ADDTAIL(&s->wait_queue, (Node *)CurrentProcess);
-		ENABLE_IRQRESTORE(flags);
 
 		/*
 		 * We will wake up only when the current owner calls
 		 * sem_release(). Then, the semaphore will already
 		 * be locked for us.
 		 */
+		proc_permit();
 		proc_schedule();
 	}
 	else
@@ -120,13 +123,13 @@ void sem_obtain(struct Semaphore *s)
 		/* The semaphore was free: lock it */
 		s->owner = CurrentProcess;
 		s->nest_count++;
-		ENABLE_IRQRESTORE(flags);
+		proc_permit();
 	}
 }
 
 
 /*!
- * \brief Releases a lock on a previously locked semaphore.
+ * \brief Release a lock on a previously locked semaphore.
  *
  * If the nesting count of the semaphore reaches zero,
  * the next process waiting for it will be awaken.
@@ -140,12 +143,11 @@ void sem_obtain(struct Semaphore *s)
  */
 void sem_release(struct Semaphore *s)
 {
-	cpuflags_t flags;
-	DISABLE_IRQSAVE(flags);
+	proc_forbid();
 
 	/*
 	 * Decrement nesting count and check if the semaphore
-	 * has been fully unlocked
+	 * has been fully unlocked.
 	 */
 	if (--s->nest_count == 0)
 	{
@@ -155,7 +157,7 @@ void sem_release(struct Semaphore *s)
 		s->owner = NULL;
 
 		/* Give semaphore to the first applicant, if any */
-		if ((proc = (Process*)REMHEAD(&s->wait_queue)))
+		if (UNLIKELY((proc = (Process *)REMHEAD(&s->wait_queue))))
 		{
 			s->nest_count = 1;
 			s->owner = proc;
@@ -163,6 +165,5 @@ void sem_release(struct Semaphore *s)
 		}
 	}
 
-	ENABLE_IRQRESTORE(flags);
+	proc_permit();
 }
-