Make irc::sockets::* parameters consistent, add irc::sockets::mask

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 02776aff84ed933a7b1ae6f371ce8dd3d6cc16aa..1ce6dfae104fff5a9988298b8c18a73d1287e789 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -17,6 +17,8 @@
 void CullList::Apply()
 {
        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];
@@ -24,8 +26,8 @@ void CullList::Apply()
                {
                        ServerInstance->Logs->Log("CULLLIST", DEBUG, "Deleting %s @%p", typeid(*c).name(),
                                (void*)c);
-                       if (c->cull())
-                               delete c;
+                       c->cull();
+                       queue.push_back(c);
                }
                else
                {
@@ -33,5 +35,24 @@ void CullList::Apply()
                                (void*)c);
                }
        }
+       list.clear();
+       for(unsigned int i=0; i < queue.size(); i++)
+       {
+               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();
+}