changeset 7f966113afd1 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=7f966113afd1
description:
python: Rename doDrain()->drain() and make it do the right thing
There is no point in exporting the old drain() method in
Simulate.py. It should only be used internally by doDrain(). This
patch moves the old drain() method into doDrain() and renames
doDrain() to drain().
diffstat:
configs/common/Simulation.py | 4 +-
src/python/m5/simulate.py | 47 ++++++++++++++++++++++---------------------
2 files changed, 26 insertions(+), 25 deletions(-)
diffs (93 lines):
diff -r e63c6f279906 -r 7f966113afd1 configs/common/Simulation.py
--- a/configs/common/Simulation.py Fri Nov 02 11:32:02 2012 -0500
+++ b/configs/common/Simulation.py Fri Nov 02 11:32:02 2012 -0500
@@ -242,7 +242,7 @@
return exit_cause
print "draining the system"
- m5.doDrain(testsys)
+ m5.drain(testsys)
m5.switchCpus(repeat_switch_cpu_list)
m5.resume(testsys)
@@ -469,7 +469,7 @@
print "Switching CPUS @ tick %s" % (m5.curTick())
print "Simulation ends instruction count:%d" % \
(testsys.switch_cpus_1[0].max_insts_any_thread)
- m5.doDrain(testsys)
+ m5.drain(testsys)
m5.switchCpus(switch_cpu_list1)
m5.resume(testsys)
diff -r e63c6f279906 -r 7f966113afd1 src/python/m5/simulate.py
--- a/src/python/m5/simulate.py Fri Nov 02 11:32:02 2012 -0500
+++ b/src/python/m5/simulate.py Fri Nov 02 11:32:02 2012 -0500
@@ -157,28 +157,29 @@
# register our C++ exit callback function with Python
atexit.register(internal.core.doExitCleanup)
-# This loops until all objects have been fully drained.
-def doDrain(root):
- all_drained = drain(root)
+# Drain the system in preparation of a checkpoint or memory mode
+# switch.
+def drain(root):
+ # Try to drain all objects. Draining might not be completed unless
+ # all objects return that they are drained on the first call. This
+ # is because as objects drain they may cause other objects to no
+ # longer be drained.
+ def _drain():
+ all_drained = False
+ dm = internal.drain.createDrainManager()
+ unready_objs = sum(obj.drain(dm) for obj in root.descendants())
+ # If we've got some objects that can't drain immediately, then simulate
+ if unready_objs > 0:
+ dm.setCount(unready_objs)
+ simulate()
+ else:
+ all_drained = True
+ internal.drain.cleanupDrainManager(dm)
+ return all_drained
+
+ all_drained = _drain()
while (not all_drained):
- all_drained = drain(root)
-
-# Tries to drain all objects. Draining might not be completed unless
-# all objects return that they are drained on the first call. This is
-# because as objects drain they may cause other objects to no longer
-# be drained.
-def drain(root):
- all_drained = False
- dm = internal.drain.createDrainManager()
- unready_objs = sum(obj.drain(dm) for obj in root.descendants())
- # If we've got some objects that can't drain immediately, then simulate
- if unready_objs > 0:
- dm.setCount(unready_objs)
- simulate()
- else:
- all_drained = True
- internal.drain.cleanupDrainManager(dm)
- return all_drained
+ all_drained = _drain()
def resume(root):
for obj in root.descendants(): obj.drainResume()
@@ -187,7 +188,7 @@
root = objects.Root.getInstance()
if not isinstance(root, objects.Root):
raise TypeError, "Checkpoint must be called on a root object."
- doDrain(root)
+ drain(root)
print "Writing checkpoint"
internal.core.serializeAll(dir)
resume(root)
@@ -197,7 +198,7 @@
raise TypeError, "Parameter of type '%s'. Must be type %s or %s." % \
(type(system), objects.Root, objects.System)
if system.getMemoryMode() != mode:
- doDrain(system)
+ drain(system)
system.setMemoryMode(mode)
else:
print "System already in target mode. Memory mode unchanged."
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
