jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

LoggedMutex now works on Linux

Browse source
This commit is contained in:
Micke Prag 2010-10-27 14:26:06 +00:00
parent 9e5308bbb4
commit d0e006c481
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
telldus-core/common/Mutex.cpp
View file

@ -1,7 +1,7 @@
// //
// C++ Implementation: Thread // C++ Implementation: Thread
// //
// Description: // Description:
// //
// //
// Author: Micke Prag <micke.prag@telldus.se>, (C) 2009 // Author: Micke Prag <micke.prag@telldus.se>, (C) 2009
@ -45,7 +45,7 @@ Mutex::~Mutex() {
#endif #endif
delete d; delete d;
} }
void Mutex::lock() { void Mutex::lock() {
#ifdef _WINDOWS #ifdef _WINDOWS
WaitForSingleObject(d->mutex, INFINITE); WaitForSingleObject(d->mutex, INFINITE);
@ -62,29 +62,21 @@ void Mutex::unlock() {
#endif #endif
} }
void LoggedMutex::lock() { void LoggedMutex::lock() {
#ifdef _WINDOWS debuglog(0, "Locking");
debuglog(GetCurrentThreadId(), "Locking");
#endif
Mutex::lock(); Mutex::lock();
#ifdef _WINDOWS debuglog(0, "Locked");
debuglog(GetCurrentThreadId(), "Locked");
#endif
} }
void LoggedMutex::unlock() { void LoggedMutex::unlock() {
#ifdef _WINDOWS debuglog(0, "Unlocking");
debuglog(GetCurrentThreadId(), "Unlocking");
#endif
Mutex::unlock(); Mutex::unlock();
#ifdef _WINDOWS debuglog(0, "Unlocked");
debuglog(GetCurrentThreadId(), "Unlocked");
#endif
} }
MutexLocker::MutexLocker(Mutex *m) MutexLocker::MutexLocker(Mutex *m)
:mutex(m) :mutex(m)
{ {
mutex->lock(); mutex->lock();
} }