X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimer.cpp;h=f26900b8d4a589769c707b59513de6aa2d8dc129;hb=b4806214e905752617691f851717033fd3f266c2;hp=59360b63fa6e18a83fed699429bf7e76a75d0b75;hpb=d16185720fa344263367dbd50c61bfc8183d99a4;p=libs%2Fcore.git

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 59360b6..f26900b 100644
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -7,6 +7,11 @@ using namespace std;
 namespace Msp {
 namespace Time {
 
+Timer::Timer():
+	sem(1),
+	blocking(false)
+{ }
+
 Timer::~Timer()
 {
 	for(vector<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
@@ -16,23 +21,22 @@ Timer::~Timer()
 Timer::Slot &Timer::add(const TimeDelta &td)
 {
 	Slot *s = new Slot(td);
-	mutex.lock();
+	MutexLock l(mutex);
 	slots.push_back(s);
 	push_heap(slots.begin(), slots.end());
-	mutex.unlock();
-	sem.signal();
+	if(blocking)
+		sem.signal();
 	return *s;
 }
 
 Timer::Slot &Timer::add(const TimeStamp &ts)
 {
 	Slot *s = new Slot(ts);
-	{
-		MutexLock l(mutex);
-		slots.push_back(s);
-		push_heap(slots.begin(), slots.end());
-	}
-	sem.signal();
+	MutexLock l(mutex);
+	slots.push_back(s);
+	push_heap(slots.begin(), slots.end());
+	if(blocking)
+		sem.signal();
 	return *s;
 }
 
@@ -59,7 +63,12 @@ void Timer::tick(bool block)
 			if(slots.empty())
 			{
 				if(block)
+				{
+					blocking = true;
+					mutex.unlock();
 					sem.wait();
+					mutex.lock();
+				}
 				else
 					return;
 			}
@@ -70,7 +79,12 @@ void Timer::tick(bool block)
 			if(stamp<=t)
 				break;
 			else if(block)
+			{
+				blocking = true;
+				mutex.unlock();
 				sem.wait(stamp-t);
+				mutex.lock();
+			}
 			else
 				return;
 		}