X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=31de8ab1cd472d993946379d7f1dc5687f5c05e7;hb=060f4034303f798ee0a55a926c2c2a120b865df4;hp=31c2c6a1397b1270c4f46dc08e94df15648eb1de;hpb=6279a01bf5b6da48bedfdfe2d39dde69e46ae401;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 31c2c6a13..31de8ab1c 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -2,93 +2,69 @@
  *       | 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://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#include "inspircd_config.h"
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
-#include "timer.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
+#include "timer.h"
 
-typedef std::vector<InspTimer*> timergroup;
-typedef std::map<time_t, timergroup*> timerlist;
-timerlist Timers;
+TimerManager::TimerManager()
+{
+}
 
-void TickTimers(time_t TIME)
+TimerManager::~TimerManager()
 {
-	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()))
 	{
-		log(DEBUG,"timer.cpp: There are timers to trigger");
-		timergroup* x = found->second;
-		/*
-		 * There are pending timers to trigger
-		 */
-		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())
 		{
-			log(DEBUG,"timer.cpp: Triggering a timer");
-			InspTimer* n = (InspTimer*)*y;
-			n->Tick(TIME);
-			log(DEBUG,"timer.cpp: TICK!");
-			delete n;
+			t->SetTimer(TIME + t->GetSecs());
+			AddTimer(t);
 		}
-
-		log(DEBUG,"timer.cpp: Done triggering timers, tidying up");
-		Timers.erase(found);
-		delete x;
+		else
+			delete t;
 	}
 }
 
-void AddTimer(InspTimer* T)
+void TimerManager::DelTimer(Timer* T)
 {
-	log(DEBUG,"timer.cpp: Adding timer");
-	
-	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())
 	{
-		log(DEBUG,"timer.cpp: Add timer to existing group");
-		x = found->second;
-	}
-	else
-	{
-		log(DEBUG,"timer.cpp: Add timer to new group");
-		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());
 }