void Timer::tick(bool block)
{
+ if(block)
+ tick();
+ else
+ tick(zero);
+}
+
+void Timer::tick()
+{
+ do_tick(-sec);
+}
+
+void Timer::tick(const TimeDelta &timeout)
+{
+ if(timeout<zero)
+ throw invalid_argument("Timer::tick");
+
+ do_tick(timeout);
+}
+
+void Timer::do_tick(const TimeDelta &timeout)
+{
+ TimeStamp deadline;
+ if(timeout>=zero)
+ deadline = now()+timeout;
+
Slot *next = 0;
{
MutexLock l(mutex);
break;
}
- if(block)
+ if(timeout && (!deadline || t<deadline))
{
SetFlag setf(blocking);
mutex.unlock();
- if(stamp)
+ if(stamp && (!deadline || stamp<deadline))
sem.wait(stamp-t);
+ else if(deadline)
+ sem.wait(deadline-t);
else
sem.wait();
mutex.lock();