X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=04ff1c15b847f6ad761b1d44799b3a57a7d63b17;hb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;hp=b804920e523fe057b2632e976354bcac067e0179;hpb=8c2bd7cc635ce14750729455284e4f76fb9fd920;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index b804920e5..04ff1c15b 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -2,48 +2,19 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#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 "inspircd.h"
-#include "inspircd_io.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)
+void TimerManager::TickTimers(time_t TIME)
 {
 	timerlist::iterator found = Timers.find(TIME);
 
@@ -55,17 +26,68 @@ void TickTimers(time_t TIME)
 		 */
 		for (timergroup::iterator y = x->begin(); y != x->end(); y++)
 		{
-			InspTimer* n = (InspTimer*)*y;
+			InspTimer* n = *y;
 			n->Tick(TIME);
-			delete n;
+			DELETE(n);
 		}
 
 		Timers.erase(found);
-		delete x;
+		DELETE(x);
+	}
+}
+
+void TimerManager::DelTimer(InspTimer* T)
+{
+	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++)
+		{
+			InspTimer* n = *y;
+			if (n == T)
+			{
+				DELETE(n);
+				x->erase(y);
+				if (!x->size())
+					Timers.erase(found);
+				return;
+			}
+		}
 	}
 }
 
-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)
 {
 	timergroup* x = NULL;
 
@@ -83,3 +105,4 @@ void AddTimer(InspTimer* T)
 
 	x->push_back(T);
 }
+