Make classbase and refcountbase uncopyable; expand comments on their indended uses

[user/henk/code/inspircd.git] / src / cull_list.cpp

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index c45dff46c3d7b27d1fde53ec31c80991c6ad5970..1ce6dfae104fff5a9988298b8c18a73d1287e789 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -11,20 +11,48 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
-#include "cull_list.h"
+#include <typeinfo>
 
 void CullList::Apply()
 {
-       std::vector<classbase*> todel(list.begin(), list.end());
+       std::set<classbase*> gone;
+       std::vector<classbase*> queue;
+       queue.reserve(list.size() + 32);
+       for(unsigned int i=0; i < list.size(); i++)
+       {
+               classbase* c = list[i];
+               if (gone.insert(c).second)
+               {
+                       ServerInstance->Logs->Log("CULLLIST", DEBUG, "Deleting %s @%p", typeid(*c).name(),
+                               (void*)c);
+                       c->cull();
+                       queue.push_back(c);
+               }
+               else
+               {
+                       ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Object @%p culled twice!",
+                               (void*)c);
+               }
+       }
        list.clear();
-       for(std::vector<classbase*>::iterator i = todel.begin(); i != todel.end(); i++)
+       for(unsigned int i=0; i < queue.size(); i++)
        {
-               classbase* c = *i;
-               c->cull();
+               classbase* c = queue[i];
                delete c;
        }
+       if (list.size())
+       {
+               ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Objects added to cull list in a destructor");
+               Apply();
+       }
 }
 
+void ActionList::Run()
+{
+       for(unsigned int i=0; i < list.size(); i++)
+       {
+               list[i]->Call();
+       }
+       list.clear();
+}