Merge

--HG--
extra : convert_revision : 8690e31b64235874d74ea4a1123a408610fb115b

1 files changed, 6 insertions, 4 deletions

diff --git a/sim/main.cc b/sim/main.cc
index d0cf23039..48d64d4cd 100644
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -54,6 +54,7 @@
 #include "sim/sim_init.hh"
 #include "sim/sim_object.hh"
 #include "sim/sim_stats.hh"
+#include "sim/universe.hh"
 
 using namespace std;
 
@@ -355,12 +356,12 @@ main(int argc, char **argv)
 
     // Print hello message to stats file if it's actually a file.  If
     // it's not (i.e. it's cout or cerr) then we already did it above.
-    if (statStreamIsFile)
-        sayHello(*statStream);
+    if (outputStream != &cout && outputStream != &cerr)
+        sayHello(*outputStream);
 
     // Echo command line and all parameter settings to stats file as well.
-    echoCommandLine(argc, argv, *statStream);
-    ParamContext::showAllContexts(*statStream);
+    echoCommandLine(argc, argv, *outputStream);
+    ParamContext::showAllContexts(builderStream());
 
     // Now process the configuration hierarchy and create the SimObjects.
     ConfigHierarchy configHierarchy(simConfigDB);
@@ -400,6 +401,7 @@ main(int argc, char **argv)
     }
 
     SimInit();
+    warn("Entering event queue.  Starting simulation...\n");
 
     while (!mainEventQueue.empty()) {
         assert(curTick <= mainEventQueue.nextTick() &&