libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TIMER: Implemented checks for duplicated timers

Browse Source
This commit is contained in:
Eugene Sandulenko 2011-08-05 17:56:04 +01:00
parent 0dafa7f80f
commit 4c7958450f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backends/timer/default/default-timer.cpp
View File

@ -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;

4
backends/timer/default/default-timer.h
View File

@ -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();