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

diff --git a/src/timer.cpp b/src/timer.cpp
index 31c2c6a13..00be97b6c 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,94 +1,87 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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 "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;
+void Timer::SetInterval(unsigned int newinterval)
+{
+	ServerInstance->Timers.DelTimer(this);
+	secs = newinterval;
+	SetTrigger(ServerInstance->Time() + newinterval);
+	ServerInstance->Timers.AddTimer(this);
+}
 
-typedef std::vector<InspTimer*> timergroup;
-typedef std::map<time_t, timergroup*> timerlist;
-timerlist Timers;
+Timer::Timer(unsigned int secs_from_now, bool repeating)
+	: trigger(ServerInstance->Time() + secs_from_now)
+	, secs(secs_from_now)
+	, repeat(repeating)
+{
+}
 
-void TickTimers(time_t TIME)
+Timer::~Timer()
 {
-	timerlist::iterator found = Timers.find(TIME);
+	ServerInstance->Timers.DelTimer(this);
+}
 
-	if (found != Timers.end())
+void TimerManager::TickTimers(time_t TIME)
+{
+	for (TimerMap::iterator i = Timers.begin(); i != Timers.end(); )
 	{
-		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++)
+		Timer* t = i->second;
+		if (t->GetTrigger() > TIME)
+			break;
+
+		Timers.erase(i++);
+
+		if (!t->Tick(TIME))
+			continue;
+
+		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->SetTrigger(TIME + t->GetInterval());
+			AddTimer(t);
 		}
-
-		log(DEBUG,"timer.cpp: Done triggering timers, tidying up");
-		Timers.erase(found);
-		delete x;
 	}
 }
 
-void AddTimer(InspTimer* T)
+void TimerManager::DelTimer(Timer* t)
 {
-	log(DEBUG,"timer.cpp: Adding timer");
-	
-	timergroup* x = NULL;
+	std::pair<TimerMap::iterator, TimerMap::iterator> itpair = Timers.equal_range(t->GetTrigger());
 
-	timerlist::iterator found = Timers.find(T->GetTimer());
-	
-	if (found != Timers.end())
-	{
-		log(DEBUG,"timer.cpp: Add timer to existing group");
-		x = found->second;
-	}
-	else
+	for (TimerMap::iterator i = itpair.first; i != itpair.second; ++i)
 	{
-		log(DEBUG,"timer.cpp: Add timer to new group");
-		x = new timergroup;
-		Timers[T->GetTimer()] = x;
+		if (i->second == t)
+		{
+			Timers.erase(i);
+			break;
+		}
 	}
+}
 
-	x->push_back(T);
+void TimerManager::AddTimer(Timer* t)
+{
+	Timers.insert(std::make_pair(t->GetTrigger(), t));
 }