diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2015-09-01 15:28:45 +0100 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2015-09-01 15:28:45 +0100 |
| commit | 05852e698adf7bbf1a9512e27f76d7a7b6f0e0e2 (patch) | |
| tree | 786c0167858bf95eb7356dfdd6650ed3d6a1b76b /src/sim/eventq.hh | |
| parent | 53001e6e09d31063784c408f0f35caad45afeef1 (diff) | |
| download | gem5-05852e698adf7bbf1a9512e27f76d7a7b6f0e0e2.tar.xz | |
sim: Remove broken AutoSerialize support from the event queue
Event auto-serialization no longer in use and has been broken ever
since the introduction of PDES support almost two years
ago. Additionally, serializing the individual event queues is
undesirable since it exposes the thread structure of the
simulator. What this means in practice is that the number of threads
in the simulator must be the same when taking a checkpoint and when
loading the checkpoint.
This changeset removes support for the AutoSerialize event flag and
the associated serialization code.
Diffstat (limited to 'src/sim/eventq.hh')
| -rw-r--r-- | src/sim/eventq.hh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh index a73e4b9dc..db134a4be 100644 --- a/src/sim/eventq.hh +++ b/src/sim/eventq.hh @@ -104,7 +104,12 @@ class EventBase static const FlagsType Squashed = 0x0001; // has been squashed static const FlagsType Scheduled = 0x0002; // has been scheduled static const FlagsType AutoDelete = 0x0004; // delete after dispatch - static const FlagsType AutoSerialize = 0x0008; // must be serialized + /** + * This used to be AutoSerialize. This value can't be reused + * without changing the checkpoint version since the flag field + * gets serialized. + */ + static const FlagsType Reserved0 = 0x0008; static const FlagsType IsExitEvent = 0x0010; // special exit event static const FlagsType IsMainQueue = 0x0020; // on main event queue static const FlagsType Initialized = 0x7a40; // somewhat random bits @@ -437,7 +442,7 @@ operator!=(const Event &l, const Event &r) * otherwise they risk being scheduled in the past by * handleAsyncInsertions(). */ -class EventQueue : public Serializable +class EventQueue { private: std::string objName; @@ -643,11 +648,6 @@ class EventQueue : public Serializable void unlock() { service_mutex.unlock(); } /**@}*/ -#ifndef SWIG - void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE; - void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE; -#endif - /** * Reschedule an event after a checkpoint. * |