From 03e0fb206d3f5709868f03bc7a401cb666c38ffb Mon Sep 17 00:00:00 2001 From: w00t Date: Mon, 15 Oct 2007 21:03:30 +0000 Subject: [PATCH] InspTimer -> Timer git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8205 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/commands/cmd_whowas.h | 6 ++-- include/inspircd.h | 2 +- include/inspsocket.h | 4 +-- include/timer.h | 34 +++++++++---------- src/dns.cpp | 8 ++--- src/modules/extra/m_pgsql.cpp | 4 +-- src/modules/m_httpd.cpp | 4 +-- src/modules/m_spanningtree/handshaketimer.cpp | 2 +- src/modules/m_spanningtree/handshaketimer.h | 2 +- src/modules/m_spanningtree/timesynctimer.cpp | 4 +-- src/modules/m_spanningtree/timesynctimer.h | 8 ++--- src/timer.cpp | 8 ++--- 12 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h index c8f367116..ca411de07 100644 --- a/include/commands/cmd_whowas.h +++ b/include/commands/cmd_whowas.h @@ -35,7 +35,7 @@ class WhoWasMaintainTimer; /* Forward ref for typedefs */ class WhoWasGroup; -/** InspTimer that is used to maintain the whowas list, called once an hour +/** Timer that is used to maintain the whowas list, called once an hour */ extern WhoWasMaintainTimer* timer; @@ -127,13 +127,13 @@ class WhoWasGroup : public classbase ~WhoWasGroup(); }; -class WhoWasMaintainTimer : public InspTimer +class WhoWasMaintainTimer : public Timer { private: InspIRCd* ServerInstance; public: WhoWasMaintainTimer(InspIRCd* Instance, long interval) - : InspTimer(interval, Instance->Time(), true), ServerInstance(Instance) + : Timer(interval, Instance->Time(), true), ServerInstance(Instance) { } virtual void Tick(time_t TIME); diff --git a/include/inspircd.h b/include/inspircd.h index afa4db7f4..4dc90c8e8 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -455,7 +455,7 @@ class CoreExport InspIRCd : public classbase */ DNS* Res; - /** Timer manager class, triggers InspTimer timer events + /** Timer manager class, triggers Timer timer events */ TimerManager* Timers; diff --git a/include/inspsocket.h b/include/inspsocket.h index d165d64f2..d4ff58d93 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -72,7 +72,7 @@ using irc::sockets::insp_aton; /** Used to time out socket connections */ -class CoreExport SocketTimeout : public InspTimer +class CoreExport SocketTimeout : public Timer { private: /** InspSocket the class is attached to @@ -92,7 +92,7 @@ class CoreExport SocketTimeout : public InspTimer * @param secs_from_now Seconds from now to time out * @param now The current time */ - SocketTimeout(int fd, InspIRCd* Instance, InspSocket* thesock, long secs_from_now, time_t now) : InspTimer(secs_from_now, now), sock(thesock), ServerInstance(Instance), sfd(fd) { }; + SocketTimeout(int fd, InspIRCd* Instance, InspSocket* thesock, long secs_from_now, time_t now) : Timer(secs_from_now, now), sock(thesock), ServerInstance(Instance), sfd(fd) { }; /** Handle tick event */ virtual void Tick(time_t now); diff --git a/include/timer.h b/include/timer.h index ef8b82e31..82c788242 100644 --- a/include/timer.h +++ b/include/timer.h @@ -17,16 +17,16 @@ class InspIRCd; /** Timer class for one-second resolution timers - * InspTimer provides a facility which allows module + * Timer provides a facility which allows module * developers to create one-shot timers. The timer * can be made to trigger at any time up to a one-second - * resolution. To use InspTimer, inherit a class from - * InspTimer, then insert your inherited class into the + * resolution. To use Timer, inherit a class from + * Timer, then insert your inherited class into the * queue using Server::AddTimer(). The Tick() method of * your object (which you should override) will be called * at the given time. */ -class CoreExport InspTimer : public Extensible +class CoreExport Timer : public Extensible { private: /** The triggering time @@ -44,7 +44,7 @@ class CoreExport InspTimer : public Extensible * @param now The time now * @param repeating Repeat this timer every secs_from_now seconds if set to true */ - InspTimer(long secs_from_now,time_t now, bool repeating = false) + Timer(long secs_from_now,time_t now, bool repeating = false) { trigger = now + secs_from_now; secs = secs_from_now; @@ -53,7 +53,7 @@ class CoreExport InspTimer : public Extensible /** Default destructor, does nothing. */ - virtual ~InspTimer() { } + virtual ~Timer() { } /** Retrieve the current triggering time */ @@ -89,7 +89,7 @@ class CoreExport InspTimer : public Extensible * You should use this method call to remove a recurring * timer if you wish to do so within the timer's Tick * event, as calling TimerManager::DelTimer() from within - * the InspTimer::Tick() method is dangerous and may + * the Timer::Tick() method is dangerous and may * cause a segmentation fault. Calling CancelRepeat() * is safe in this case. */ @@ -100,7 +100,7 @@ class CoreExport InspTimer : public Extensible }; -/** This class manages sets of InspTimers, and triggers them at their defined times. +/** This class manages sets of Timers, and triggers them at their defined times. * This will ensure timers are not missed, as well as removing timers that have * expired and allowing the addition of new ones. */ @@ -109,7 +109,7 @@ class CoreExport TimerManager : public Extensible protected: /** A group of timers all set to trigger at the same time */ - typedef std::vector timergroup; + typedef std::vector timergroup; /** A map of timergroups, each group has a specific trigger time */ typedef std::map timerlist; @@ -129,23 +129,23 @@ class CoreExport TimerManager : public Extensible /** Constructor */ TimerManager(InspIRCd* Instance); - /** Tick all pending InspTimers + /** Tick all pending Timers * @param TIME the current system time */ void TickTimers(time_t TIME); - /** Add an InspTimer - * @param T an InspTimer derived class to add + /** Add an Timer + * @param T an Timer derived class to add * @param secs_from_now You may set this to the number of seconds * from the current time when the timer will tick, or you may just - * leave this unset and the values set by the InspTimers constructor + * leave this unset and the values set by the Timers constructor * will be used. This is used internally for re-triggering repeating * timers. */ - void AddTimer(InspTimer* T, long secs_from_now = 0); - /** Delete an InspTimer - * @param T an InspTimer derived class to delete + void AddTimer(Timer* T, long secs_from_now = 0); + /** Delete an Timer + * @param T an Timer derived class to delete */ - void DelTimer(InspTimer* T); + void DelTimer(Timer* T); /** Tick any timers that have been missed due to lag * @param TIME the current system time */ diff --git a/src/dns.cpp b/src/dns.cpp index c8e465de8..ec19ed397 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -108,14 +108,14 @@ class DNSRequest int SendRequests(const DNSHeader *header, const int length, QueryType qt); }; -class CacheTimer : public InspTimer +class CacheTimer : public Timer { private: InspIRCd* ServerInstance; DNS* dns; public: CacheTimer(InspIRCd* Instance, DNS* thisdns) - : InspTimer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { } + : Timer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { } virtual void Tick(time_t TIME) { @@ -123,13 +123,13 @@ class CacheTimer : public InspTimer } }; -class RequestTimeout : public InspTimer +class RequestTimeout : public Timer { InspIRCd* ServerInstance; DNSRequest* watch; int watchid; public: - RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : InspTimer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id) + RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id) { } diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index afa32d3d8..97ecd0a8a 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -81,13 +81,13 @@ std::string SQLhost::GetDSN() return conninfo.str(); } -class ReconnectTimer : public InspTimer +class ReconnectTimer : public Timer { private: Module* mod; public: ReconnectTimer(InspIRCd* SI, Module* m) - : InspTimer(5, SI->Time(), false), mod(m) + : Timer(5, SI->Time(), false), mod(m) { } virtual void Tick(time_t TIME); diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index dc8a8c8a8..b89260831 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -36,7 +36,7 @@ class HttpServerSocket; /** This class is used to handle HTTP socket timeouts */ -class HttpServerTimeout : public InspTimer +class HttpServerTimeout : public Timer { private: /** HttpServerSocket we are attached to @@ -422,7 +422,7 @@ class HttpServerSocket : public InspSocket } }; -HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : InspTimer(15, time(NULL), true), s(sock), SE(engine) +HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : Timer(15, time(NULL), true), s(sock), SE(engine) { } diff --git a/src/modules/m_spanningtree/handshaketimer.cpp b/src/modules/m_spanningtree/handshaketimer.cpp index 617c3164d..ffe81ad80 100644 --- a/src/modules/m_spanningtree/handshaketimer.cpp +++ b/src/modules/m_spanningtree/handshaketimer.cpp @@ -28,7 +28,7 @@ /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */ -HandshakeTimer::HandshakeTimer(InspIRCd* Inst, TreeSocket* s, Link* l, SpanningTreeUtilities* u, int delay) : InspTimer(delay, time(NULL)), Instance(Inst), sock(s), lnk(l), Utils(u) +HandshakeTimer::HandshakeTimer(InspIRCd* Inst, TreeSocket* s, Link* l, SpanningTreeUtilities* u, int delay) : Timer(delay, time(NULL)), Instance(Inst), sock(s), lnk(l), Utils(u) { thefd = sock->GetFd(); } diff --git a/src/modules/m_spanningtree/handshaketimer.h b/src/modules/m_spanningtree/handshaketimer.h index 496102dda..7f2900d7e 100644 --- a/src/modules/m_spanningtree/handshaketimer.h +++ b/src/modules/m_spanningtree/handshaketimer.h @@ -21,7 +21,7 @@ class SpanningTreeUtilities; class TreeSocket; class Link; -class HandshakeTimer : public InspTimer +class HandshakeTimer : public Timer { private: InspIRCd* Instance; diff --git a/src/modules/m_spanningtree/timesynctimer.cpp b/src/modules/m_spanningtree/timesynctimer.cpp index dd89a1217..024772893 100644 --- a/src/modules/m_spanningtree/timesynctimer.cpp +++ b/src/modules/m_spanningtree/timesynctimer.cpp @@ -28,7 +28,7 @@ /* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */ -TimeSyncTimer::TimeSyncTimer(InspIRCd *Inst, ModuleSpanningTree *Mod) : InspTimer(600, Inst->Time(), true), Instance(Inst), Module(Mod) +TimeSyncTimer::TimeSyncTimer(InspIRCd *Inst, ModuleSpanningTree *Mod) : Timer(600, Inst->Time(), true), Instance(Inst), Module(Mod) { } @@ -37,7 +37,7 @@ void TimeSyncTimer::Tick(time_t TIME) Module->BroadcastTimeSync(); } -CacheRefreshTimer::CacheRefreshTimer(InspIRCd *Inst, SpanningTreeUtilities *Util) : InspTimer(3600, Inst->Time(), true), Instance(Inst), Utils(Util) +CacheRefreshTimer::CacheRefreshTimer(InspIRCd *Inst, SpanningTreeUtilities *Util) : Timer(3600, Inst->Time(), true), Instance(Inst), Utils(Util) { } diff --git a/src/modules/m_spanningtree/timesynctimer.h b/src/modules/m_spanningtree/timesynctimer.h index 434ee253c..999fbed7b 100644 --- a/src/modules/m_spanningtree/timesynctimer.h +++ b/src/modules/m_spanningtree/timesynctimer.h @@ -20,11 +20,11 @@ class ModuleSpanningTree; class SpanningTreeUtilities; class InspIRCd; -/** Create a timer which recurs every second, we inherit from InspTimer. - * InspTimer is only one-shot however, so at the end of each Tick() we simply +/** Create a timer which recurs every second, we inherit from Timer. + * Timer is only one-shot however, so at the end of each Tick() we simply * insert another of ourselves into the pending queue :) */ -class TimeSyncTimer : public InspTimer +class TimeSyncTimer : public Timer { private: InspIRCd *Instance; @@ -34,7 +34,7 @@ class TimeSyncTimer : public InspTimer virtual void Tick(time_t TIME); }; -class CacheRefreshTimer : public InspTimer +class CacheRefreshTimer : public Timer { private: InspIRCd *Instance; diff --git a/src/timer.cpp b/src/timer.cpp index c04107502..a79105f52 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -33,7 +33,7 @@ void TimerManager::TickTimers(time_t TIME) */ for (timergroup::iterator y = x->begin(); y != x->end(); y++) { - InspTimer* n = *y; + Timer* n = *y; n->Tick(TIME); if (n->GetRepeat()) { @@ -52,7 +52,7 @@ void TimerManager::TickTimers(time_t TIME) this->CantDeleteHere = false; } -void TimerManager::DelTimer(InspTimer* T) +void TimerManager::DelTimer(Timer* T) { if (this->CantDeleteHere) { @@ -79,7 +79,7 @@ void TimerManager::DelTimer(InspTimer* T) timergroup* x = found->second; for (timergroup::iterator y = x->begin(); y != x->end(); y++) { - InspTimer* n = *y; + Timer* n = *y; if (n == T) { DELETE(n); @@ -108,7 +108,7 @@ void TimerManager::TickMissedTimers(time_t TIME) this->TickTimers(TIME); } -void TimerManager::AddTimer(InspTimer* T, long secs_from_now) +void TimerManager::AddTimer(Timer* T, long secs_from_now) { timergroup* x = NULL; -- 2.39.2