* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
+/* $Core */
+
#include "inspircd.h"
#include "timer.h"
-void TimerManager::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()))
{
- 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 = *y;
- n->Tick(TIME);
- DELETE(n);
+ t->SetTimer(TIME + t->GetSecs());
+ AddTimer(t);
}
-
- Timers.erase(found);
- DELETE(x);
+ else
+ delete t;
}
}
-void TimerManager::DelTimer(InspTimer* T)
+void TimerManager::DelTimer(Timer* T)
{
- timerlist::iterator found = Timers.find(T->GetTimer());
+ std::vector<Timer *>::iterator i = std::find(Timers.begin(), Timers.end(), T);
- if (found != Timers.end())
+ if (i != 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;
- }
- }
+ delete (*i);
+ Timers.erase(i);
}
}
-/*
- * 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)
+void TimerManager::AddTimer(Timer* T)
{
- 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);
- }
- }
+ Timers.push_back(T);
+ sort(Timers.begin(), Timers.end(), TimerManager::TimerComparison);
}
-void TimerManager::AddTimer(InspTimer* T)
+bool TimerManager::TimerComparison( Timer *one, Timer *two)
{
- timergroup* x = NULL;
-
- timerlist::iterator found = Timers.find(T->GetTimer());
-
- if (found != Timers.end())
- {
- x = found->second;
- }
- else
- {
- x = new timergroup;
- Timers[T->GetTimer()] = x;
- }
-
- x->push_back(T);
+ return (one->GetTimer()) < (two->GetTimer());
}
-