diff options
| -rw-r--r-- | include/base.h | 5 | ||||
| -rw-r--r-- | src/base.cpp | 27 | ||||
| -rw-r--r-- | src/modules.cpp | 4 |
3 files changed, 31 insertions, 5 deletions
diff --git a/include/base.h b/include/base.h index 0de37e781..daff74e56 100644 --- a/include/base.h +++ b/include/base.h @@ -82,6 +82,8 @@ class CoreExport refcountbase virtual ~refcountbase(); inline unsigned int GetReferenceCount() const { return refcount; } friend class reference_base; + void* operator new(size_t); + void operator delete(void*); private: // uncopyable refcountbase(const refcountbase&); @@ -93,6 +95,7 @@ class CoreExport reference_base protected: template<typename T> static inline unsigned int inc(T* v) { return ++(v->refcount); } template<typename T> static inline unsigned int dec(T* v) { return --(v->refcount); } + }; template <typename T> @@ -189,6 +192,8 @@ class CoreExport ModuleException : public CoreException ModuleException(const std::string &message, Module* me = NULL); }; +/** Module reference, similar to reference<Module> + */ class CoreExport ModuleRef : public reference_base { Module* const value; diff --git a/src/base.cpp b/src/base.cpp index c0bc40811..bf4232754 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -41,14 +41,35 @@ CullResult::CullResult() { } -refcountbase::refcountbase() : refcount(0) +// This trick detects heap allocations of refcountbase objects +static void* last_heap = NULL; +static const unsigned int top_bit = 1 << (8*sizeof(unsigned int) - 1); + +void* refcountbase::operator new(size_t size) +{ + last_heap = ::operator new(size); + return last_heap; +} + +void refcountbase::operator delete(void* obj) { + if (last_heap == obj) + last_heap = NULL; + ::operator delete(obj); +} + +refcountbase::refcountbase() +{ + if (this == last_heap) + refcount = 0; + else + refcount = top_bit; } refcountbase::~refcountbase() { - if (refcount && ServerInstance && ServerInstance->Logs) - ServerInstance->Logs->Log("CULLLIST", DEBUG, "refcountbase::~ @%p with refcount %d", + if ((refcount & ~top_bit) && ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, "refcountbase::~ @%p with refcount %x", (void*)this, refcount); } diff --git a/src/modules.cpp b/src/modules.cpp index 856addbf5..7e4e0ec68 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -51,14 +51,14 @@ void Event::Send() // These declarations define the behavours of the base class Module (which does nothing at all) -Module::Module() : refcount(0) { } +Module::Module() : refcount(1) { } CullResult Module::cull() { return classbase::cull(); } Module::~Module() { - if (refcount) + if (refcount != 1) ServerInstance->Logs->Log("MODULE", DEFAULT, "References remain to destructed module " + ModuleSourceFile); } |