1 files changed, 33 insertions, 29 deletions

diff --git a/src/timer.cpp b/src/timer.cpp
index e04a186cf..48ad79df7 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -20,60 +20,64 @@
  */
 
 
-/* $Core */
-
 #include "inspircd.h"
-#include "timer.h"
 
-TimerManager::TimerManager()
+void Timer::SetInterval(unsigned int newinterval)
 {
+	ServerInstance->Timers.DelTimer(this);
+	secs = newinterval;
+	SetTrigger(ServerInstance->Time() + newinterval);
+	ServerInstance->Timers.AddTimer(this);
 }
 
-TimerManager::~TimerManager()
+Timer::Timer(unsigned int secs_from_now, bool repeating)
+	: trigger(ServerInstance->Time() + secs_from_now)
+	, secs(secs_from_now)
+	, repeat(repeating)
 {
-	for(std::vector<Timer *>::iterator i = Timers.begin(); i != Timers.end(); i++)
-		delete *i;
+}
+
+Timer::~Timer()
+{
+	ServerInstance->Timers.DelTimer(this);
 }
 
 void TimerManager::TickTimers(time_t TIME)
 {
-	while ((Timers.size()) && (TIME > (*Timers.begin())->GetTimer()))
+	for (TimerMap::iterator i = Timers.begin(); i != Timers.end(); )
 	{
-		std::vector<Timer *>::iterator i = Timers.begin();
-		Timer *t = (*i);
+		Timer* t = i->second;
+		if (t->GetTrigger() > TIME)
+			break;
+
+		Timers.erase(i++);
 
-		// Probable fix: move vector manipulation to *before* we modify the vector.
-		Timers.erase(i);
+		if (!t->Tick(TIME))
+			continue;
 
-		t->Tick(TIME);
 		if (t->GetRepeat())
 		{
-			t->SetTimer(TIME + t->GetSecs());
+			t->SetTrigger(TIME + t->GetInterval());
 			AddTimer(t);
 		}
-		else
-			delete t;
 	}
 }
 
-void TimerManager::DelTimer(Timer* T)
+void TimerManager::DelTimer(Timer* t)
 {
-	std::vector<Timer *>::iterator i = std::find(Timers.begin(), Timers.end(), T);
+	std::pair<TimerMap::iterator, TimerMap::iterator> itpair = Timers.equal_range(t->GetTrigger());
 
-	if (i != Timers.end())
+	for (TimerMap::iterator i = itpair.first; i != itpair.second; ++i)
 	{
-		delete (*i);
-		Timers.erase(i);
+		if (i->second == t)
+		{
+			Timers.erase(i);
+			break;
+		}
 	}
 }
 
-void TimerManager::AddTimer(Timer* T)
-{
-	Timers.push_back(T);
-	std::sort(Timers.begin(), Timers.end(), TimerManager::TimerComparison);
-}
-
-bool TimerManager::TimerComparison( Timer *one, Timer *two)
+void TimerManager::AddTimer(Timer* t)
 {
-	return (one->GetTimer()) < (two->GetTimer());
+	Timers.insert(std::make_pair(t->GetTrigger(), t));
 }