X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=1ce6dfae104fff5a9988298b8c18a73d1287e789;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=e9e4c4c70f7c0d7e408ae9ea912d31e7a29cc1c0;hpb=9904b03fdd72f357729103774a7f4bba6ec3b0bc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index e9e4c4c70..1ce6dfae1 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,96 +2,57 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cull_list.h"
-
-CullItem::CullItem(userrec* u, std::string r)
-{
-        this->user = u;
-        this->reason = r;
-}
-
-userrec* CullItem::GetUser()
-{
-        return this->user;
-}
-
-std::string CullItem::GetReason()
-{
-        return this->reason;
-}
+#include <typeinfo>
 
-CullList::CullList()
+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];
+		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();
-        memset(exempt,0,65535);
-}
-
-void CullList::AddItem(userrec* user, std::string reason)
-{
-	if (exempt.find(user) != exempt.end())
+	for(unsigned int i=0; i < queue.size(); i++)
 	{
-	        CullItem item(user,reason);
-	        list.push_back(item);
-	        exempt[user] = 1;
+		classbase* c = queue[i];
+		delete c;
+	}
+	if (list.size())
+	{
+		ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Objects added to cull list in a destructor");
+		Apply();
 	}
 }
 
-int CullList::Apply()
+void ActionList::Run()
 {
-        int n = 0;
-        while (list.size())
-        {
-               std::vector<CullItem>::iterator a = list.begin();
-               userrec* u = a->GetUser();
-               std::string reason = a->GetReason();
-               kill_link(u,reason.c_str());
-               list.erase(list.begin());
-               n++;
-        }
-        return n;
+	for(unsigned int i=0; i < list.size(); i++)
+	{
+		list[i]->Call();
+	}
+	list.clear();
 }