X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=04ff1c15b847f6ad761b1d44799b3a57a7d63b17;hb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;hp=0c2cabbbe0cb004f3b491264f254d65247159576;hpb=09dd16b981c38cbde7573398cb50ae1cf0531ade;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/timer.cpp b/src/timer.cpp index 0c2cabbbe..04ff1c15b 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -2,33 +2,19 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 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. * * --------------------------------------------------- */ -#include -#include -#include "inspircd_config.h" #include "inspircd.h" -#include "typedefs.h" -#include "helperfuncs.h" #include "timer.h" -extern time_t TIME; - -typedef std::vector timergroup; -typedef std::map timerlist; -timerlist Timers; - -void TickTimers(time_t TIME) +void TimerManager::TickTimers(time_t TIME) { timerlist::iterator found = Timers.find(TIME); @@ -42,11 +28,33 @@ void TickTimers(time_t TIME) { 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; + } + } } } @@ -58,7 +66,7 @@ void TickTimers(time_t TIME) * 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--) { @@ -70,16 +78,16 @@ void TickMissedTimers(time_t TIME) { 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; @@ -97,3 +105,4 @@ void AddTimer(InspTimer* T) x->push_back(T); } +