X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=ec0ddb6456c978b3e293775709e396c3148e8dfe;hb=f209cce90b394acd26e22eacef0bff61e8f5b4e1;hp=0e7a77ad8d552d8cf439aa5339d6a2c008fbb768;hpb=77123f4dec9f29105f6c0ceea0262cfe8e9eaa1a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 0e7a77ad8..ec0ddb645 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -2,108 +2,63 @@
  *       | 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-2009 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#include "inspircd_config.h"
-#include <time.h>
-#include <vector>
-#include <map>
-#include "users.h"
-#include "ctables.h"
-#include "typedefs.h"
-#include "commands.h"
-#include "globals.h"
-#include "hashcomp.h"
 #include "inspircd.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
-
-typedef std::vector<InspTimer*> timergroup;
-typedef std::map<time_t, timergroup*> timerlist;
-timerlist Timers;
+#include "timer.h"
 
-void TickTimers(time_t TIME)
+TimerManager::TimerManager(InspIRCd* Instance) : ServerInstance(Instance)
 {
-	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;
-	}
 }
 
-/*
- * 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 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 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())
-	{
-		x = found->second;
-	}
-	else
+	if (i != Timers.end())
 	{
-		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);
+	sort(Timers.begin(), Timers.end(), TimerManager::TimerComparison);
+}
+
+bool TimerManager::TimerComparison( Timer *one, Timer *two)
+{
+	return (one->GetTimer()) < (two->GetTimer());
 }