Remove un-needed strlen and pointer in duration()

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 224a9e3da0b55fc9792aec1f314f54a570bcbc82..20454c1552efa45048045397bf9371287674991f 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -52,6 +52,9 @@ using namespace std;
 extern InspIRCd* ServerInstance;
 extern user_hash clientlist;
 
+/*
+ * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
+ */
 bool CullList::IsValid(userrec* user)
 {
        time_t esignon = 0;
@@ -81,18 +84,28 @@ bool CullList::IsValid(userrec* user)
        return false;
 }
 
-CullItem::CullItem(userrec* u, std::string r)
+CullItem::CullItem(userrec* u, std::string &r)
 {
         this->user = u;
         this->reason = r;
 }
 
+CullItem::CullItem(userrec* u, const char* r)
+{
+       this->user = u;
+       this->reason = r;
+}
+
+CullItem::~CullItem()
+{
+}
+
 userrec* CullItem::GetUser()
 {
         return this->user;
 }
 
-std::string CullItem::GetReason()
+std::string& CullItem::GetReason()
 {
         return this->reason;
 }
@@ -103,7 +116,7 @@ CullList::CullList()
         exempt.clear();
 }
 
-void CullList::AddItem(userrec* user, std::string reason)
+void CullList::AddItem(userrec* user, std::string &reason)
 {
        if (exempt.find(user) == exempt.end())
        {
@@ -113,35 +126,25 @@ void CullList::AddItem(userrec* user, std::string reason)
        }
 }
 
+void CullList::AddItem(userrec* user, const char* reason)
+{
+       if (exempt.find(user) == exempt.end())
+       {
+               CullItem item(user,reason);
+               list.push_back(item);
+               exempt[user] = user->signon;
+       }
+}
+
 int CullList::Apply()
 {
         int n = 0;
         while (list.size())
         {
                std::vector<CullItem>::iterator a = list.begin();
-               userrec* u = a->GetUser();
-               /* Because ServerInstance->DoOneIteration can
-                * take the user away from us in the middle of
-                * our operation, we should check to see if this
-                * pointer is still valid by iterating the hash.
-                * It's expensive, yes, but the DoOneIteration
-                * call stops it being horrendously bad.
-                */
-               if (IsValid(u))
-               {
-                       kill_link(u,a->GetReason().c_str());
-                       list.erase(list.begin());
-                       /* So that huge numbers of quits dont block,
-                        * we yield back to our mainloop every 15
-                        * iterations.
-                        * The DoOneIteration call basically acts
-                        * like a software threading mechanism.
-                        */
-                       if (((n++) % 15) == 0)
-                       {
-                               ServerInstance->DoOneIteration(false);
-                       }
-               }
+
+               kill_link(a->GetUser(), a->GetReason().c_str());
+               list.erase(list.begin());
         }
         return n;
 }