This works with multiple remote includes now except it hangs when an include is withi...

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

diff --git a/src/timer.cpp b/src/timer.cpp
index ab0e9456c75f24f9001a27094e7ed496f567cf95..9bc37012d4dc6bd6705d32e0f90149c31a65a48e 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -11,10 +11,12 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDtimer */
+
 #include "inspircd.h"
 #include "timer.h"
 
-TimerManager::TimerManager() : CantDeleteHere(false)
+TimerManager::TimerManager(InspIRCd* Instance) : CantDeleteHere(false), ServerInstance(Instance)
 {
 }
 
@@ -33,7 +35,7 @@ void TimerManager::TickTimers(time_t TIME)
                 */
                for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                {
-                       InspTimer* n = *y;
+                       Timer* n = *y;
                        n->Tick(TIME);
                        if (n->GetRepeat())
                        {
@@ -41,18 +43,18 @@ void TimerManager::TickTimers(time_t TIME)
                        }
                        else
                        {
-                               DELETE(n);
+                               delete n;
                        }
                }
 
                Timers.erase(found);
-               DELETE(x);
+               delete x;
        }
 
        this->CantDeleteHere = false;
 }
 
-void TimerManager::DelTimer(InspTimer* T)
+void TimerManager::DelTimer(Timer* T)
 {
        if (this->CantDeleteHere)
        {
@@ -79,15 +81,15 @@ void TimerManager::DelTimer(InspTimer* T)
                timergroup* x = found->second;
                for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                {
-                       InspTimer* n = *y;
+                       Timer* n = *y;
                        if (n == T)
                        {
-                               DELETE(n);
+                               delete n;
                                x->erase(y);
                                if (!x->size())
                                {
                                        Timers.erase(found);
-                                       DELETE(x);
+                                       delete x;
                                }
                                return;
                        }
@@ -104,39 +106,11 @@ void TimerManager::DelTimer(InspTimer* T)
  */
 void TimerManager::TickMissedTimers(time_t TIME)
 {
-       /** See comment above in TickTimers
-        */
-       this->CantDeleteHere = true;
-
        for (time_t n = TIME-1; n > TIME-120; n--)
-       {
-               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);
-               }
-       }
-
-       this->CantDeleteHere = false;
+               this->TickTimers(TIME);
 }
 
-void TimerManager::AddTimer(InspTimer* T, long secs_from_now)
+void TimerManager::AddTimer(Timer* T, long secs_from_now)
 {
        timergroup* x = NULL;
 
@@ -144,7 +118,7 @@ void TimerManager::AddTimer(InspTimer* T, long secs_from_now)
        if (!secs_from_now)
                time_to_trigger = T->GetTimer();
        else
-               time_to_trigger = secs_from_now + time(NULL);
+               time_to_trigger = secs_from_now + ServerInstance->Time();
 
        timerlist::iterator found = Timers.find(time_to_trigger);