King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add reentrance support to the pthread mutex, thx to Shen Lei

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@687 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2006-07-01 10:26:25 +00:00
parent 11e532673b
commit e3277a903d
1 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

49
include/loki/Threads.h
View file

@ -61,7 +61,7 @@
#define LOKI_DEFAULT_THREADING ::Loki::ObjectLevelLockable #define LOKI_DEFAULT_THREADING ::Loki::ObjectLevelLockable
#endif #endif
#if defined(_WIN32) #if defined(_WIN32) || defined(_WIN64)
#include <windows.h> #include <windows.h>
#else #else
#include <pthread.h> #include <pthread.h>
@ -80,11 +80,11 @@
#if defined(_WINDOWS_) || defined(_WINDOWS_H) #if defined(_WINDOWS_) || defined(_WINDOWS_H)
#define LOKI_THREADS_MUTEX(x) CRITICAL_SECTION x #define LOKI_THREADS_MUTEX(x) CRITICAL_SECTION (x);
#define LOKI_THREADS_MUTEX_INIT(x) ::InitializeCriticalSection x #define LOKI_THREADS_MUTEX_INIT(x) ::InitializeCriticalSection (x)
#define LOKI_THREADS_MUTEX_DELETE(x) ::DeleteCriticalSection x #define LOKI_THREADS_MUTEX_DELETE(x) ::DeleteCriticalSection (x)
#define LOKI_THREADS_MUTEX_LOCK(x) ::EnterCriticalSection x #define LOKI_THREADS_MUTEX_LOCK(x) ::EnterCriticalSection (x)
#define LOKI_THREADS_MUTEX_UNLOCK(x) ::LeaveCriticalSection x #define LOKI_THREADS_MUTEX_UNLOCK(x) ::LeaveCriticalSection (x)
#define LOKI_THREADS_LONG LONG #define LOKI_THREADS_LONG LONG
#define LOKI_THREADS_ATOMIC_FUNCTIONS \ #define LOKI_THREADS_ATOMIC_FUNCTIONS \
@ -105,11 +105,20 @@
#elif defined(_PTHREAD_H) || defined(_POSIX_PTHREAD_H) //POSIX threads (pthread.h) #elif defined(_PTHREAD_H) || defined(_POSIX_PTHREAD_H) //POSIX threads (pthread.h)
#define LOKI_THREADS_MUTEX(x) pthread_mutex_t x #define LOKI_THREADS_MUTEX(x) pthread_mutex_t (x);
#define LOKI_THREADS_MUTEX_INIT(x) ::pthread_mutex_init(x,0)
#define LOKI_THREADS_MUTEX_DELETE(x) ::pthread_mutex_destroy x // use reentrance support
#define LOKI_THREADS_MUTEX_LOCK(x) ::pthread_mutex_lock x #ifdef PTHREAD_MUTEX_RECURSIVE
#define LOKI_THREADS_MUTEX_UNLOCK(x) ::pthread_mutex_unlock x #define LOKI_THREADS_MUTEX_INIT(x) ::pthread_mutex_init(x, PTHREAD_MUTEX_RECURSIVE)
#elif PTHREAD_MUTEX_RECURSIVE_NP
#define LOKI_THREADS_MUTEX_INIT(x) ::pthread_mutex_init(x, PTHREAD_MUTEX_RECURSIVE_NP)
#else
#define LOKI_THREADS_MUTEX_INIT(x) ::pthread_mutex_init(x, 0)
#endif
#define LOKI_THREADS_MUTEX_DELETE(x) ::pthread_mutex_destroy (x)
#define LOKI_THREADS_MUTEX_LOCK(x) ::pthread_mutex_lock (x)
#define LOKI_THREADS_MUTEX_UNLOCK(x) ::pthread_mutex_unlock (x)
#define LOKI_THREADS_LONG long #define LOKI_THREADS_LONG long
#define LOKI_THREADS_ATOMIC(x) \ #define LOKI_THREADS_ATOMIC(x) \
@ -161,26 +170,26 @@ namespace Loki
public: public:
Mutex() Mutex()
{ {
LOKI_THREADS_MUTEX_INIT( (&mtx_) ); LOKI_THREADS_MUTEX_INIT(&mtx_);
} }
~Mutex() ~Mutex()
{ {
LOKI_THREADS_MUTEX_DELETE( (&mtx_) ); LOKI_THREADS_MUTEX_DELETE(&mtx_);
} }
void Lock() void Lock()
{ {
LOKI_THREADS_MUTEX_LOCK( (&mtx_) ); LOKI_THREADS_MUTEX_LOCK(&mtx_);
} }
void Unlock() void Unlock()
{ {
LOKI_THREADS_MUTEX_UNLOCK( (&mtx_) ); LOKI_THREADS_MUTEX_UNLOCK(&mtx_);
} }
private: private:
/// Copy-constructor not implemented. /// Copy-constructor not implemented.
Mutex( const Mutex & ); Mutex(const Mutex &);
/// Copy-assignement operator not implemented. /// Copy-assignement operator not implemented.
Mutex & operator = ( const Mutex & ); Mutex & operator = (const Mutex &);
LOKI_THREADS_MUTEX( mtx_; ) LOKI_THREADS_MUTEX(mtx_)
}; };
@ -322,6 +331,7 @@ namespace Loki
{ {
init_ = true; init_ = true;
} }
~Initializer() ~Initializer()
{ {
assert(init_); assert(init_);
@ -407,6 +417,9 @@ namespace Loki
#endif #endif
// $Log$ // $Log$
// Revision 1.30 2006/07/01 10:26:25 syntheticpp
// add reentrance support to the pthread mutex, thx to Shen Lei
//
// Revision 1.29 2006/06/04 20:18:39 vizowl // Revision 1.29 2006/06/04 20:18:39 vizowl
// added a check for _POSIX_PTHREAD_H to detect pthread.h on OS X // added a check for _POSIX_PTHREAD_H to detect pthread.h on OS X
// //