Fix Timer to use is Semaphore correctly

[libs/core.git] / source / time / timer.h

diff --git a/source/time/timer.h b/source/time/timer.h
index cfa00bb0d1511f42f09591b04dbc5527ee8deb91..90d870ca9a3afbd44b155f5ccfb5b85747c02442 100644 (file)
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -1,16 +1,10 @@
-/*
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_TIME_TIMER_H_
 #define MSP_TIME_TIMER_H_
 
-#include <queue>
+#include <vector>
 #include <sigc++/sigc++.h>
-#include "../core/mutex.h"
-#include "../core/semaphore.h"
+#include <msp/core/mutex.h>
+#include <msp/core/semaphore.h>
 #include "timedelta.h"
 #include "timestamp.h"
 
@@ -41,42 +35,45 @@ public:
                Slot(const TimeStamp &);
                const TimeStamp &get_timeout() const { return timeout; }
                bool increment();
-               bool operator<(const Slot &) const;
        };
 
 private:
-       typedef bool (*fSlotCompare)(Slot *, Slot *);
+       struct SlotProxy
+       {
+               Slot *slot;
+
+               SlotProxy(Slot *);
+               bool operator<(const SlotProxy &) const;
+       };
 
-       std::priority_queue<Slot *, std::vector<Slot *>, fSlotCompare> slots;
+       std::vector<SlotProxy> slots;
        Semaphore sem;
        Mutex mutex;
+       bool blocking;
 
 public:
        Timer();
        ~Timer();
 
-       /**
-       Adds a timer that will be executed periodically as long as the timeout
-       signal hander returns true.
-       */
+       /** Adds a timer that will be executed periodically as long as the timeout
+       signal hander returns true. */
        Slot &add(const TimeDelta &);
 
-       /**
-       Adds a timer that will be executed once at a specific time.  The return
-       value of the timeout signal handler is ignored.
-       */
+       /** Adds a timer that will be executed once at a specific time.  The return
+       value of the timeout signal handler is ignored. */
        Slot &add(const TimeStamp &);
 
-       /**
-       Checks all timers, executing any that have timed out.  If block is true,
+       /** Cancels a previously added timer. */
+       void cancel(Slot &);
+
+       /** Checks all timers, executing any that have timed out.  If block is true,
        waits until one times out.
 
        Note: If there are no active timers when a blocking tick is executed, it
-       won't return until a timer is added from another thread.
-       */
-       void tick(bool block=true);
-private:
-       static bool slot_compare(Slot *, Slot *);
+       won't return until a timer is added from another thread. */
+       void tick(bool block = true);
+
+       TimeStamp get_next_timeout() const;
 };
 
 } // namespace Time