[m5-dev] changeset in m5: Automated merge with ssh://daystrom.m5sim.org//...

[Lisa Hsu]

changeset 88b1d180cec8 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=88b1d180cec8
description:
        Automated merge with ssh://daystrom.m5sim.org//z/repo/m5

diffstat:

1 file changed, 1 deletion(-)
src/sim/eventq.cc |    1 -

diffs (43 lines):

diff -r ab3067124402 -r 88b1d180cec8 src/python/m5/event.py
--- a/src/python/m5/event.py    Tue Oct 14 17:22:03 2008 -0400
+++ b/src/python/m5/event.py    Thu Oct 16 14:16:26 2008 -0400
@@ -26,6 +26,7 @@
 #
 # Authors: Nathan Binkert
 
+import m5
 import internal.event
 
 from internal.event import PythonEvent, SimLoopExitEvent as SimExit
@@ -41,7 +42,7 @@
     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):
diff -r ab3067124402 -r 88b1d180cec8 src/sim/eventq.cc
--- a/src/sim/eventq.cc Tue Oct 14 17:22:03 2008 -0400
+++ b/src/sim/eventq.cc Thu Oct 16 14:16:26 2008 -0400
@@ -209,7 +209,8 @@
 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 @@
 
     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);
     }
 }
 
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev