X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fmutex.h;h=3d3dc84dd3bca28e65c0ea770b00cc6851b6f552;hp=146b982806671fba20912a88f33af04d93c65b90;hb=c3e242c2629cbc9645258b30aaf07b7285d4372b;hpb=fe77fc6b869a71bf94d501a0762579f4ddbc5094

diff --git a/source/core/mutex.h b/source/core/mutex.h
index 146b982..3d3dc84 100644
--- a/source/core/mutex.h
+++ b/source/core/mutex.h
@@ -1,74 +1,73 @@
-/*
-This file is part of libmspcore
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#ifndef MSP_FRAMEWORK_MUTEX_H_
-#define MSP_FRAMEWORK_MUTEX_H_
+#ifndef MSP_CORE_MUTEX_H_
+#define MSP_CORE_MUTEX_H_
 
-#include <msp/refcount.h>
-#include "types.h"
+#include "noncopyable.h"
+#include "refptr.h"
 
 namespace Msp {
 
-class Mutex
+/**
+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: private NonCopyable
 {
-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();
 };
 
+/**
+Locks the mutex for the lifetime of the object.
+*/
 class MutexLock
 {
-public:
-	MutexLock(Mutex &m): mutex(m) { mutex.lock(); }
-	~MutexLock()                  { mutex.unlock(); }
 private:
 	Mutex &mutex;
 
 	MutexLock(const MutexLock &);
-	MutexLock &operator=(const MutexLock &);
-};
+public:
+	MutexLock(Mutex &m, bool l = true): mutex(m) { if(l) mutex.lock(); }
+	~MutexLock() { mutex.unlock(); }
 
+	void lock() { mutex.lock(); }
+};
 
+/**
+Protects a pointer with a mutex.  As long as the MutexPtr (or a copy of it)
+exists, the mutex will stay locked.
+*/
 template<typename T>
-class MutexPtr: public RefCount
+class MutexPtr
 {
+private:
+	RefPtr<MutexLock> mutex;
+	T *data;
+
 public:
-	MutexPtr(T *d, Mutex &m): mutex(m), data(d) { mutex.lock(); }
-	MutexPtr(const MutexPtr<T> &p): RefCount(p), mutex(p.mutex), data(p.data) { }
+	MutexPtr(T *d, Mutex &m): mutex(new MutexLock(m)), data(d) { }
+
 	T &operator*() const { return *data; }
 	T *operator->() const { return data; }
-	void clear() { decref(); data=0; }
-	~MutexPtr() { decref(); }
-protected:
-	Mutex &mutex;
-	T     *data;
-
-	bool decref()
-	{
-		if(!RefCount::decref())
-		{
-			mutex.unlock();
-			return false;
-		}
-		return true;
-	}
+	void clear() { mutex = 0; data = 0; }
 };
 
 }