Change the wording of configure, to indicate that building as ipv6 is no longer an...

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

diff --git a/src/timer.cpp b/src/timer.cpp
index 9157c152187b6ba0994854cf9f0fac7ed237bddc..6be7aa06c0b889c78e3da75076852c233ece8155 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -31,7 +28,14 @@ void TimerManager::TickTimers(time_t TIME)
                {
                        InspTimer* n = *y;
                        n->Tick(TIME);
-                       DELETE(n);
+                       if (n->GetRepeat())
+                       {
+                               AddTimer(n, n->GetSecs());
+                       }
+                       else
+                       {
+                               DELETE(n);
+                       }
                }
 
                Timers.erase(found);
@@ -39,6 +43,28 @@ void TimerManager::TickTimers(time_t TIME)
        }
 }
 
+void TimerManager::DelTimer(InspTimer* T)
+{
+       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++)
+               {
+                       InspTimer* n = *y;
+                       if (n == T)
+                       {
+                               DELETE(n);
+                               x->erase(y);
+                               if (!x->size())
+                                       Timers.erase(found);
+                               return;
+                       }
+               }
+       }
+}
+
 /*
  * 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,
@@ -59,7 +85,14 @@ void TimerManager::TickMissedTimers(time_t TIME)
                        {
                                InspTimer* z = *y;
                                z->Tick(TIME);
-                               DELETE(z);
+                               if (z->GetRepeat())
+                               {
+                                       AddTimer(z, z->GetSecs());
+                               }
+                               else
+                               {
+                                       DELETE(z);
+                               }
                        }
 
                        Timers.erase(found);
@@ -68,12 +101,18 @@ void TimerManager::TickMissedTimers(time_t TIME)
        }
 }
 
-void TimerManager::AddTimer(InspTimer* T)
+void TimerManager::AddTimer(InspTimer* T, long secs_from_now)
 {
        timergroup* x = NULL;
 
-       timerlist::iterator found = Timers.find(T->GetTimer());
-       
+       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;
@@ -81,7 +120,7 @@ void TimerManager::AddTimer(InspTimer* T)
        else
        {
                x = new timergroup;
-               Timers[T->GetTimer()] = x;
+               Timers[time_to_trigger] = x;
        }
 
        x->push_back(T);