Merge branch 'v3-stable' into beta, conclude fix for race

Conflicts:
	ChangeLog
	runtime/msg.c

2 files changed, 6 insertions, 2 deletions

diff --git a/runtime/msg.c b/runtime/msg.c
index 038e002a..b995ac53 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -190,6 +190,7 @@ static void MsgPrepareEnqueueLockingCase(msg_t *pThis)
 	 * rgerhards, 2008-07-14
 	 */
 	pthread_mutexattr_destroy(&pThis->mutAttr);
+	pThis->bDoLock = 1;
 	ENDfunc
 }
 
@@ -199,14 +200,16 @@ static void MsgLockLockingCase(msg_t *pThis)
 {
 	/* DEV debug only! dbgprintf("MsgLock(0x%lx)\n", (unsigned long) pThis); */
 	assert(pThis != NULL);
-	pthread_mutex_lock(&pThis->mut);
+	if(pThis->bDoLock == 1) /* TODO: this is a testing hack, we should find a way with better performance! -- rgerhards, 2009-01-27 */
+		pthread_mutex_lock(&pThis->mut);
 }
 
 static void MsgUnlockLockingCase(msg_t *pThis)
 {
 	/* DEV debug only! dbgprintf("MsgUnlock(0x%lx)\n", (unsigned long) pThis); */
 	assert(pThis != NULL);
-	pthread_mutex_unlock(&pThis->mut);
+	if(pThis->bDoLock == 1) /* TODO: this is a testing hack, we should find a way with better performance! -- rgerhards, 2009-01-27 */
+		pthread_mutex_unlock(&pThis->mut);
 }
 
 /* delete the mutex object on message destruction (locking case)
diff --git a/runtime/msg.h b/runtime/msg.h
index 21cb2c64..1bad9c66 100644
--- a/runtime/msg.h
+++ b/runtime/msg.h
@@ -51,6 +51,7 @@
 struct msg {
 	BEGINobjInstance;	/* Data to implement generic object - MUST be the first data element! */
 	pthread_mutexattr_t mutAttr;
+short bDoLock; /* use the mutex? */
 	pthread_mutex_t mut;
 	int	iRefCount;	/* reference counter (0 = unused) */
 	short	bParseHOSTNAME;	/* should the hostname be parsed from the message? */