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

Applied patch #1677782 (Lock with Timeout for wxMutex, originally patch #1671637)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2007-03-10 14:27:38 +00:00
parent e2dc45d8f1
commit ee864b6db4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os2/thread.cpp
View File

@@ -96,7 +96,8 @@ public:
bool IsOk() const { return m_vMutex != NULL; } bool IsOk() const { return m_vMutex != NULL; }
wxMutexError Lock() { return LockTimeout(SEM_INDEFINITE_WAIT); } wxMutexError Lock() { return LockTimeout(SEM_INDEFINITE_WAIT); }
wxMutexError TryLock() { return LockTimeout(SEM_IMMEDIATE_RETURN); } wxMutexError Lock(unsigned long ms) { return LockTimeout(ms); }
wxMutexError TryLock();
wxMutexError Unlock(); wxMutexError Unlock();
private: private:
@@ -127,6 +128,14 @@ wxMutexInternal::~wxMutexInternal()
} }
} }
wxMutexError wxMutexInternal::TryLock()
{
const wxMutexError rc = LockTimeout( SEM_IMMEDIATE_RETURN );
// we have a special return code for timeout in this case
return rc == wxMUTEX_TIMEOUT ? wxMUTEX_BUSY : rc;
}
wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds) wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
{ {
APIRET ulrc; APIRET ulrc;
@@ -136,6 +145,7 @@ wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
switch (ulrc) switch (ulrc)
{ {
case ERROR_TIMEOUT: case ERROR_TIMEOUT:
return wxMUTEX_TIMEOUT;
case ERROR_TOO_MANY_SEM_REQUESTS: case ERROR_TOO_MANY_SEM_REQUESTS:
return wxMUTEX_BUSY; return wxMUTEX_BUSY;