More CoreExport, brought the errors down, but some still persist.

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

diff --git a/include/timer.h b/include/timer.h
index 82c788242093ffd5f4c7abc3c3e6bb54d599d5d2..cc5364f672f5bd84cfca8c72c46b0c0bcdf7f657 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,8 +14,6 @@
 #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 +24,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 +42,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 +60,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,35 +109,24 @@ 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
-        */
-       bool CantDeleteHere;
-       /** Creating server instance
+       /** A list of all pending timers
         */
-       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
@@ -141,15 +135,16 @@ class CoreExport TimerManager : public Extensible
         * 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