diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2003-10-29 21:45:39 -0800 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2003-10-29 21:45:39 -0800 |
commit | 5a1eb9049d16d37448282362529d462d73558181 (patch) | |
tree | fb1d5a05dad6869173a352abb16ddca7b3a1667f /sim/eventq.hh | |
parent | 976429121c7fddbf8de18b2a347a53546fe14264 (diff) | |
download | gem5-5a1eb9049d16d37448282362529d462d73558181.tar.xz |
Support for Serializable non-SimObject things like events.
Can now serialize & unserialize DmaRequestEvents and DmaTransferEvents.
Also support serialize/unserialize of pointers to SimObjects and
other Serializable objects.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/isa_traits.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.hh:
dev/alpha_access.h:
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/console.cc:
dev/console.hh:
unserialize() now takes a Checkpoint* instead of an IniFile*.
cpu/simple_cpu/simple_cpu.cc:
unserialize() now takes a Checkpoint* instead of an IniFile*.
Put ExecContext in its own section so its _status fields doesn't conflict.
sim/eventq.cc:
sim/eventq.hh:
unserialize() now takes a Checkpoint* instead of an IniFile*.
Events get serialized by the event queue only if they're marked
as AutoSerialize... others are assumed to be serialized by something
else (e.g. an owning SimObject) or to not matter.
sim/param.cc:
Shift 'const' in case T is a ptr type.
sim/serialize.cc:
sim/serialize.hh:
Define Checkpoint object to encapsulate everything you need to know
about a checkpoint. Use it to allow lookups of named Serializable
objects (and SimObjects) during unserialization.
unserialize() now takes a Checkpoint* instead of an IniFile*.
--HG--
extra : convert_revision : 8e6baab32405f8f548bb67a097b2f713296537a5
Diffstat (limited to 'sim/eventq.hh')
-rw-r--r-- | sim/eventq.hh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sim/eventq.hh b/sim/eventq.hh index a8eae1248..11bfe3a4e 100644 --- a/sim/eventq.hh +++ b/sim/eventq.hh @@ -73,7 +73,8 @@ class Event : public Serializeable, public FastAlloc None = 0x0, Squashed = 0x1, Scheduled = 0x2, - AutoDelete = 0x4 + AutoDelete = 0x4, + AutoSerialize = 0x8 }; bool getFlags(Flags f) const { return (_flags & f) == f; } @@ -190,7 +191,7 @@ class Event : public Serializeable, public FastAlloc }; virtual void serialize(std::ostream &os); - virtual void unserialize(const IniFile *db, const std::string §ion); + virtual void unserialize(Checkpoint *cp, const std::string §ion); }; template <class T, void (T::* F)()> @@ -221,6 +222,9 @@ class EventQueue : public Serializeable private: Event *head; + // only used to hold value between nameChildren() and serialize() + int numAutoSerializeEvents; + void insert(Event *event); void remove(Event *event); @@ -228,7 +232,7 @@ class EventQueue : public Serializeable // constructor EventQueue(const std::string &n) - : Serializeable(n), head(NULL) + : Serializeable(n), head(NULL), numAutoSerializeEvents(-1) {} // schedule the given event on this queue @@ -264,6 +268,7 @@ class EventQueue : public Serializeable virtual void nameChildren(); virtual void serialize(std::ostream &os); + virtual void unserialize(Checkpoint *cp, const std::string §ion); }; |