t->callback = cb;
t->repeat = repeat;
t->name = name;
+ t->running = false;
SGTimerQueue* q = simtime ? &_simQueue : &_rtQueue;
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();
- t->run();
- if(t->repeat) {
+ if(t->repeat)
insert(t, t->interval);
- } else {
+ // 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;
- }
}
}