Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Thread updates and cleanup (m_locked, MUTEX_UNLOCKED added)

Browse Source 
* Updated the documentation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@94 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-06-14 15:28:28 +00:00
parent ee4f8c2af9
commit b89156b5db
11 changed files with 134 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk1/threadpsx.cpp
View File

@@ -51,13 +51,15 @@ wxMutex::wxMutex()
{
p_internal = new wxMutexInternal;
pthread_mutex_init(&(p_internal->p_mutex), NULL);
m_locked = false;
m_locked = 0;
}
wxMutex::~wxMutex()
{
if (m_locked)
pthread_mutex_unlock(&(p_internal->p_mutex));
if (m_locked > 0)
wxDebugMsg("wxMutex warning: freeing a locked mutex (%d locks)\n",
m_locked);
pthread_mutex_destroy(&(p_internal->p_mutex));
delete p_internal;
}
@@ -67,9 +69,8 @@ wxMutexError wxMutex::Lock()
int err;
err = pthread_mutex_lock(&(p_internal->p_mutex));
switch (err) {
case EDEADLK: return MUTEX_DEAD_LOCK;
}
if (err == EDEADLK)
return MUTEX_DEAD_LOCK;
m_locked++;
return MUTEX_NO_ERROR;
}
@@ -90,7 +91,10 @@ wxMutexError wxMutex::TryLock()
wxMutexError wxMutex::Unlock()
{
if (m_locked > 0) m_locked--;
if (m_locked > 0)
m_locked--;
else
return MUTEX_UNLOCKED;
pthread_mutex_unlock(&(p_internal->p_mutex));
return MUTEX_NO_ERROR;
}