+#ifdef HAVE_CONFIG_H
+# include <simgear_config.h>
+#endif
+
#include "event_mgr.hxx"
-#include <simgear/math/SGMath.hxx>
#include <simgear/debug/logstream.hxx>
void SGEventMgr::add(const std::string& name, SGCallback* cb,
{
// Clamp the delay value to 1 usec, so that user code can use
// "zero" as a synonym for "next frame".
- if(delay <= 0) delay = 0.000001;
+ if(delay <= 0) delay = 1e-6;
+ if(interval <= 0) interval = 1e-6; // No timer endless loops please...
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;
+SGEventMgr::SGEventMgr() :
+ _inited(false)
+{
+
+}
+
+SGEventMgr::~SGEventMgr()
+{
+
+}
+
+void SGEventMgr::unbind()
+{
+ _freezeProp.clear();
+ _rtProp.clear();
+}
+
+void SGEventMgr::init()
+{
+ if (_inited) {
+ SG_LOG(SG_GENERAL, SG_WARN, "duplicate init of SGEventMgr");
}
+ _inited = true;
+}
+
+void SGEventMgr::shutdown()
+{
+ _inited = false;
+
+ _simQueue.clear();
+ _rtQueue.clear();
}
void SGEventMgr::update(double delta_time_sec)
void SGEventMgr::removeTask(const std::string& name)
{
+ // due to the ordering of the event-mgr in FG, tasks can be removed
+ // after we are shutdown (and hence, have all been cleared). Guard
+ // against this so we don't generate warnings below.
+ if (!_inited) {
+ return;
+ }
+
SGTimer* t = _simQueue.findByName(name);
if (t) {
_simQueue.remove(t);
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;
+ }
}
////////////////////////////////////////////////////////////////////////
_table = new HeapEntry[_tableSize];
for(int i=0; i<_tableSize; i++) {
- _table[i].pri = 0;
+ _table[i].pri = 0;
_table[i].timer = 0;
}
}
SGTimerQueue::~SGTimerQueue()
{
+ clear();
+ delete[] _table;
+}
+
+void SGTimerQueue::clear()
+{
+ // delete entries
for(int i=0; i<_numEntries; i++) {
delete _table[i].timer;
- _table[i].timer = 0;
}
+
_numEntries = 0;
- delete[] _table;
- _table = 0;
- _tableSize = 0;
+
+ // clear entire table to empty
+ for(int i=0; i<_tableSize; i++) {
+ _table[i].pri = 0;
+ _table[i].timer = 0;
+ }
}
void SGTimerQueue::update(double deltaSecs)
_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;
}
-