From ff2eea1ba3b8716f259075654c7463f9395264d7 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Tue, 14 Oct 2008 09:33:52 -0700
Subject: eventq: revert code for unserializing events. Since I never
 implemented a proper solution, put it back to something that at least works
 for now.  Once I add more event queues, I'll have to really fix this though

---
 src/sim/eventq.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index f4fa0ac8b..dfff760a0 100644
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -209,7 +209,8 @@ Event::serialize(std::ostream &os)
 void
 Event::unserialize(Checkpoint *cp, const string &section)
 {
-    assert(!scheduled() && "we used to deschedule these events");
+    if (scheduled())
+        mainEventQueue.deschedule(this);
 
     UNSERIALIZE_SCALAR(_when);
     UNSERIALIZE_SCALAR(_priority);
@@ -223,8 +224,7 @@ Event::unserialize(Checkpoint *cp, const string &section)
 
     if (wasScheduled) {
         DPRINTF(Config, "rescheduling at %d\n", _when);
-        panic("need to figure out how to unserialize scheduled events");
-        //schedule(_when);
+        mainEventQueue.schedule(this, _when);
     }
 }
 
-- 
cgit v1.2.3


From 5b07448cf12460090af588b332e813af3419d645 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Tue, 14 Oct 2008 09:34:11 -0700
Subject: eventq: make python events actually work

---
 src/python/m5/event.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/python/m5/event.py b/src/python/m5/event.py
index 5d50448e7..2b43e578e 100644
--- a/src/python/m5/event.py
+++ b/src/python/m5/event.py
@@ -26,6 +26,7 @@
 #
 # Authors: Nathan Binkert
 
+import m5
 import internal.event
 
 from internal.event import PythonEvent, SimLoopExitEvent as SimExit
@@ -41,7 +42,7 @@ class Event(PythonEvent):
     def __init__(self, priority=None):
         if priority is None:
             priority = internal.event.Event.Default_Pri
-        super(PythonEvent, self).__init__(self, priority)
+        super(Event, self).__init__(self, priority)
 
 class ProgressEvent(Event):
     def __init__(self, eventq, period):
-- 
cgit v1.2.3