Nuke trailing spaces

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

diff --git a/src/timer.cpp b/src/timer.cpp
index ab0e9456c75f24f9001a27094e7ed496f567cf95..ec0ddb6456c978b3e293775709e396c3148e8dfe 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,153 +11,54 @@
  * ---------------------------------------------------
  */
 
+/* $Core */
+
 #include "inspircd.h"
 #include "timer.h"
 
-TimerManager::TimerManager() : CantDeleteHere(false)
+TimerManager::TimerManager(InspIRCd* Instance) : ServerInstance(Instance)
 {
 }
 
 void TimerManager::TickTimers(time_t TIME)
 {
-       this->CantDeleteHere = true;
-       timerlist::iterator found = Timers.find(TIME);
-
-       if (found != Timers.end())
+       while ((Timers.size()) && (TIME > (*Timers.begin())->GetTimer()))
        {
-               timergroup* x = found->second;
-               /* There are pending timers to trigger.
-                * WARNING: Timers may delete themselves from within
-                * their own Tick methods! see the comment below in
-                * the DelTimer method.
-                */
-               for (timergroup::iterator y = x->begin(); y != x->end(); y++)
-               {
-                       InspTimer* n = *y;
-                       n->Tick(TIME);
-                       if (n->GetRepeat())
-                       {
-                               AddTimer(n, n->GetSecs());
-                       }
-                       else
-                       {
-                               DELETE(n);
-                       }
-               }
+               std::vector<Timer *>::iterator i = Timers.begin();
+               Timer *t = (*i);
 
-               Timers.erase(found);
-               DELETE(x);
-       }
-
-       this->CantDeleteHere = false;
-}
+               // Probable fix: move vector manipulation to *before* we modify the vector.
+               Timers.erase(i);
 
-void TimerManager::DelTimer(InspTimer* T)
-{
-       if (this->CantDeleteHere)
-       {
-               /* If a developer tries to delete a timer from within its own Tick method,
-                * then chances are this is just going to totally fuck over the timergroup
-                * and timerlist iterators and cause a crash. Thanks to peavey and Bricker
-                * for noticing this bug.
-                * If we're within the tick loop when the DelTimer is called (signified
-                * by the var 'CantDeleteHere') then we simply return for non-repeating
-                * timers, and cancel the repeat on repeating timers. We can do this because
-                * we know that the timer tick loop will safely delete the timer for us
-                * anyway and therefore we avoid stack corruption.
-                */
-               if (T->GetRepeat())
-                       T->CancelRepeat();
-               else
-                       return;
-       }
-
-       timerlist::iterator found = Timers.find(T->GetTimer());
-
-       if (found != Timers.end())
-       {
-               timergroup* x = found->second;
-               for (timergroup::iterator y = x->begin(); y != x->end(); y++)
+               t->Tick(TIME);
+               if (t->GetRepeat())
                {
-                       InspTimer* n = *y;
-                       if (n == T)
-                       {
-                               DELETE(n);
-                               x->erase(y);
-                               if (!x->size())
-                               {
-                                       Timers.erase(found);
-                                       DELETE(x);
-                               }
-                               return;
-                       }
+                       t->SetTimer(TIME + t->GetSecs());
+                       AddTimer(t);
                }
+               else
+                       delete t;
        }
 }
 
-/** Because some muppets may do odd things, and their ircd may lock up due
- * to crappy 3rd party modules, or they may change their system time a bit,
- * this accounts for shifts of up to 120 secs by looking behind for missed
- * timers and executing them. This is only executed once every 5 secs.
- * If you move your clock BACK, and your timers move further ahead as a result,
- * then tough titty you'll just have to wait.
- */
-void TimerManager::TickMissedTimers(time_t TIME)
+void TimerManager::DelTimer(Timer* T)
 {
-       /** See comment above in TickTimers
-        */
-       this->CantDeleteHere = true;
+       std::vector<Timer *>::iterator i = std::find(Timers.begin(), Timers.end(), T);
 
-       for (time_t n = TIME-1; n > TIME-120; n--)
+       if (i != Timers.end())
        {
-               timerlist::iterator found = Timers.find(n);
-               if (found != Timers.end())
-               {
-                       timergroup* x = found->second;
-                       for (timergroup::iterator y = x->begin(); y != x->end(); y++)
-                       {
-                               InspTimer* z = *y;
-                               z->Tick(TIME);
-                               if (z->GetRepeat())
-                               {
-                                       AddTimer(z, z->GetSecs());
-                               }
-                               else
-                               {
-                                       DELETE(z);
-                               }
-                       }
-
-                       Timers.erase(found);
-                       DELETE(x);
-               }
+               delete (*i);
+               Timers.erase(i);
        }
-
-       this->CantDeleteHere = false;
 }
 
-void TimerManager::AddTimer(InspTimer* T, long secs_from_now)
+void TimerManager::AddTimer(Timer* T)
 {
-       timergroup* x = NULL;
-
-       int time_to_trigger = 0;
-       if (!secs_from_now)
-               time_to_trigger = T->GetTimer();
-       else
-               time_to_trigger = secs_from_now + time(NULL);
-
-       timerlist::iterator found = Timers.find(time_to_trigger);
-
-       if (found != Timers.end())
-       {
-               x = found->second;
-       }
-       else
-       {
-               x = new timergroup;
-               Timers[time_to_trigger] = x;
-       }
-
-       x->push_back(T);
+       Timers.push_back(T);
+       sort(Timers.begin(), Timers.end(), TimerManager::TimerComparison);
 }
 
+bool TimerManager::TimerComparison( Timer *one, Timer *two)
+{
+       return (one->GetTimer()) < (two->GetTimer());
+}