* | 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-2008 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;
+/* $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;
-
-typedef std::vector<InspTimer*> timergroup;
-typedef std::map<time_t, timergroup*> timerlist;
-timerlist Timers;
+#include "timer.h"
-void TickTimers(time_t TIME)
+TimerManager::TimerManager(InspIRCd* Instance) : ServerInstance(Instance)
{
- timerlist::iterator found = Timers.find(TIME);
+}
- if (found != Timers.end())
+void TimerManager::TickTimers(time_t TIME)
+{
+ while ((Timers.size()) && (TIME > (*Timers.begin())->GetTimer()))
{
- log("timer.cpp: There are timers to trigger");
- timerlist* x = found->second;
- /*
- * There are pending timers to trigger
- */
- for (timerlist::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("timer.cpp: Triggering a timer");
- InspTimer* n = (InspTimer*)*y;
- n->Tick(TIME);
- log("timer.cpp: TICK!");
- delete n;
+ t->SetTimer(TIME + t->GetSecs());
+ AddTimer(t);
}
-
- log("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("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("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;
+ 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());
+}
+
+