projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rebaked makefiles with 0.2.4 (and now with forgotten files)
[wxWidgets.git]
/
src
/
os2
/
thread.cpp
diff --git
a/src/os2/thread.cpp
b/src/os2/thread.cpp
index c292a0e61bce345396ecc6086945f330bccf631d..f0b8e6068e537e7b8aee83eaf93c1a0fd604dc0c 100644
(file)
--- a/
src/os2/thread.cpp
+++ b/
src/os2/thread.cpp
@@
-6,7
+6,6
@@
// Created: 04/22/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Neis (2003)
// Created: 04/22/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Neis (2003)
-//
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-19,15
+18,19
@@
#if wxUSE_THREADS
#if wxUSE_THREADS
-#include <stdio.h>
+#include "wx/thread.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/module.h"
+#endif //WX_PRECOMP
-#include "wx/app.h"
#include "wx/apptrait.h"
#include "wx/apptrait.h"
-#include "wx/module.h"
-#include "wx/intl.h"
#include "wx/utils.h"
#include "wx/utils.h"
-#include "wx/log.h"
-#include
"wx/thread.h"
+
+#include
<stdio.h>
#define INCL_DOSSEMAPHORES
#define INCL_DOSPROCESS
#define INCL_DOSSEMAPHORES
#define INCL_DOSPROCESS
@@
-93,7
+96,8
@@
public:
bool IsOk() const { return m_vMutex != NULL; }
wxMutexError Lock() { return LockTimeout(SEM_INDEFINITE_WAIT); }
bool IsOk() const { return m_vMutex != NULL; }
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();
private:
wxMutexError Unlock();
private:
@@
-124,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)
{
APIRET ulrc;
wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
{
APIRET ulrc;
@@
-133,6
+145,7
@@
wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
switch (ulrc)
{
case ERROR_TIMEOUT:
switch (ulrc)
{
case ERROR_TIMEOUT:
+ return wxMUTEX_TIMEOUT;
case ERROR_TOO_MANY_SEM_REQUESTS:
return wxMUTEX_BUSY;
case ERROR_TOO_MANY_SEM_REQUESTS:
return wxMUTEX_BUSY;
@@
-381,11
+394,9
@@
private:
unsigned int m_nPriority; // thread priority in "wx" units
};
unsigned int m_nPriority; // thread priority in "wx" units
};
-void wxThreadInternal::OS2ThreadStart(
- void * pParam
-)
+void wxThreadInternal::OS2ThreadStart( void * pParam )
{
{
- DWORD
dwRet;
+ DWORD dwRet;
bool bWasCancelled;
wxThread *pThread = (wxThread *)pParam;
bool bWasCancelled;
wxThread *pThread = (wxThread *)pParam;
@@
-558,13
+569,6
@@
void wxThread::Yield()
::DosSleep(0);
}
::DosSleep(0);
}
-void wxThread::Sleep(
- unsigned long ulMilliseconds
-)
-{
- ::DosSleep(ulMilliseconds);
-}
-
int wxThread::GetCPUCount()
{
ULONG CPUCount;
int wxThread::GetCPUCount()
{
ULONG CPUCount;
@@
-974,7
+978,7
@@
void WXDLLEXPORT wxWakeUpMainThread()
#endif
}
#endif
}
-void
WXDLLEXPORT wxMutexGuiEnter
()
+void
wxMutexGuiEnterImpl
()
{
// this would dead lock everything...
wxASSERT_MSG( !wxThread::IsMain(),
{
// this would dead lock everything...
wxASSERT_MSG( !wxThread::IsMain(),
@@
-996,7
+1000,7
@@
void WXDLLEXPORT wxMutexGuiEnter()
gs_pCritsectGui->Enter();
}
gs_pCritsectGui->Enter();
}
-void
WXDLLEXPORT wxMutexGuiLeave
()
+void
wxMutexGuiLeaveImpl
()
{
wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui);
{
wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui);