events: Make trace events happen at the right priority.

[gem5.git] / src / python / m5 / simulate.py

diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 6c70d8fbd0359822e798cfdbe679dff13f157c2e..617ac3be27b5146974cd3f1d4c4cc275e8097c3b 100644 (file)
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -45,11 +45,11 @@ def instantiate(root):
     ticks.fixGlobalFrequency()
 
     root.unproxy_all()
-    # ugly temporary hack to get output to config.ini
-    sys.stdout = file(os.path.join(options.outdir, 'config.ini'), 'w')
-    root.print_ini()
-    sys.stdout.close() # close config.ini
-    sys.stdout = sys.__stdout__ # restore to original
+
+    if options.dump_config:
+        ini_file = file(os.path.join(options.outdir, options.dump_config), 'w')
+        root.print_ini(ini_file)
+        ini_file.close()
 
     # Initialize the global statistics
     internal.stats.initSimStats()
@@ -183,3 +183,5 @@ def switchCpus(cpuList):
 
     for old_cpu, new_cpu in cpuList:
         new_cpu.takeOverFrom(old_cpu)
+
+from internal.core import disableAllListeners