projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweaks for avr-libc 1.2.x.
[bertos.git]
/
kern
/
sem.c
diff --git
a/kern/sem.c
b/kern/sem.c
index 9b2f9743b6146d8de757b3c2ece16de102465e87..eab3e5db475d26a1d2b46b5eb46429c69d30ae7c 100755
(executable)
--- a/
kern/sem.c
+++ b/
kern/sem.c
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.
+ *#*
*#* Revision 1.6 2004/10/21 10:57:21 bernie
*#* Use proc_forbid()/proc_permit().
*#*
*#* Revision 1.6 2004/10/21 10:57:21 bernie
*#* Use proc_forbid()/proc_permit().
*#*
@@
-39,6
+45,14
@@
#include "proc_p.h"
#include "signal.h"
#include "hw.h"
#include "proc_p.h"
#include "signal.h"
#include "hw.h"
+#include <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
+}
/*!
/*!
@@
-46,7
+60,7
@@
*/
void sem_init(struct Semaphore *s)
{
*/
void sem_init(struct Semaphore *s)
{
-
INITLIS
T(&s->wait_queue);
+
LIST_INI
T(&s->wait_queue);
s->owner = NULL;
s->nest_count = 0;
}
s->owner = NULL;
s->nest_count = 0;
}
@@
-68,6
+82,7
@@
bool sem_attempt(struct Semaphore *s)
bool result = false;
proc_forbid();
bool result = false;
proc_forbid();
+ sem_verify(s);
if ((!s->owner) || (s->owner == CurrentProcess))
{
s->owner = CurrentProcess;
if ((!s->owner) || (s->owner == CurrentProcess))
{
s->owner = CurrentProcess;
@@
-100,6
+115,7
@@
bool sem_attempt(struct Semaphore *s)
void sem_obtain(struct Semaphore *s)
{
proc_forbid();
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)))
/* Is the semaphore already locked by another process? */
if (UNLIKELY(s->owner && (s->owner != CurrentProcess)))
@@
-117,6
+133,8
@@
void sem_obtain(struct Semaphore *s)
}
else
{
}
else
{
+ ASSERT(ISLISTEMPTY(&s->wait_queue));
+
/* The semaphore was free: lock it */
s->owner = CurrentProcess;
s->nest_count++;
/* The semaphore was free: lock it */
s->owner = CurrentProcess;
s->nest_count++;
@@
-141,6
+159,9
@@
void sem_obtain(struct Semaphore *s)
void sem_release(struct Semaphore *s)
{
proc_forbid();
void sem_release(struct Semaphore *s)
{
proc_forbid();
+ sem_verify(s);
+
+ ASSERT(s->owner == CurrentProcess);
/*
* Decrement nesting count and check if the semaphore
/*
* Decrement nesting count and check if the semaphore