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

wxCriticalSection implemented using mutexes for !MSW (sample compiles again)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-11 15:51:45 +00:00
parent d1b5756b71
commit f6ddc54a65
1 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
include/wx/thread.h
View File

@@ -114,8 +114,6 @@ private:
wxMutex *m_mutex;
};
#ifdef __WXMSW__
// ----------------------------------------------------------------------------
// Critical section: this is the same as mutex but is only visible to the
// threads of the same process. For the platforms which don't have native
@@ -125,25 +123,34 @@ private:
// you should consider wxCriticalSectionLocker whenever possible instead of
// directly working with wxCriticalSection class - it is safer
class WXDLLEXPORT wxCriticalSectionInternal;
#ifdef __WXMSW__
class WXDLLEXPORT wxCriticalSectionInternal;
#define WXCRITICAL_INLINE
#else // !MSW
#define WXCRITICAL_INLINE inline
#endif // MSW/!MSW
class WXDLLEXPORT wxCriticalSection
{
public:
// ctor & dtor
wxCriticalSection();
~wxCriticalSection();
WXCRITICAL_INLINE wxCriticalSection();
WXCRITICAL_INLINE ~wxCriticalSection();
// enter the section (the same as locking a mutex)
void Enter();
void WXCRITICAL_INLINE Enter();
// leave the critical section (same as unlocking a mutex)
void Leave();
void WXCRITICAL_INLINE Leave();
private:
// no assignment operator nor copy ctor
wxCriticalSection(const wxCriticalSection&);
wxCriticalSection& operator=(const wxCriticalSection&);
#ifdef __WXMSW__
wxCriticalSectionInternal *m_critsect;
#else // !MSW
wxMutex m_mutex;
#endif // MSW/!MSW
};
// wxCriticalSectionLocker is the same to critical sections as wxMutexLocker is
@@ -164,8 +171,6 @@ private:
wxCriticalSection& m_critsect;
};
#endif
// ----------------------------------------------------------------------------
// Condition handler.
// ----------------------------------------------------------------------------
@@ -269,20 +274,6 @@ private:
void WXDLLEXPORT wxMutexGuiEnter();
void WXDLLEXPORT wxMutexGuiLeave();
// implementation only
#ifdef __WXMSW__
// unlock GUI if there are threads waiting for and lock it back when
// there are no more of them - should be called periodically by the main
// thread
void WXDLLEXPORT wxMutexGuiLeaveOrEnter();
// returns TRUE if the main thread has GUI lock
inline bool WXDLLEXPORT wxGuiOwnedByMainThread();
// wakes up the main thread if it's sleeping inside ::GetMessage()
inline void WXDLLEXPORT wxWakeUpMainThread();
#endif // MSW
#else // !wxUSE_THREADS
// no thread support
@@ -299,4 +290,29 @@ public:
~wxMutexGuiLocker() { wxMutexGuiLeave(); }
};
// -----------------------------------------------------------------------------
// implementation only until the end of file
// -----------------------------------------------------------------------------
#ifdef wxUSE_THREADS
#ifdef __WXMSW__
// unlock GUI if there are threads waiting for and lock it back when
// there are no more of them - should be called periodically by the main
// thread
void WXDLLEXPORT wxMutexGuiLeaveOrEnter();
// returns TRUE if the main thread has GUI lock
inline bool WXDLLEXPORT wxGuiOwnedByMainThread();
// wakes up the main thread if it's sleeping inside ::GetMessage()
inline void WXDLLEXPORT wxWakeUpMainThread();
#else // !MSW
// implement wxCriticalSection using mutexes
inline wxCriticalSection::wxCriticalSection() { }
inline wxCriticalSection::~wxCriticalSection() { }
inline void wxCriticalSection::Enter() { (void)m_mutex.Lock(); }
inline void wxCriticalSection::Leave() { (void)m_mutex.Unlock(); }
#endif // MSW/!MSW
#endif // wxUSE_THREADS
#endif // __THREADH__