Merge pull request #1018 from SaberUK/insp20+hidekills

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

diff --git a/src/timer.cpp b/src/timer.cpp
index 9157c152187b6ba0994854cf9f0fac7ed237bddc..e04a186cffbbe30eaa55fadbd8584239ad6c0a7e 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,89 +1,79 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+/* $Core */
+
 #include "inspircd.h"
 #include "timer.h"
 
-void TimerManager::TickTimers(time_t TIME)
+TimerManager::TimerManager()
 {
-       timerlist::iterator found = Timers.find(TIME);
-
-       if (found != Timers.end())
-       {
-               timergroup* x = found->second;
-               /*
-                * There are pending timers to trigger
-                */
-               for (timergroup::iterator y = x->begin(); y != x->end(); y++)
-               {
-                       InspTimer* n = *y;
-                       n->Tick(TIME);
-                       DELETE(n);
-               }
+}
 
-               Timers.erase(found);
-               DELETE(x);
-       }
+TimerManager::~TimerManager()
+{
+       for(std::vector<Timer *>::iterator i = Timers.begin(); i != Timers.end(); i++)
+               delete *i;
 }
 
-/*
- * 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::TickTimers(time_t TIME)
 {
-       for (time_t n = TIME-1; n > TIME-120; n--)
+       while ((Timers.size()) && (TIME > (*Timers.begin())->GetTimer()))
        {
-               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);
-                               DELETE(z);
-                       }
+               std::vector<Timer *>::iterator i = Timers.begin();
+               Timer *t = (*i);
+
+               // Probable fix: move vector manipulation to *before* we modify the vector.
+               Timers.erase(i);
 
-                       Timers.erase(found);
-                       DELETE(x);
+               t->Tick(TIME);
+               if (t->GetRepeat())
+               {
+                       t->SetTimer(TIME + t->GetSecs());
+                       AddTimer(t);
                }
+               else
+                       delete t;
        }
 }
 
-void TimerManager::AddTimer(InspTimer* T)
+void TimerManager::DelTimer(Timer* T)
 {
-       timergroup* x = NULL;
+       std::vector<Timer *>::iterator i = std::find(Timers.begin(), Timers.end(), T);
 
-       timerlist::iterator found = Timers.find(T->GetTimer());
-       
-       if (found != Timers.end())
+       if (i != Timers.end())
        {
-               x = found->second;
-       }
-       else
-       {
-               x = new timergroup;
-               Timers[T->GetTimer()] = x;
+               delete (*i);
+               Timers.erase(i);
        }
+}
 
-       x->push_back(T);
+void TimerManager::AddTimer(Timer* T)
+{
+       Timers.push_back(T);
+       std::sort(Timers.begin(), Timers.end(), TimerManager::TimerComparison);
 }
 
+bool TimerManager::TimerComparison( Timer *one, Timer *two)
+{
+       return (one->GetTimer()) < (two->GetTimer());
+}