X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=e04a186cffbbe30eaa55fadbd8584239ad6c0a7e;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=f9abf8114bbbbaa90a5b9272e521753b9e317865;hpb=ab6a7318e36bd8e0a259cd9eef3694a0f0e8684a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index f9abf8114..e04a186cf 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,137 +1,79 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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>
  *
- * 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: libIRCDtimer */
+
+/* $Core */
 
 #include "inspircd.h"
 #include "timer.h"
 
-TimerManager::TimerManager(InspIRCd* Instance) : CantDeleteHere(false), ServerInstance(Instance)
+TimerManager::TimerManager()
 {
 }
 
-void TimerManager::TickTimers(time_t TIME)
+TimerManager::~TimerManager()
 {
-	this->CantDeleteHere = true;
-	timerlist::iterator found = Timers.find(TIME);
+	for(std::vector<Timer *>::iterator i = Timers.begin(); i != Timers.end(); i++)
+		delete *i;
+}
 
-	if (found != Timers.end())
+void TimerManager::TickTimers(time_t TIME)
+{
+	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++)
+		std::vector<Timer *>::iterator i = Timers.begin();
+		Timer *t = (*i);
+
+		// Probable fix: move vector manipulation to *before* we modify the vector.
+		Timers.erase(i);
+
+		t->Tick(TIME);
+		if (t->GetRepeat())
 		{
-			Timer* n = *y;
-			n->Tick(TIME);
-			if (n->GetRepeat())
-			{
-				AddTimer(n, n->GetSecs());
-			}
-			else
-			{
-				DELETE(n);
-			}
+			t->SetTimer(TIME + t->GetSecs());
+			AddTimer(t);
 		}
-
-		Timers.erase(found);
-		DELETE(x);
+		else
+			delete t;
 	}
-
-	this->CantDeleteHere = false;
 }
 
 void TimerManager::DelTimer(Timer* 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;
-	}
+	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())
 	{
-		timergroup* x = found->second;
-		for (timergroup::iterator y = x->begin(); y != x->end(); y++)
-		{
-			Timer* n = *y;
-			if (n == T)
-			{
-				DELETE(n);
-				x->erase(y);
-				if (!x->size())
-				{
-					Timers.erase(found);
-					DELETE(x);
-				}
-				return;
-			}
-		}
+		delete (*i);
+		Timers.erase(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::AddTimer(Timer* T)
 {
-	for (time_t n = TIME-1; n > TIME-120; n--)
-		this->TickTimers(TIME);
+	Timers.push_back(T);
+	std::sort(Timers.begin(), Timers.end(), TimerManager::TimerComparison);
 }
 
-void TimerManager::AddTimer(Timer* T, long secs_from_now)
+bool TimerManager::TimerComparison( Timer *one, Timer *two)
 {
-	timergroup* x = NULL;
-
-	int time_to_trigger = 0;
-	if (!secs_from_now)
-		time_to_trigger = T->GetTimer();
-	else
-		time_to_trigger = secs_from_now + ServerInstance->Time();
-
-	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);
+	return (one->GetTimer()) < (two->GetTimer());
 }
-