F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not use internal iterator void *. fix valgrind warnings

Browse Source
This commit is contained in:
Mathieu Lacage
2006-12-11 19:14:38 +01:00
parent a29dd08cd0
commit 0dacd8bfda
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/simulator/scheduler-map.cc
View File

@@ -44,28 +44,11 @@ SchedulerMap::~SchedulerMap ()
{}
void
SchedulerMap::StoreInEvent (EventImpl *ev, EventMapI i) const
{
void *tag;
memcpy (&(tag), &i, sizeof (tag));
ev->SetInternalIterator (tag);
}
SchedulerMap::EventMapI
SchedulerMap::GetFromEvent (EventImpl *ev) const
{
EventMapI i;
void *tag = ev->GetInternalIterator ();
memcpy (&i, &(tag), sizeof (i));
return i;
}
EventId
SchedulerMap::RealInsert (EventImpl *event, Scheduler::EventKey key)
{
std::pair<EventMapI,bool> result = m_list.insert (std::make_pair (key, event));
assert (result.second);
StoreInEvent (event, result.first);
return EventId (event, key.m_ns, key.m_uid);
}
@@ -98,19 +81,18 @@ SchedulerMap::RealRemoveNext (void)
EventImpl *
SchedulerMap::RealRemove (EventId id, Scheduler::EventKey *key)
{
EventMapI i = GetFromEvent (id.GetEventImpl ());
*key = i->first;
key->m_ns = id.GetNs ();
key->m_uid = id.GetUid ();
EventMapI i = m_list.find (*key);
EventImpl *retval = i->second;
m_list.erase (i);
return i->second;
return retval;
}
bool
SchedulerMap::RealIsValid (EventId id)
{
EventMapI i = GetFromEvent (id.GetEventImpl ());
Scheduler::EventKey key = i->first;
return (key.m_ns == id.GetNs () &&
key.m_uid == id.GetUid ());
return true;
}

3
src/simulator/scheduler-map.h
View File

@@ -49,9 +49,6 @@ private:
typedef std::map<Scheduler::EventKey, EventImpl*, Scheduler::EventKeyCompare>::iterator EventMapI;
typedef std::map<Scheduler::EventKey, EventImpl*, Scheduler::EventKeyCompare>::const_iterator EventMapCI;
void StoreInEvent (EventImpl *ev, EventMapI i) const;
SchedulerMap::EventMapI GetFromEvent (EventImpl *ev) const;
EventMap m_list;
uint32_t m_uid;
};