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

Only build leak detection code when I2_LEAK_DEBUG is set 

refs #10963
This commit is contained in:
Gunnar Beutner 2016-01-19 16:43:46 +01:00
parent e4b7111577
commit db0c6ef187
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/base/object.cpp
View File

@ -30,11 +30,11 @@ using namespace icinga;
DEFINE_TYPE_INSTANCE(Object);
#ifdef I2_DEBUG
#ifdef I2_LEAK_DEBUG
static boost::mutex l_ObjectCountLock;
static std::map<String, int> l_ObjectCounts;
static Timer::Ptr l_ObjectCountTimer;
#endif
#endif /* I2_LEAK_DEBUG */
/**
* Default constructor for the Object class.
@ -128,7 +128,7 @@ Type::Ptr Object::GetReflectionType(void) const
return Object::TypeInstance;
}
#ifdef I2_DEBUG
#ifdef I2_LEAK_DEBUG
void icinga::TypeAddObject(Object *object)
{
boost::mutex::scoped_lock lock(l_ObjectCountLock);
@ -168,5 +168,5 @@ static void StartTypeInfoTimer(void)
}
INITIALIZE_ONCE(StartTypeInfoTimer);
#endif /* I2_DEBUG */
#endif /* I2_LEAK_DEBUG */

8
lib/base/object.hpp
View File

@ -139,10 +139,10 @@ void TypeRemoveObject(Object *object);
inline void intrusive_ptr_add_ref(Object *object)
{
#ifdef I2_DEBUG
#ifdef I2_LEAK_DEBUG
if (object->m_References == 0)
TypeAddObject(object);
#endif /* I2_DEBUG */
#endif /* I2_LEAK_DEBUG */
#ifdef _WIN32
InterlockedIncrement(&object->m_References);
@ -163,9 +163,9 @@ inline void intrusive_ptr_release(Object *object)
ASSERT(refs >= 0);
if (refs == 0) {
#ifdef I2_DEBUG
#ifdef I2_LEAK_DEBUG
TypeRemoveObject(object);
#endif /* I2_DEBUG */
#endif /* I2_LEAK_DEBUG */
delete object;
}