tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused code in the ThinMutex class 

refs #7805
This commit is contained in:
Gunnar Beutner 2014-11-24 01:01:39 +01:00
parent d3a6277fec
commit ca28a51373
2 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/base/thinmutex.cpp
View File

@ -21,16 +21,13 @@
#include "base/timer.hpp"
#include "base/convert.hpp"
#include "base/logger.hpp"
#include <boost/thread.hpp>
using namespace icinga;
/**
* Locks the mutex and inflates the lock.
*/
void ThinMutex::LockSlowPath(void)
{
LockSlowPath(false);
}
void ThinMutex::LockSlowPath(bool make_native)
{
unsigned int it = 0;
@ -44,22 +41,16 @@ void ThinMutex::LockSlowPath(bool make_native)
while (!__sync_bool_compare_and_swap(&m_Data, THINLOCK_UNLOCKED, THINLOCK_LOCKED)) {
#endif /* _WIN32 */
if (m_Data > THINLOCK_LOCKED) {
LockNative();
boost::mutex *mtx = reinterpret_cast<boost::mutex *>(m_Data);
mtx->lock();
return;
}
make_native = true;
Spin(it);
it++;
}
if (make_native)
MakeNative();
}
void ThinMutex::MakeNative(void)
{
boost::mutex *mtx = new boost::mutex();
mtx->lock();
#ifdef _WIN32
@ -73,20 +64,3 @@ void ThinMutex::MakeNative(void)
#endif /* _WIN32 */
}
void ThinMutex::DestroyNative(void)
{
delete reinterpret_cast<boost::mutex *>(m_Data);
}
void ThinMutex::LockNative(void)
{
boost::mutex *mtx = reinterpret_cast<boost::mutex *>(m_Data);
mtx->lock();
}
void ThinMutex::UnlockNative(void)
{
boost::mutex *mtx = reinterpret_cast<boost::mutex *>(m_Data);
mtx->unlock();
}

26
lib/base/thinmutex.hpp
View File

@ -21,6 +21,7 @@
#define THINMUTEX_H
#include "base/i2-base.hpp"
#include <boost/thread/mutex.hpp>
#ifndef _WIN32
#include <sched.h>
#endif /* _WIN32 */
@ -48,7 +49,7 @@ public:
inline ~ThinMutex(void)
{
if (m_Data > THINLOCK_LOCKED)
DestroyNative();
delete reinterpret_cast<boost::mutex *>(m_Data);
}
inline void Lock(bool make_native = false)
@ -66,26 +67,25 @@ public:
}
}
void LockSlowPath(void);
void LockSlowPath(bool make_native);
inline void Unlock(void)
{
#ifdef _WIN32
# ifdef _WIN64
if (InterlockedCompareExchange64(&m_Data, THINLOCK_UNLOCKED, THINLOCK_LOCKED) != THINLOCK_LOCKED)
if (InterlockedCompareExchange64(&m_Data, THINLOCK_UNLOCKED, THINLOCK_LOCKED) != THINLOCK_LOCKED) {
# else /* _WIN64 */
if (InterlockedCompareExchange(&m_Data, THINLOCK_UNLOCKED, THINLOCK_LOCKED) != THINLOCK_LOCKED)
if (InterlockedCompareExchange(&m_Data, THINLOCK_UNLOCKED, THINLOCK_LOCKED) != THINLOCK_LOCKED) {
# endif /* _WIN64 */
#else /* _WIN32 */
if (!__sync_bool_compare_and_swap(&m_Data, THINLOCK_LOCKED, THINLOCK_UNLOCKED))
if (!__sync_bool_compare_and_swap(&m_Data, THINLOCK_LOCKED, THINLOCK_UNLOCKED)) {
#endif /* _WIN32 */
UnlockNative();
boost::mutex *mtx = reinterpret_cast<boost::mutex *>(m_Data);
mtx->unlock();
}
}
inline void Inflate(void)
{
LockSlowPath(true);
LockSlowPath();
Unlock();
}
@ -109,12 +109,6 @@ private:
}
}
void MakeNative(void);
void DestroyNative(void);
void LockNative(void);
void UnlockNative(void);
private:
#ifdef _WIN32
# ifdef _WIN64
@ -125,6 +119,8 @@ private:
#else /* _WIN32 */
uintptr_t m_Data;
#endif /* _WIN32 */
void LockSlowPath(void);
};
}