Changeset 79

Timestamp:

06/27/10 08:15:56 (23 months ago)

Author:

jc.lefebvre

Message:

Corrected a bug in the Thread_PThread class which occurred when a thread already owned the thread's mutex while an another tried to send a signal to it (this is exactly the same bug as the one from Thread_Win previously).

Location:

trunk

Files:

• prj/msvc90/nCore.suo (modified) (previous)
• src/nCore/Thread_PThread.cpp (modified) (2 diffs)
• src/nCore/_nCoreInternal.h (modified) (1 diff)

trunk/src/nCore/Thread_PThread.cpp

@@ -163 +163 @@
   // acquire mutex
   eMutexState = m_Mutex.TryAcquire();
-  if((eMutexState != ThreadMutex::MUTEX_OK) && (eMutexState != ThreadMutex::MUTEX_ALREADYLOCKED))
+  if((eMutexState == ThreadMutex::MUTEX_ALREADYLOCKED) || (eMutexState != ThreadMutex::MUTEX_OK))
   {
     if(bJustTry)
@@ -173 +173 @@
     {
       eMutexState = m_Mutex.Acquire();
-      if((eMutexState != ThreadMutex::MUTEX_OK) && (eMutexState != ThreadMutex::MUTEX_ALREADYLOCKED))
+      if(eMutexState != ThreadMutex::MUTEX_OK)
         XTHROWEXCODE(EXCODE_MUTEX_NOTACQUIRED);
-
-      XASSERT(eMutexState == ThreadMutex::MUTEX_OK);
     }
   }

trunk/src/nCore/_nCoreInternal.h

@@ -44 +44 @@
 //---------------------------------------------------------------------------
 #define NCORE_BRAND_NAME            "nCore"
-#define NCORE_BRAND_VERSION_STRING  "5.06.0226" // keep this value Version3() compatible !
+#define NCORE_BRAND_VERSION_STRING  "5.06.0229" // keep this value Version3() compatible !
 #define NCORE_BRAND_WEBLINK         "http://ncore.jcl.name/"
 #define NCORE_BRAND_AUTHOR          "Jean-Charles Lefebvre <jcl@jcl.name>"