-#include <algorithm>
+#include <msp/core/algorithm.h>
#include <msp/core/raii.h>
#include "timer.h"
#include "utils.h"
namespace Time {
Timer::Timer():
- sem(1),
- blocking(false)
+ sem(1)
{ }
Timer::~Timer()
{
- for(vector<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
- delete i->slot;
+ for(const SlotProxy &s: slots)
+ delete s.slot;
}
Timer::Slot &Timer::add(const TimeDelta &td)
{
Slot *s = new Slot(td);
MutexLock l(mutex);
- slots.push_back(s);
+ slots.push_back({ s });
push_heap(slots.begin(), slots.end());
if(blocking)
sem.signal();
{
Slot *s = new Slot(ts);
MutexLock l(mutex);
- slots.push_back(s);
+ slots.push_back({ s });
push_heap(slots.begin(), slots.end());
if(blocking)
sem.signal();
void Timer::cancel(Slot &slot)
{
MutexLock l(mutex);
- for(vector<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
- if(i->slot==&slot)
- {
- delete i->slot;
- slots.erase(i);
- make_heap(slots.begin(), slots.end());
- return;
- }
-}
-
-void Timer::tick(bool block)
-{
- if(block)
- tick();
- else
- tick(zero);
+ auto i = find_member(slots, &slot, &SlotProxy::slot);
+ if(i!=slots.end())
+ {
+ delete i->slot;
+ slots.erase(i);
+ make_heap(slots.begin(), slots.end());
+ }
}
void Timer::tick()
void Timer::tick(const TimeDelta &timeout)
{
+ if(timeout<zero)
+ throw invalid_argument("Timer::tick");
+
do_tick(timeout);
}
if(timeout>=zero)
deadline = now()+timeout;
- Slot *next = 0;
+ Slot *next = nullptr;
{
MutexLock l(mutex);
while(1)
if(next->signal_timeout.emit() && next->increment())
{
MutexLock l(mutex);
- slots.push_back(next);
+ slots.push_back({ next });
push_heap(slots.begin(), slots.end());
}
else
}
-Timer::SlotProxy::SlotProxy(Slot *s):
- slot(s)
-{ }
-
bool Timer::SlotProxy::operator<(const SlotProxy &sp) const
{
return slot->get_timeout()>sp.slot->get_timeout();