X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftime%2Ftimer.cpp;h=04c3074494e921d39f3edb54e53e378c8623e826;hb=41363aed34382386f915f17c1a961750b4fdcb14;hp=be1d1ed3291482b453ab03d228f5961eb80b8cab;hpb=108f2e7de1c2427e39cdf55efbcd0ca3914e451a;p=libs%2Fcore.git

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index be1d1ed..04c3074 100644
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/core/raii.h>
 #include "timer.h"
 #include "utils.h"
@@ -9,14 +9,13 @@ namespace Msp {
 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)
@@ -44,22 +43,13 @@ Timer::Slot &Timer::add(const TimeStamp &ts)
 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()
@@ -69,6 +59,9 @@ void Timer::tick()
 
 void Timer::tick(const TimeDelta &timeout)
 {
+	if(timeout<zero)
+		throw invalid_argument("Timer::tick");
+
 	do_tick(timeout);
 }
 
@@ -78,7 +71,7 @@ void Timer::do_tick(const TimeDelta &timeout)
 	if(timeout>=zero)
 		deadline = now()+timeout;
 
-	Slot *next = 0;
+	Slot *next = nullptr;
 	{
 		MutexLock l(mutex);
 		while(1)