Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / kern / sem.c

diff --git a/kern/sem.c b/kern/sem.c
old mode 100755 (executable)
new mode 100644 (file)
index 05488e4..304e64f
--- a/kern/sem.c
+++ b/kern/sem.c
@@ -1,9 +1,9 @@
-/*!
+/**
  * \file
  * <!--
  * 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.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Semaphore based synchronization services.
@@ -15,6 +15,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.12  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.11  2006/02/24 01:17:05  bernie
+ *#* Update for new emulator.
+ *#*
+ *#* Revision 1.10  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.9  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.8  2005/01/22 04:20:42  bernie
+ *#* Add integrity checks.
+ *#*
  *#* Revision 1.7  2004/11/28 23:20:25  bernie
  *#* Remove obsolete INITLIST macro.
  *#*
@@ -38,13 +53,20 @@
  *#*/
 
 #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)
+{
+       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)
@@ -55,7 +77,7 @@ void sem_init(struct Semaphore *s)
 }
 
 
-/*!
+/**
  * \brief Attempt to lock a semaphore without waiting.
  *
  * \return true in case of success, false if the semaphore
@@ -71,6 +93,7 @@ bool sem_attempt(struct Semaphore *s)
        bool result = false;
 
        proc_forbid();
+       sem_verify(s);
        if ((!s->owner) || (s->owner == CurrentProcess))
        {
                s->owner = CurrentProcess;
@@ -83,7 +106,7 @@ bool sem_attempt(struct Semaphore *s)
 }
 
 
-/*!
+/**
  * \brief Lock a semaphore.
  *
  * If the semaphore is already owned by another process, the caller
@@ -103,6 +126,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)))
@@ -120,6 +144,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++;
@@ -128,7 +154,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,
@@ -144,6 +170,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
@@ -157,7 +186,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;