X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=c499b7991e724904e1f63c033b2367ac9c35cdfb;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=a79105f5292d23e5ce6599619c703897f1990461;hpb=03e0fb206d3f5709868f03bc7a401cb666c38ffb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/timer.cpp b/src/timer.cpp index a79105f52..c499b7991 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -1,135 +1,87 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2017 Sadie Powell + * Copyright (C) 2013-2014 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007, 2010 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ + #include "inspircd.h" -#include "timer.h" -TimerManager::TimerManager(InspIRCd* Instance) : CantDeleteHere(false), ServerInstance(Instance) +void Timer::SetInterval(unsigned int newinterval) { + ServerInstance->Timers.DelTimer(this); + secs = newinterval; + SetTrigger(ServerInstance->Time() + newinterval); + ServerInstance->Timers.AddTimer(this); } -void TimerManager::TickTimers(time_t TIME) +Timer::Timer(unsigned int secs_from_now, bool repeating) + : trigger(ServerInstance->Time() + secs_from_now) + , secs(secs_from_now) + , repeat(repeating) { - this->CantDeleteHere = true; - timerlist::iterator found = Timers.find(TIME); - - if (found != Timers.end()) - { - timergroup* x = found->second; - /* There are pending timers to trigger. - * WARNING: Timers may delete themselves from within - * their own Tick methods! see the comment below in - * the DelTimer method. - */ - for (timergroup::iterator y = x->begin(); y != x->end(); y++) - { - Timer* n = *y; - n->Tick(TIME); - if (n->GetRepeat()) - { - AddTimer(n, n->GetSecs()); - } - else - { - DELETE(n); - } - } - - Timers.erase(found); - DELETE(x); - } +} - this->CantDeleteHere = false; +Timer::~Timer() +{ + ServerInstance->Timers.DelTimer(this); } -void TimerManager::DelTimer(Timer* T) +void TimerManager::TickTimers(time_t TIME) { - if (this->CantDeleteHere) + for (TimerMap::iterator i = Timers.begin(); i != Timers.end(); ) { - /* If a developer tries to delete a timer from within its own Tick method, - * then chances are this is just going to totally fuck over the timergroup - * and timerlist iterators and cause a crash. Thanks to peavey and Bricker - * for noticing this bug. - * If we're within the tick loop when the DelTimer is called (signified - * by the var 'CantDeleteHere') then we simply return for non-repeating - * timers, and cancel the repeat on repeating timers. We can do this because - * we know that the timer tick loop will safely delete the timer for us - * anyway and therefore we avoid stack corruption. - */ - if (T->GetRepeat()) - T->CancelRepeat(); - else - return; - } + Timer* t = i->second; + if (t->GetTrigger() > TIME) + break; - timerlist::iterator found = Timers.find(T->GetTimer()); + Timers.erase(i++); - if (found != Timers.end()) - { - timergroup* x = found->second; - for (timergroup::iterator y = x->begin(); y != x->end(); y++) + if (!t->Tick(TIME)) + continue; + + if (t->GetRepeat()) { - Timer* n = *y; - if (n == T) - { - DELETE(n); - x->erase(y); - if (!x->size()) - { - Timers.erase(found); - DELETE(x); - } - return; - } + t->SetTrigger(TIME + t->GetInterval()); + AddTimer(t); } } } -/** 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::DelTimer(Timer* t) { - for (time_t n = TIME-1; n > TIME-120; n--) - this->TickTimers(TIME); -} - -void TimerManager::AddTimer(Timer* T, long secs_from_now) -{ - timergroup* x = NULL; - - int time_to_trigger = 0; - if (!secs_from_now) - time_to_trigger = T->GetTimer(); - else - time_to_trigger = secs_from_now + ServerInstance->Time(); - - timerlist::iterator found = Timers.find(time_to_trigger); + std::pair itpair = Timers.equal_range(t->GetTrigger()); - if (found != Timers.end()) + for (TimerMap::iterator i = itpair.first; i != itpair.second; ++i) { - x = found->second; - } - else - { - x = new timergroup; - Timers[time_to_trigger] = x; + if (i->second == t) + { + Timers.erase(i); + break; + } } - - x->push_back(T); } +void TimerManager::AddTimer(Timer* t) +{ + Timers.insert(std::make_pair(t->GetTrigger(), t)); +}