-/* +------------------------------------+
- * | 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) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * ---------------------------------------------------
+ * 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 "inspircd.h"
-#include "inspircd_io.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
+/* $Core */
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
+#include "inspircd.h"
+#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()))
{
- 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())
{
- InspTimer* n = (InspTimer*)*y;
- n->Tick(TIME);
- delete n;
+ t->SetTimer(TIME + t->GetSecs());
+ AddTimer(t);
}
-
- Timers.erase(found);
- delete x;
+ 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())
+ if (i != Timers.end())
{
- x = found->second;
- }
- else
- {
- 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());
}