X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=2b30b478cf592eed5806b27d8d137449fb125cf9;hb=12737ab4ad61a0d8a908c8a21594c7012e21eb3c;hp=e6545bf4097db3af5911bbc6b5c29fc46119763f;hpb=932f00f8bfa8a78626fe52b8f20f159c18f24c8e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index e6545bf40..2b30b478c 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -14,81 +14,81 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include <vector>
+#include <map>
 #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 "typedefs.h"
 #include "helperfuncs.h"
+#include "timer.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;
-
-void TickTimers(time_t TIME)
+void TimerManager::TickTimers(time_t TIME)
 {
 	timerlist::iterator found = Timers.find(TIME);
 
 	if (found != Timers.end())
 	{
-		log("timer.cpp: There are timers to trigger");
-		timerlist* x = found->second;
+		timergroup* x = found->second;
 		/*
 		 * There are pending timers to trigger
 		 */
-		for (timerlist::iterator y = x.begin(); y != x.end(); y++)
+		for (timergroup::iterator y = x->begin(); y != x->end(); y++)
 		{
-			log("timer.cpp: Triggering a timer");
-			InspTimer* n = (InspTimer*)*y;
+			InspTimer* n = *y;
 			n->Tick(TIME);
-			log("timer.cpp: TICK!");
-			delete n;
+			DELETE(n);
 		}
 
-		log("timer.cpp: Done triggering timers, tidying up");
 		Timers.erase(found);
-		delete x;
+		DELETE(x);
 	}
 }
 
-void AddTimer(InspTimer* T)
+/*
+ * 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)
+{
+	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);
+		}
+	}
+}
+
+void TimerManager::AddTimer(InspTimer* T)
 {
-	log("timer.cpp: Adding timer");
-	
 	timergroup* x = NULL;
 
 	timerlist::iterator found = Timers.find(T->GetTimer());
 	
 	if (found != Timers.end())
 	{
-		log("timer.cpp: Add timer to existing group");
 		x = found->second;
 	}
 	else
 	{
-		log("timer.cpp: Add timer to new group");
 		x = new timergroup;
 		Timers[T->GetTimer()] = x;
 	}
 
 	x->push_back(T);
 }
+