summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ac26a7e)
This is in line with other similar interfaces, such as Poller and
Semaphore. The old function still exists but is deprecated.
void Timer::tick(bool block)
{
void Timer::tick(bool block)
{
+ if(block)
+ tick();
+ else
+ tick(zero);
+}
+
+void Timer::tick()
+{
+ do_tick(-sec);
+}
+
+void Timer::tick(const TimeDelta &timeout)
+{
+ do_tick(timeout);
+}
+
+void Timer::do_tick(const TimeDelta &timeout)
+{
+ TimeStamp deadline;
+ if(timeout>=zero)
+ deadline = now()+timeout;
+
Slot *next = 0;
{
MutexLock l(mutex);
Slot *next = 0;
{
MutexLock l(mutex);
+ if(timeout && (!deadline || t<deadline))
{
SetFlag setf(blocking);
mutex.unlock();
{
SetFlag setf(blocking);
mutex.unlock();
+ if(stamp && (!deadline || stamp<deadline))
+ else if(deadline)
+ sem.wait(deadline-t);
else
sem.wait();
mutex.lock();
else
sem.wait();
mutex.lock();
/** Cancels a previously added timer. */
void cancel(Slot &);
/** 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.
+ /** Deprecated. Use one of the other overloads. */
+ void tick(bool block);
- 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);
+ /** Waits until a timer expires, then executes it. If no timers have been
+ set, blocks until one is added from another thread. */
+ void tick();
+ /** Waits until a timer expires but at most the specified amount of time.
+ If a timer did expire before the timeout, it is executed. */
+ void tick(const TimeDelta &);
+
+private:
+ void do_tick(const TimeDelta &);
+
+public:
TimeStamp get_next_timeout() const;
};
TimeStamp get_next_timeout() const;
};