Merge branch "preempt" in "trunk".

[bertos.git] / bertos / kern / sem.c

diff --git a/bertos/kern/sem.c b/bertos/kern/sem.c
index cc9234aa64a020531a6c1e354d93bd595fd80f6d..53ef4cc16cdfec19f33b7bf193a5b0efbee4b6cc 100644 (file)
--- a/bertos/kern/sem.c
+++ b/bertos/kern/sem.c
@@ -28,21 +28,22 @@
  *
  * Copyright 2001, 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999, 2000, 2001 Bernie Innocenti <bernie@codewiz.org>
- *
  * -->
  *
  * \brief Semaphore based synchronization services.
  *
  * \version $Id$
- *
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #include "sem.h"
+#include <cfg/debug.h>
+
+#include <cpu/irq.h> // ASSERT_IRQ_DISABLED()
+
 #include <kern/proc.h>
 #include <kern/proc_p.h>
 #include <kern/signal.h>
-#include <cfg/debug.h>
 
 INLINE void sem_verify(struct Semaphore *s)
 {
@@ -53,7 +54,6 @@ INLINE void sem_verify(struct Semaphore *s)
        ASSERT(s->nest_count < 128);   // heuristic max
 }
 
-
 /**
  * \brief Initialize a Semaphore structure.
  */
@@ -82,9 +82,9 @@ bool sem_attempt(struct Semaphore *s)
 
        proc_forbid();
        sem_verify(s);
-       if ((!s->owner) || (s->owner == CurrentProcess))
+       if ((!s->owner) || (s->owner == current_process))
        {
-               s->owner = CurrentProcess;
+               s->owner = current_process;
                s->nest_count++;
                result = true;
        }
@@ -117,10 +117,10 @@ void sem_obtain(struct Semaphore *s)
        sem_verify(s);
 
        /* Is the semaphore already locked by another process? */
-       if (UNLIKELY(s->owner && (s->owner != CurrentProcess)))
+       if (UNLIKELY(s->owner && (s->owner != current_process)))
        {
                /* Append calling process to the wait queue */
-               ADDTAIL(&s->wait_queue, (Node *)CurrentProcess);
+               ADDTAIL(&s->wait_queue, (Node *)current_process);
 
                /*
                 * We will wake up only when the current owner calls
@@ -135,7 +135,7 @@ void sem_obtain(struct Semaphore *s)
                ASSERT(LIST_EMPTY(&s->wait_queue));
 
                /* The semaphore was free: lock it */
-               s->owner = CurrentProcess;
+               s->owner = current_process;
                s->nest_count++;
                proc_permit();
        }
@@ -160,7 +160,7 @@ void sem_release(struct Semaphore *s)
        proc_forbid();
        sem_verify(s);
 
-       ASSERT(s->owner == CurrentProcess);
+       ASSERT(s->owner == current_process);
 
        /*
         * Decrement nesting count and check if the semaphore
@@ -178,7 +178,7 @@ void sem_release(struct Semaphore *s)
                {
                        s->nest_count = 1;
                        s->owner = proc;
-                       SCHED_ENQUEUE(proc);
+                       ATOMIC(SCHED_ENQUEUE(proc));
                }
        }