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

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index efe22cc..59360b6 100644
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -1,9 +1,4 @@
-/*
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <algorithm>
 #include "timer.h"
 #include "utils.h"
 
@@ -14,15 +9,16 @@ namespace Time {
 
 Timer::~Timer()
 {
-	for(set<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
+	for(vector<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
 		delete i->slot;
 }
 
 Timer::Slot &Timer::add(const TimeDelta &td)
 {
-	Slot *s=new Slot(td);
+	Slot *s = new Slot(td);
 	mutex.lock();
-	slots.insert(s);
+	slots.push_back(s);
+	push_heap(slots.begin(), slots.end());
 	mutex.unlock();
 	sem.signal();
 	return *s;
@@ -30,10 +26,11 @@ Timer::Slot &Timer::add(const TimeDelta &td)
 
 Timer::Slot &Timer::add(const TimeStamp &ts)
 {
-	Slot *s=new Slot(ts);
+	Slot *s = new Slot(ts);
 	{
 		MutexLock l(mutex);
-		slots.insert(s);
+		slots.push_back(s);
+		push_heap(slots.begin(), slots.end());
 	}
 	sem.signal();
 	return *s;
@@ -42,36 +39,62 @@ Timer::Slot &Timer::add(const TimeStamp &ts)
 void Timer::cancel(Slot &slot)
 {
 	MutexLock l(mutex);
-	if(slots.erase(&slot))
-		delete &slot;
+	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(slots.empty())
-	{
-		if(block)
-			sem.wait();
-		else
-			return;
-	}
-
-	Slot *next;
+	Slot *next = 0;
 	{
 		MutexLock l(mutex);
-		next=slots.begin()->slot;
+		while(1)
+		{
+			if(slots.empty())
+			{
+				if(block)
+					sem.wait();
+				else
+					return;
+			}
+
+			next = slots.begin()->slot;
+			const TimeStamp &stamp = next->get_timeout();
+			const TimeStamp t = now();
+			if(stamp<=t)
+				break;
+			else if(block)
+				sem.wait(stamp-t);
+			else
+				return;
+		}
+
+		pop_heap(slots.begin(), slots.end());
+		slots.pop_back();
 	}
 
-	const TimeStamp &stamp=next->get_timeout();
-	const TimeStamp t=now();
-	if(stamp<=t || (block && sem.wait(stamp-t)==1))
+	try
 	{
-		slots.erase(slots.begin());
 		if(next->signal_timeout.emit() && next->increment())
-			slots.insert(next);
+		{
+			MutexLock l(mutex);
+			slots.push_back(next);
+			push_heap(slots.begin(), slots.end());
+		}
 		else
 			delete next;
 	}
+	catch(...)
+	{
+		delete next;
+		throw;
+	}
 }
 
 TimeStamp Timer::get_next_timeout() const
@@ -95,7 +118,7 @@ bool Timer::Slot::increment()
 {
 	if(!interval)
 		return false;
-	timeout+=interval;
+	timeout += interval;
 	return true;
 }
 
@@ -106,7 +129,7 @@ Timer::SlotProxy::SlotProxy(Slot *s):
 
 bool Timer::SlotProxy::operator<(const SlotProxy &sp) const
 {
-	return slot->get_timeout()<sp.slot->get_timeout();
+	return slot->get_timeout()>sp.slot->get_timeout();
 }
 
 } // namespace Time