From: Steve Reinhardt <stever@gmail.com>
Date: Mon, 4 Aug 2008 05:45:12 +0000 (-0400)
Subject: Get rid of outputStream... wasn't really being used
X-Git-Tag: m5_2.0_beta6~61
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=58c63ea8b1f56dd0c33ef3d36f5c6a58ce3f28fe;p=gem5.git

Get rid of outputStream... wasn't really being used
(except for warn()) and new -r/-e options make it
not worth fixing.
---

diff --git a/src/base/misc.cc b/src/base/misc.cc
index afb48ca80..0ab1d6041 100644
--- a/src/base/misc.cc
+++ b/src/base/misc.cc
@@ -129,6 +129,4 @@ __warn(const char *func, const char *file, int line, const char *fmt,
 #endif
 
     ccprintf(cerr, format.c_str(), args);
-    if (simout.isFile(*outputStream))
-        ccprintf(*outputStream, format.c_str(), args);
 }
diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index 3d360c017..b0773ca68 100644
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -52,7 +52,6 @@ inline void disableAllListeners() { ListenSocket::disableAll(); }
 %include "sim/host.hh"
 
 void setOutputDir(const std::string &dir);
-void setOutputFile(const std::string &file);
 void SimStartup();
 void doExitCleanup();
 void disableAllListeners();
diff --git a/src/sim/core.cc b/src/sim/core.cc
index 75f1f384c..8342b6740 100644
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -97,14 +97,6 @@ setOutputDir(const string &dir)
     simout.setDirectory(dir);
 }
 
-ostream *outputStream;
-
-void
-setOutputFile(const string &file)
-{
-    outputStream = simout.find(file);
-}
-
 /**
  * Queue of C++ callbacks to invoke on simulator exit.
  */
diff --git a/src/sim/core.hh b/src/sim/core.hh
index fb7f921f4..50cb2ef59 100644
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -68,11 +68,6 @@ extern Tick ps;
 
 void setClockFrequency(Tick ticksPerSecond);
 
-/// Output stream for simulator messages (e.g., cprintf()).  Also used
-/// as default stream for tracing and DPRINTF() messages (unless
-/// overridden with trace:file option).
-extern std::ostream *outputStream;
-void setOutputFile(const std::string &file);
 void setOutputDir(const std::string &dir);
 
 struct Callback;