X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=a79105f5292d23e5ce6599619c703897f1990461;hb=4cc6e5e14fdbde499481dbab5ab2ad1257b8af9c;hp=9157c152187b6ba0994854cf9f0fac7ed237bddc;hpb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 9157c1521..a79105f52 100644
--- 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.
  *
@@ -17,30 +14,88 @@
 #include "inspircd.h"
 #include "timer.h"
 
+TimerManager::TimerManager(InspIRCd* Instance) : CantDeleteHere(false), ServerInstance(Instance)
+{
+}
+
 void TimerManager::TickTimers(time_t TIME)
 {
+	this->CantDeleteHere = true;
 	timerlist::iterator found = Timers.find(TIME);
 
 	if (found != Timers.end())
 	{
 		timergroup* x = found->second;
-		/*
-		 * There are pending timers to trigger
+		/* 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;
+			Timer* n = *y;
 			n->Tick(TIME);
-			DELETE(n);
+			if (n->GetRepeat())
+			{
+				AddTimer(n, n->GetSecs());
+			}
+			else
+			{
+				DELETE(n);
+			}
 		}
 
 		Timers.erase(found);
 		DELETE(x);
 	}
+
+	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;
+	}
+
+	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++)
+		{
+			Timer* n = *y;
+			if (n == T)
+			{
+				DELETE(n);
+				x->erase(y);
+				if (!x->size())
+				{
+					Timers.erase(found);
+					DELETE(x);
+				}
+				return;
+			}
+		}
+	}
 }
 
-/*
- * Because some muppets may do odd things, and their ircd may lock up due
+/** 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.
@@ -50,30 +105,21 @@ void TimerManager::TickTimers(time_t TIME)
 void TimerManager::TickMissedTimers(time_t TIME)
 {
 	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);
-				DELETE(z);
-			}
-
-			Timers.erase(found);
-			DELETE(x);
-		}
-	}
+		this->TickTimers(TIME);
 }
 
-void TimerManager::AddTimer(InspTimer* T)
+void TimerManager::AddTimer(Timer* 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 + ServerInstance->Time();
+
+	timerlist::iterator found = Timers.find(time_to_trigger);
+
 	if (found != Timers.end())
 	{
 		x = found->second;
@@ -81,7 +127,7 @@ void TimerManager::AddTimer(InspTimer* T)
 	else
 	{
 		x = new timergroup;
-		Timers[T->GetTimer()] = x;
+		Timers[time_to_trigger] = x;
 	}
 
 	x->push_back(T);