aboutsummaryrefslogtreecommitdiff
path: root/backends/timer/default
diff options
context:
space:
mode:
authorEugene Sandulenko2011-08-05 17:56:04 +0100
committerEugene Sandulenko2011-08-06 11:30:44 +0100
commit4c7958450f628937270f259cc480c1191ea2fb2f (patch)
treef45dd9484dce1eb93bb8aaf144bb6c94b39e7855 /backends/timer/default
parent0dafa7f80fbc271e599092e81655d8073ab91abe (diff)
downloadscummvm-rg350-4c7958450f628937270f259cc480c1191ea2fb2f.tar.gz
scummvm-rg350-4c7958450f628937270f259cc480c1191ea2fb2f.tar.bz2
scummvm-rg350-4c7958450f628937270f259cc480c1191ea2fb2f.zip
TIMER: Implemented checks for duplicated timers
Diffstat (limited to 'backends/timer/default')
-rw-r--r--backends/timer/default/default-timer.cpp16
-rw-r--r--backends/timer/default/default-timer.h4
2 files changed, 19 insertions, 1 deletions
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index e17aaea444..449dda2ece 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -24,10 +24,10 @@
#include "common/util.h"
#include "common/system.h"
-
struct TimerSlot {
Common::TimerManager::TimerProc callback;
void *refCon;
+ Common::String id;
uint32 interval; // in microseconds
uint32 nextFireTime; // in milliseconds
@@ -113,9 +113,23 @@ bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, v
assert(interval > 0);
Common::StackLock lock(_mutex);
+ if (_callbacks.contains(id)) {
+ if (_callbacks[id] != callback) {
+ error("Different callbacks are referred by same name (%s)", id.c_str());
+ }
+ TimerSlotMap::const_iterator i;
+
+ for (i = _callbacks.begin(); i != _callbacks.end(); ++i) {
+ if (i->_value == callback) {
+ error("Same callback is referred by different names (%s vs %s)", i->_key.c_str(), id.c_str());
+ }
+ }
+ _callbacks[id] = callback;
+
TimerSlot *slot = new TimerSlot;
slot->callback = callback;
slot->refCon = refCon;
+ slot->id = id;
slot->interval = interval;
slot->nextFireTime = g_system->getMillis() + interval / 1000;
slot->nextFireTimeMicro = interval % 1000;
diff --git a/backends/timer/default/default-timer.h b/backends/timer/default/default-timer.h
index 33dd46cc57..e5a9dada79 100644
--- a/backends/timer/default/default-timer.h
+++ b/backends/timer/default/default-timer.h
@@ -23,6 +23,7 @@
#define BACKENDS_TIMER_DEFAULT_H
#include "common/str.h"
+#include "common/hash-str.h"
#include "common/timer.h"
#include "common/mutex.h"
@@ -30,9 +31,12 @@ struct TimerSlot;
class DefaultTimerManager : public Common::TimerManager {
private:
+ typedef Common::HashMap<Common::String, TimerProc, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> TimerSlotMap;
+
Common::Mutex _mutex;
void *_timerHandler;
TimerSlot *_head;
+ TimerSlotMap _callbacks;
public:
DefaultTimerManager();