Merge zizzer.eecs.umich.edu:/bk/m5

into ziff.eecs.umich.edu:/z/binkertn/research/m5/merge

--HG--
extra : convert_revision : 5d73046310a64b80a6ba3832df3b30b55532d707

1 files changed, 3 insertions, 6 deletions

diff --git a/cpu/base_cpu.cc b/cpu/base_cpu.cc
index c4bb97ff8..425ac8877 100644
--- a/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@ -26,13 +26,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <iostream>
 #include <string>
 #include <sstream>
-#include <iostream>
 
 #include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
+#include "base/output.hh"
 #include "cpu/base_cpu.hh"
 #include "cpu/exec_context.hh"
 #include "sim/param.hh"
@@ -132,8 +133,7 @@ BaseCPU::BaseCPU(const string &_name, int _number_of_threads, bool _def_reg,
 
     functionTracingEnabled = false;
     if (_function_trace) {
-        std::string filename = csprintf("ftrace.%s", name());
-        functionTraceStream = makeOutputStream(filename);
+        functionTraceStream = simout.find(csprintf("ftrace.%s", name()));
         currentFunctionStart = currentFunctionEnd = 0;
         functionEntryTick = _function_trace_start;
 
@@ -157,11 +157,8 @@ BaseCPU::enableFunctionTrace()
 
 BaseCPU::~BaseCPU()
 {
-    if (functionTracingEnabled)
-        closeOutputStream(functionTraceStream);
 }
 
-
 void
 BaseCPU::init()
 {