Merge pull request #1018 from SaberUK/insp20+hidekills

[user/henk/code/inspircd.git] / include / timer.h

diff --git a/include/timer.h b/include/timer.h
index 82c788242093ffd5f4c7abc3c3e6bb54d599d5d2..9bb7128b85ac7f6283ec51a0e6986fc7464a6a1d 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -1,21 +1,27 @@
-/*       +------------------------------------+
- *       | 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) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
+
 #ifndef INSPIRCD_TIMER_H
 #define INSPIRCD_TIMER_H
 
-class InspIRCd;
-
 /** Timer class for one-second resolution timers
  * Timer provides a facility which allows module
  * developers to create one-shot timers. The timer
@@ -26,7 +32,7 @@ class InspIRCd;
  * your object (which you should override) will be called
  * at the given time.
  */
-class CoreExport Timer : public Extensible
+class CoreExport Timer
 {
  private:
        /** The triggering time
@@ -44,7 +50,7 @@ class CoreExport Timer : public Extensible
         * @param now The time now
         * @param repeating Repeat this timer every secs_from_now seconds if set to true
         */
-       Timer(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;
@@ -62,6 +68,13 @@ class CoreExport Timer : public Extensible
                return trigger;
        }
 
+       /** Sets the trigger timeout to a new value
+        */
+       virtual void SetTimer(time_t t)
+       {
+               trigger = t;
+       }
+
        /** Called when the timer ticks.
         * You should override this method with some useful code to
         * handle the tick event.
@@ -104,52 +117,37 @@ class CoreExport Timer : public Extensible
  * This will ensure timers are not missed, as well as removing timers that have
  * expired and allowing the addition of new ones.
  */
-class CoreExport TimerManager : public Extensible
+class CoreExport TimerManager
 {
  protected:
-       /** A group of timers all set to trigger at the same time
-        */
-       typedef std::vector<Timer*> timergroup;
-       /** A map of timergroups, each group has a specific trigger time
-        */
-       typedef std::map<time_t, timergroup*> timerlist;
-       /** Set when ticking timers, to prevent deletion while iterating
+       /** A list of all pending timers
         */
-       bool CantDeleteHere;
-       /** Creating server instance
-        */
-       InspIRCd* ServerInstance;
- private:
-
-       /** The current timer set, a map of timergroups
-        */
-       timerlist Timers;
+       std::vector<Timer *> Timers;
 
  public:
        /** Constructor
         */
-       TimerManager(InspIRCd* Instance);
+       TimerManager();
+       ~TimerManager();
+
        /** Tick all pending Timers
         * @param TIME the current system time
         */
        void TickTimers(time_t TIME);
+
        /** 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 Timers constructor
-        * will be used. This is used internally for re-triggering repeating
-        * timers.
         */
-       void AddTimer(Timer* T, long secs_from_now = 0);
+       void AddTimer(Timer *T);
+
        /** Delete an Timer
         * @param T an Timer derived class to delete
         */
        void DelTimer(Timer* T);
-       /** Tick any timers that have been missed due to lag
-        * @param TIME the current system time
+
+       /** Compares two timers
         */
-       void TickMissedTimers(time_t TIME);
+       static bool TimerComparison( Timer *one,  Timer*two);
 };
 
 #endif