[Scummvm-cvs-logs] CVS: scummvm/common mutex.cpp,NONE,1.1 mutex.h,1.1,1.2 module.mk,1.18,1.19

Max Horn fingolfin at users.sourceforge.net
Sat Jan 15 14:42:01 CET 2005


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5303

Modified Files:
	mutex.h module.mk 
Added Files:
	mutex.cpp 
Log Message:
Added a convenience class 'Mutex'

--- NEW FILE: mutex.cpp ---
/* ScummVM - Scumm Interpreter
 * Copyright (C) 2003-2005 The ScummVM project
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.

 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 * $Header: /cvsroot/scummvm/scummvm/common/mutex.cpp,v 1.1 2005/01/15 22:41:23 fingolfin Exp $
 *
 */

#include "stdafx.h"
#include "common/mutex.h"
#include "common/system.h"

namespace Common {

Mutex::Mutex() {
	_mutex = g_system->createMutex();
}

Mutex::~Mutex() {
	g_system->deleteMutex(_mutex);
}

void Mutex::lock() {
	g_system->lockMutex(_mutex);
}

void Mutex::unlock() {
	g_system->unlockMutex(_mutex);
}


#pragma mark -


StackLock::StackLock(OSystem::MutexRef mutex, const char *mutexName)
	: _mutex(mutex), _mutexName(mutexName) {
	lock();
}

StackLock::StackLock(const Mutex &mutex, const char *mutexName)
	: _mutex(mutex._mutex), _mutexName(mutexName) {
	lock();
}

StackLock::~StackLock() {
	unlock();
}

void StackLock::lock() {
	if (_mutexName != NULL)
		debug(6, "Locking mutex %s", _mutexName);
	
	g_system->lockMutex(_mutex);
}

void StackLock::unlock() {
	if (_mutexName != NULL)
		debug(6, "Unlocking mutex %s", _mutexName);

	g_system->unlockMutex(_mutex);
}

}	// End of namespace Common

Index: mutex.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/mutex.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mutex.h	10 Jan 2005 22:04:04 -0000	1.1
+++ mutex.h	15 Jan 2005 22:41:23 -0000	1.2
@@ -26,10 +26,12 @@
 
 namespace Common {
 
+class Mutex;
+
 /**
  * An pseudo-opaque mutex type. See OSystem::createMutex etc. for more details.
  */
-typedef struct Mutex *MutexRef;
+typedef struct OpaqueMutex *MutexRef;
 
 
 /**
@@ -43,10 +45,28 @@
 	void unlock();
 public:
 	StackLock(MutexRef mutex, const char *mutexName = NULL);
+	StackLock(const Mutex &mutex, const char *mutexName = NULL);
 	~StackLock();
 };
 
 
+/**
+ * Wrapper class around the OSystem mutex functions.
+ */
+class Mutex {
+	friend class StackLock;
+
+	MutexRef _mutex;
+
+public:
+	Mutex();
+	~Mutex();
+
+	void lock();
+	void unlock();
+};
+
+
 } // End of namespace Common
 
 #endif

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/module.mk,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- module.mk	26 Aug 2004 21:01:21 -0000	1.18
+++ module.mk	15 Jan 2005 22:41:23 -0000	1.19
@@ -4,6 +4,7 @@
 	common/config-manager.o \
 	common/file.o \
 	common/md5.o \
+	common/mutex.o \
 	common/str.o \
 	common/stream.o \
 	common/timer.o \





More information about the Scummvm-git-logs mailing list