X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmutex.h;h=b73913450bc2ce5e150047254af6e83a2fbb0839;hb=a1d6fa071280123f282c1bac3b68008672401024;hp=8088a2839dbd21a15b8567f3768e850d5c5bb583;hpb=521cf1db00f8ce2d9f9494dca503d6c17d89ac2f;p=libs%2Fcore.git

diff --git a/source/core/mutex.h b/source/core/mutex.h
index 8088a28..b739134 100644
--- a/source/core/mutex.h
+++ b/source/core/mutex.h
@@ -4,34 +4,41 @@ This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #ifndef MSP_CORE_MUTEX_H_
 #define MSP_CORE_MUTEX_H_
 
 #include "refptr.h"
-#include "types.h"
 
 namespace Msp {
 
+/**
+A class for controlling mutually exclusive access to a resource.  Only one
+thread can hold a lock on the mutex at a time.
+*/
 class Mutex
 {
-public:
-#ifndef WIN32
-	Mutex()       { pthread_mutex_init(&mutex, 0); }
-	int lock()    { return pthread_mutex_lock(&mutex); }
-	int trylock() { return pthread_mutex_trylock(&mutex); }
-	int unlock()  { return pthread_mutex_unlock(&mutex); }
-	~Mutex()      { pthread_mutex_destroy(&mutex); }
-#else
-	Mutex()       { mutex=CreateMutex(0, false, 0); }
-	int lock()    { return WaitForSingleObject(mutex, INFINITE)==WAIT_OBJECT_0; }
-	int trylock() { return WaitForSingleObject(mutex, 0)==WAIT_OBJECT_0; }
-	int unlock()  { return !ReleaseMutex(mutex); }
-	~Mutex()      { CloseHandle(mutex); }
-#endif
+	friend class Semaphore;
+
 private:
-	MutexHandle mutex;
+	struct Private;
 
-	friend class Semaphore;
+	Private *priv;
+
+public:
+	Mutex();
+	~Mutex();
+
+	/** Locks the mutex.  If the mutex is already locked, waits until it becomes
+	available. */
+	void lock();
+
+	/** Attempts to lock the mutex.  Returns true if the lock was acquired,
+	otherwise returns false. */
+	bool trylock();
+
+	/** Unlocks the mutex. */
+	void unlock();
 };
 
 /**
@@ -39,14 +46,15 @@ Locks the mutex for te lifetime of the object.
 */
 class MutexLock
 {
+private:
+	Mutex &mutex;
+
 public:
-	MutexLock(Mutex &m, bool l=true): mutex(m) { if(l) mutex.lock(); }
+	MutexLock(Mutex &m, bool l = true): mutex(m) { if(l) mutex.lock(); }
 	~MutexLock() { mutex.unlock(); }
 
-	int lock() { return mutex.lock(); }
+	void lock() { mutex.lock(); }
 private:
-	Mutex &mutex;
-
 	MutexLock(const MutexLock &);
 	MutexLock &operator=(const MutexLock &);
 };
@@ -63,7 +71,7 @@ public:
 
 	T &operator*() const { return *data; }
 	T *operator->() const { return data; }
-	void clear() { mutex=0; data=0; }
+	void clear() { mutex=0; data = 0; }
 private:
 	RefPtr<MutexLock> mutex;
 	T *data;
@@ -77,7 +85,7 @@ public:
 	MutexPtr(const MutexPtr<T> &p): RefCount(p), mutex(p.mutex), data(p.data) { }
 	T &operator*() const { return *data; }
 	T *operator->() const { return data; }
-	void clear() { decref(); data=0; }
+	void clear() { decref(); data = 0; }
 	~MutexPtr() { decref(); }
 protected:
 	Mutex &mutex;