* ---------------------------------------------------
*/
-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 "users.h"
-#include "ctables.h"
-#include "typedefs.h"
-#include "commands.h"
-#include "globals.h"
-#include "hashcomp.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)
+void TimerManager::TickTimers(time_t TIME)
{
timerlist::iterator found = Timers.find(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;
+ }
+ }
}
}
* 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 TickMissedTimers(time_t TIME)
+void TimerManager::TickMissedTimers(time_t TIME)
{
for (time_t n = TIME-1; n > TIME-120; n--)
{
timergroup* x = found->second;
for (timergroup::iterator y = x->begin(); y != x->end(); y++)
{
- InspTimer* z = (InspTimer*)*y;
+ InspTimer* z = *y;
z->Tick(TIME);
- delete z;
+ DELETE(z);
}
Timers.erase(found);
- delete x;
+ DELETE(x);
}
}
}
-void AddTimer(InspTimer* T)
+void TimerManager::AddTimer(InspTimer* T)
{
timergroup* x = NULL;
x->push_back(T);
}
+