SGTimer* t = new SGTimer;
t->interval = interval;
t->callback = cb;
- t->mgr = this;
t->repeat = repeat;
- t->simtime = simtime;
t->name = name;
+ t->running = false;
SGTimerQueue* q = simtime ? &_simQueue : &_rtQueue;
q->insert(t, delay);
}
+SGTimer::~SGTimer()
+{
+ delete callback;
+ callback = NULL;
+}
+
void SGTimer::run()
{
(*callback)();
-
- if(repeat) {
- SGTimerQueue* q = simtime ? &mgr->_simQueue : &mgr->_rtQueue;
- q->insert(this, interval);
- } else {
- delete callback;
- delete this;
- }
}
void SGEventMgr::update(double delta_time_sec)
SG_LOG(SG_GENERAL, SG_WARN, "removeTask: no task found with name:" << name);
return;
}
-
- delete t;
+ if (t->running) {
+ // mark as not repeating so that the SGTimerQueue::update()
+ // will clean it up
+ t->repeat = false;
+ } else {
+ delete t;
+ }
}
////////////////////////////////////////////////////////////////////////
_now += deltaSecs;
while(_numEntries && nextTime() <= _now) {
SGTimer* t = remove();
+ if(t->repeat)
+ insert(t, t->interval);
+ // warning: this is not thread safe
+ // but the entire timer queue isn't either
+ t->running = true;
t->run();
+ t->running = false;
+ if (!t->repeat)
+ delete t;
}
}
return NULL;
}
-