From: Andreas Sandberg Date: Fri, 27 Nov 2015 14:41:59 +0000 (+0000) Subject: base: Add support for changing output directories X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5383e1ada49b59daf4ff8703076923d4ccb6207d;p=gem5.git base: Add support for changing output directories This changeset adds support for changing the simulator output directory. This can be useful when the simulation goes through several stages (e.g., a warming phase, a simulation phase, and a verification phase) since it allows the output from each stage to be located in a different directory. Relocation is done by calling core.setOutputDir() from Python or simout.setOutputDirectory() from C++. This change affects several parts of the design of the gem5's output subsystem. First, files returned by an OutputDirectory instance (e.g., simout) are of the type OutputStream instead of a std::ostream. This allows us to do some more book keeping and control re-opening of files when the output directory is changed. Second, new subdirectories are OutputDirectory instances, which should be used to create files in that sub-directory. Signed-off-by: Andreas Sandberg [sascha.bischoff@arm.com: Rebased patches onto a newer gem5 version] Signed-off-by: Sascha Bischoff Signed-off-by: Andreas Sandberg --- diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc index 4b3135bfc..c22ce160f 100644 --- a/src/arch/arm/linux/system.cc +++ b/src/arch/arm/linux/system.cc @@ -304,15 +304,15 @@ DumpStatsPCEvent::process(ThreadContext *tc) tc->getCpuPtr()->taskId(taskMap[pid]); tc->getCpuPtr()->setPid(pid); - std::ostream* taskFile = sys->taskFile; + OutputStream* taskFile = sys->taskFile; // Task file is read by cache occupancy plotting script or // Streamline conversion script. - ccprintf(*taskFile, + ccprintf(*(taskFile->stream()), "tick=%lld %d cpu_id=%d next_pid=%d next_tgid=%d next_task=%s\n", curTick(), taskMap[pid], tc->cpuId(), (int) pid, (int) tgid, next_task_str); - taskFile->flush(); + taskFile->stream()->flush(); // Dump and reset statistics Stats::schedStatEvent(true, true, curTick(), 0); diff --git a/src/arch/arm/linux/system.hh b/src/arch/arm/linux/system.hh index 388c1e70a..ce1d84b6b 100644 --- a/src/arch/arm/linux/system.hh +++ b/src/arch/arm/linux/system.hh @@ -82,7 +82,7 @@ class LinuxArmSystem : public GenericArmSystem /** This is a file that is placed in the run directory that prints out * mappings between taskIds and OS process IDs */ - std::ostream* taskFile; + OutputStream* taskFile; LinuxArmSystem(Params *p); ~LinuxArmSystem(); diff --git a/src/base/output.cc b/src/base/output.cc index c2a37e58e..cb3c0b7f9 100644 --- a/src/base/output.cc +++ b/src/base/output.cc @@ -1,4 +1,17 @@ /* + * Copyright (c) 2015 ARM Limited + * All rights reserved + * + * The license below extends only to copyright in the software and shall + * not be construed as granting a license to any other intellectual + * property including but not limited to intellectual property relating + * to a hardware implementation of the functionality of the software + * licensed hereunder. You may use the software subject to the license + * terms below provided that you ensure that this notice is replicated + * unmodified and in its entirety in all distributions of the software, + * modified or unmodified, in source code or in binary form. + * + * Copyright (c) 2013 Andreas Sandberg * Copyright (c) 2005 The Regents of The University of Michigan * All rights reserved. * @@ -27,6 +40,8 @@ * * Authors: Nathan Binkert * Chris Emmons + * Andreas Sandberg + * Sascha Bischoff */ #include @@ -49,94 +64,127 @@ using namespace std; OutputDirectory simout; + +OutputStream::OutputStream(const std::string &name, std::ostream *stream) + : _name(name), _stream(stream) +{ +} + +OutputStream::~OutputStream() +{ +} + +void +OutputStream::relocate(const OutputDirectory &dir) +{ +} + +template +OutputFile::OutputFile(const OutputDirectory &dir, + const std::string &name, + std::ios_base::openmode mode, + bool recreateable) + : OutputStream(name, new stream_type_t()), + _mode(mode), _recreateable(recreateable), + _fstream(static_cast(_stream)) +{ + _fstream->open(dir.resolve(_name).c_str(), _mode); + + assert(_fstream->is_open()); +} + +template +OutputFile::~OutputFile() +{ + if (_fstream->is_open()) + _fstream->close(); +} + +template +void +OutputFile::relocate(const OutputDirectory &dir) +{ + if (_recreateable) { + _fstream->close(); + _fstream->open(dir.resolve(_name).c_str(), _mode); + } +} + +OutputStream OutputDirectory::stdout("stdout", &cout); +OutputStream OutputDirectory::stderr("stderr", &cerr); + /** * @file This file manages creating / deleting output files for the simulator. */ OutputDirectory::OutputDirectory() {} +OutputDirectory::OutputDirectory(const std::string &name) +{ + setDirectory(name); +} + OutputDirectory::~OutputDirectory() { - for (map_t::iterator i = files.begin(); i != files.end(); i++) { - if (i->second) - delete i->second; + for (auto& f: files) { + if (f.second) + delete f.second; } } -std::ostream * -OutputDirectory::checkForStdio(const string &name) const +OutputStream * +OutputDirectory::checkForStdio(const string &name) { if (name == "cerr" || name == "stderr") - return &cerr; + return &stderr; if (name == "cout" || name == "stdout") - return &cout; + return &stdout; return NULL; } -ostream * -OutputDirectory::openFile(const string &filename, - ios_base::openmode mode, bool no_gz) -{ - bool gz = !no_gz; - gz = gz && filename.find(".gz", filename.length()-3) < filename.length(); - if (gz) { - gzofstream *file = new gzofstream(filename.c_str(), mode); - if (!file->is_open()) - fatal("Cannot open file %s", filename); - assert(files.find(filename) == files.end()); - files[filename] = file; - return file; - } else { - ofstream *file = new ofstream(filename.c_str(), mode); - if (!file->is_open()) - fatal("Cannot open file %s", filename); - assert(files.find(filename) == files.end()); - files[filename] = file; - return file; - } -} - void -OutputDirectory::close(ostream *openStream) { - map_t::iterator i; - for (i = files.begin(); i != files.end(); i++) { - if (i->second != openStream) - continue; - - ofstream *fs = dynamic_cast(i->second); - if (fs) { - fs->close(); - delete i->second; - break; - } else { - gzofstream *gfs = dynamic_cast(i->second); - if (gfs) { - gfs->close(); - delete i->second; - break; - } - } - } - +OutputDirectory::close(OutputStream *file) +{ + auto i = files.find(file->name()); if (i == files.end()) fatal("Attempted to close an unregistred file stream"); files.erase(i); + + delete file; } void OutputDirectory::setDirectory(const string &d) { - if (!dir.empty()) - panic("Output directory already set!\n"); + const string old_dir(dir); dir = d; // guarantee that directory ends with a path separator if (dir[dir.size() - 1] != PATH_SEPARATOR) dir += PATH_SEPARATOR; + + // Try to create the directory. If it already exists, that's ok; + // otherwise, fail if we couldn't create it. + if ((mkdir(dir.c_str(), 0755) != 0) && (errno != EEXIST)) + fatal("Failed to create new output subdirectory '%s'\n", dir); + + // Check if we need to recreate anything + if (!old_dir.empty()) { + // Recreate output files + for (file_map_t::iterator i = files.begin(); i != files.end(); ++i) { + i->second->relocate(*this); + } + + // Relocate sub-directories + for (dir_map_t::iterator i = dirs.begin(); i != dirs.end(); ++i) { + i->second->setDirectory(dir + PATH_SEPARATOR + i->first); + } + } + } const string & @@ -151,43 +199,69 @@ OutputDirectory::directory() const string OutputDirectory::resolve(const string &name) const { - return (name[0] != PATH_SEPARATOR) ? dir + name : name; + return !isAbsolute(name) ? dir + name : name; } -ostream * +OutputStream * OutputDirectory::create(const string &name, bool binary, bool no_gz) { - ostream *file = checkForStdio(name); + OutputStream *file = checkForStdio(name); if (file) return file; - string filename = resolve(name); - ios_base::openmode mode = - ios::trunc | (binary ? ios::binary : (ios::openmode)0); - file = openFile(filename, mode, no_gz); + const ios_base::openmode mode( + ios::trunc | (binary ? ios::binary : (ios::openmode)0)); + const bool recreateable(!isAbsolute(name)); - return file; + return open(name, mode, recreateable, no_gz); } -ostream * +OutputStream * +OutputDirectory::open(const std::string &name, + ios_base::openmode mode, + bool recreateable, + bool no_gz) +{ + OutputStream *os; + + if (!no_gz && name.find(".gz", name.length() - 3) < name.length()) { + // Although we are creating an output stream, we still need to pass the + // correct mode for gzofstream as this used directly to set the file + // mode. + mode |= std::ios::out; + os = new OutputFile(*this, name, mode, recreateable); + } else { + os = new OutputFile(*this, name, mode, recreateable); + } + + files[name] = os; + + return os; +} + +OutputStream * OutputDirectory::find(const string &name) const { - ostream *file = checkForStdio(name); + OutputStream *file = checkForStdio(name); if (file) return file; - const string filename = resolve(name); - map_t::const_iterator i = files.find(filename); + auto i = files.find(name); if (i != files.end()) return (*i).second; return NULL; } -bool -OutputDirectory::isFile(const std::ostream *os) + +OutputStream * +OutputDirectory::findOrCreate(const std::string &name, bool binary) { - return os && os != &cerr && os != &cout; + OutputStream *os(find(name)); + if (os) + return os; + else + return create(name, binary); } bool @@ -201,18 +275,17 @@ OutputDirectory::isFile(const string &name) const return (st == 0) && S_ISREG(st_buf.st_mode); } -string -OutputDirectory::createSubdirectory(const string &name) const +OutputDirectory * +OutputDirectory::createSubdirectory(const string &name) { const string new_dir = resolve(name); if (new_dir.find(directory()) == string::npos) fatal("Attempting to create subdirectory not in m5 output dir\n"); - // if it already exists, that's ok; otherwise, fail if we couldn't create - if ((mkdir(new_dir.c_str(), 0755) != 0) && (errno != EEXIST)) - fatal("Failed to create new output subdirectory '%s'\n", new_dir); + OutputDirectory *dir(new OutputDirectory(new_dir)); + dirs[name] = dir; - return name + PATH_SEPARATOR; + return dir; } void @@ -225,10 +298,10 @@ OutputDirectory::remove(const string &name, bool recursive) if (isFile(fname)) { // close and release file if we have it open - map_t::iterator itr = files.find(fname); - if (itr != files.end()) { - delete itr->second; - files.erase(itr); + auto i = files.find(fname); + if (i != files.end()) { + delete i->second; + files.erase(i); } if (::remove(fname.c_str()) != 0) @@ -246,7 +319,7 @@ OutputDirectory::remove(const string &name, bool recursive) if (!subdir) { perror("opendir"); fatal("Error opening directory for recursive removal '%s'\n", - fname); + fname); } struct dirent *de = readdir(subdir); diff --git a/src/base/output.hh b/src/base/output.hh index 67e6ecb18..a0b1d0124 100644 --- a/src/base/output.hh +++ b/src/base/output.hh @@ -1,4 +1,17 @@ /* + * Copyright (c) 2015 ARM Limited + * All rights reserved + * + * The license below extends only to copyright in the software and shall + * not be construed as granting a license to any other intellectual + * property including but not limited to intellectual property relating + * to a hardware implementation of the functionality of the software + * licensed hereunder. You may use the software subject to the license + * terms below provided that you ensure that this notice is replicated + * unmodified and in its entirety in all distributions of the software, + * modified or unmodified, in source code or in binary form. + * + * Copyright (c) 2013 Andreas Sandberg * Copyright (c) 2005 The Regents of The University of Michigan * All rights reserved. * @@ -27,6 +40,8 @@ * * Authors: Nathan Binkert * Chris Emmons + * Andreas Sandberg + * Sascha Bischoff */ #ifndef __BASE_OUTPUT_HH__ @@ -36,15 +51,105 @@ #include #include +#include "base/compiler.hh" + +class OutputDirectory; + +class OutputStream +{ + public: + virtual ~OutputStream(); + + /** Get the output underlying output stream */ + std::ostream *stream() const { return _stream; }; + + /** + * Can the file be recreated if the output directory is moved? + * + * @return true if the file will be created in the new location, + * false otherwise. + */ + virtual bool recreateable() const { return false; } + + /** Get the file name in the output directory */ + const std::string &name() const { return _name; } + + protected: + friend class OutputDirectory; + + /** Wrap an existing stream */ + OutputStream(const std::string &name, + std::ostream *stream); + + /* Prevent copying */ + OutputStream(const OutputStream &f); + + /** Re-create the in a new location if recreateable. */ + virtual void relocate(const OutputDirectory &dir); + + /** Name in output directory */ + const std::string _name; + + /** Underlying output stream */ + std::ostream *const _stream; +}; + +template +class OutputFile + : public OutputStream +{ + public: + typedef StreamType stream_type_t; + + virtual ~OutputFile(); + + /** + * Can the file be recreated if the output directory is moved? + * + * @return true if the file will be created in the new location, + * false otherwise. + */ + bool recreateable() const override { return _recreateable; } + + protected: + friend class OutputDirectory; + + OutputFile(const OutputDirectory &dir, + const std::string &name, + std::ios_base::openmode mode, + bool recreateable); + + /* Prevent copying */ + OutputFile(const OutputFile &f); + + /** Re-create the file in a new location if it is relocatable. */ + void relocate(const OutputDirectory &dir) override; + + /** File mode when opened */ + const std::ios_base::openmode _mode; + + /** Can the file be recreated in a new location? */ + const bool _recreateable; + + /** Pointer to the file stream */ + stream_type_t *const _fstream; +}; + /** Interface for creating files in a gem5 output directory. */ class OutputDirectory { private: /** File names and associated stream handles */ - typedef std::map map_t; + typedef std::map file_map_t; + + /** Output subdirectories */ + typedef std::map dir_map_t; /** Open file streams within this directory */ - map_t files; + file_map_t files; + + /** Output sub-directories */ + dir_map_t dirs; /** Name of this directory */ std::string dir; @@ -52,6 +157,9 @@ class OutputDirectory /** System-specific path separator character */ static const char PATH_SEPARATOR = '/'; + static OutputStream stdout; + static OutputStream stderr; + protected: /** * Determines whether given file name corresponds to standard output @@ -61,12 +169,15 @@ class OutputDirectory * @return output stream for standard output or error stream if name * corresponds to one or the other; NULL otherwise */ - std::ostream *checkForStdio(const std::string &name) const; + static OutputStream *checkForStdio(const std::string &name); public: /** Constructor. */ OutputDirectory(); + /** Constructor. */ + OutputDirectory(const std::string &name); + /** Destructor. */ ~OutputDirectory(); @@ -80,20 +191,6 @@ class OutputDirectory */ std::string resolve(const std::string &name) const; - /** Opens a file (optionally compressed). - * - * Will open a file as a compressed stream if filename ends in .gz. - * - * @param filename file to open - * @param mode attributes to open file with - * @param no_gz true to disable opening the file as a gzip compressed output - * stream; false otherwise - * @return stream pointer to opened file; will cause sim fail on error - */ - std::ostream *openFile(const std::string &filename, - std::ios_base::openmode mode = std::ios::trunc, - bool no_gz = false); - /** * Sets name of this directory. * @param dir name of this directory @@ -109,40 +206,64 @@ class OutputDirectory /** * Creates a file in this directory (optionally compressed). * - * Will open a file as a compressed stream if filename ends in .gz. + * Will open a file as a compressed stream if filename ends in .gz, unless + * explicitly disabled. + * + * Relative output paths will result in the creation of a + * recreateable (see OutputFile) output file in the current output + * directory. Files created with an absolute path will not be + * recreateable. * * @param name name of file to create (without this directory's name * leading it) * @param binary true to create a binary file; false otherwise - * @param no_gz true to disable creating a gzip compressed output stream; - * false otherwise - * @return stream to the opened file + * @param no_gz true to disable opening the file as a gzip compressed output + * stream; false otherwise + * @return OutputStream instance representing the created file */ - std::ostream *create(const std::string &name, bool binary = false, + OutputStream *create(const std::string &name, + bool binary = false, bool no_gz = false); /** - * Closes a file stream. + * Open a file in this directory (optionally compressed). + * + * Will open a file as a compressed stream if filename ends in .gz, unless + * explicitly disabled. + * + * @param filename file to open + * @param mode attributes to open file with + * @param recreateable Set to true if the file can be recreated in a new + * location. + * @param no_gz true to disable opening the file as a gzip compressed output + * stream; false otherwise + * @return OutputStream instance representing the opened file + */ + OutputStream *open(const std::string &name, + std::ios_base::openmode mode, + bool recreateable = true, + bool no_gz = false); + + /** + * Closes an output file and free the corresponding OutputFile. * - * Stream must have been opened through this interface, or sim will fail. + * The output file must have been opened by the same + * OutputDirectory instance as the one closing it, or sim will + * fail. * - * @param openStream open stream to close + * @param file OutputStream instance in this OutputDirectory. */ - void close(std::ostream *openStream); + void close(OutputStream *file); /** - * Finds stream associated with a file. + * Finds stream associated with an open file or stdout/stderr. + * * @param name of file * @return stream to specified file or NULL if file does not exist */ - std::ostream *find(const std::string &name) const; + OutputStream *find(const std::string &name) const; - /** - * Returns true if stream is open and not standard output or error. - * @param os output stream to evaluate - * @return true if os is non-NULL and not cout or cerr - */ - static bool isFile(const std::ostream *os); + OutputStream *findOrCreate(const std::string &name, bool binary = false); /** * Determines whether a file name corresponds to a file in this directory. @@ -153,12 +274,10 @@ class OutputDirectory bool isFile(const std::string &name) const; /** - * Returns true if stream is open and not standard output or error. - * @param os output stream to evaluate - * @return true if os is non-NULL and not cout or cerr + * Test if a path is absolute. */ - static inline bool isFile(const std::ostream &os) { - return isFile(&os); + static inline bool isAbsolute(const std::string &name) { + return name[0] == PATH_SEPARATOR; } /** @@ -166,7 +285,7 @@ class OutputDirectory * @param name name of subdirectory * @return the new subdirectory's name suffixed with a path separator */ - std::string createSubdirectory(const std::string &name) const; + OutputDirectory *createSubdirectory(const std::string &name); /** * Removes a specified file or subdirectory. diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc index efe43c602..05ce33cdf 100644 --- a/src/base/stats/text.cc +++ b/src/base/stats/text.cc @@ -740,11 +740,7 @@ initText(const string &filename, bool desc) static bool connected = false; if (!connected) { - ostream *os = simout.find(filename); - if (!os) - os = simout.create(filename); - - text.open(*os); + text.open(*simout.findOrCreate(filename)->stream()); text.descriptions = desc; connected = true; } diff --git a/src/base/vnc/vncinput.cc b/src/base/vnc/vncinput.cc index 017fc3876..d97306f03 100644 --- a/src/base/vnc/vncinput.cc +++ b/src/base/vnc/vncinput.cc @@ -123,10 +123,9 @@ VncInput::captureFrameBuffer() const string frameFilename(frameFilenameBuffer); // create the compressed framebuffer file - ostream *fb_out = simout.create(captureOutputDirectory + frameFilename, - true); - captureBitmap->write(*fb_out); - simout.close(fb_out); + OutputStream *fb_out(captureOutputDirectory->create(frameFilename, true)); + captureBitmap->write(*fb_out->stream()); + captureOutputDirectory->close(fb_out); ++captureCurrentFrame; } diff --git a/src/base/vnc/vncinput.hh b/src/base/vnc/vncinput.hh index 96235fec7..15ddc5c58 100644 --- a/src/base/vnc/vncinput.hh +++ b/src/base/vnc/vncinput.hh @@ -52,6 +52,8 @@ #include "params/VncInput.hh" #include "sim/sim_object.hh" +class OutputDirectory; + /** * A device that expects to receive input from the vnc server should derrive * (through mulitple inheritence if necessary from VncKeyboard or VncMouse @@ -219,7 +221,7 @@ class VncInput : public SimObject int captureCurrentFrame; /** Directory to store captured frames to */ - std::string captureOutputDirectory; + OutputDirectory *captureOutputDirectory; /** Computed hash of the last captured frame */ uint64_t captureLastHash; diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 0e8c2930f..22fca4dc5 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -218,9 +218,7 @@ BaseCPU::BaseCPU(Params *p, bool is_checker) functionTracingEnabled = false; if (p->function_trace) { const string fname = csprintf("ftrace.%s", name()); - functionTraceStream = simout.find(fname); - if (!functionTraceStream) - functionTraceStream = simout.create(fname); + functionTraceStream = simout.findOrCreate(fname)->stream(); currentFunctionStart = currentFunctionEnd = 0; functionEntryTick = p->function_trace_start; diff --git a/src/cpu/o3/thread_state.hh b/src/cpu/o3/thread_state.hh index 19235c44c..7765f86ea 100644 --- a/src/cpu/o3/thread_state.hh +++ b/src/cpu/o3/thread_state.hh @@ -144,8 +144,10 @@ struct O3ThreadState : public ThreadState { void dumpFuncProfile() { - std::ostream *os = simout.create(csprintf("profile.%s.dat", cpu->name())); - profile->dump(tc, *os); + OutputStream *os( + simout.create(csprintf("profile.%s.dat", cpu->name()))); + profile->dump(tc, *os->stream()); + simout.close(os); } }; diff --git a/src/cpu/simple/probes/simpoint.cc b/src/cpu/simple/probes/simpoint.cc index 2de3cd420..4f4b5da39 100644 --- a/src/cpu/simple/probes/simpoint.cc +++ b/src/cpu/simple/probes/simpoint.cc @@ -126,13 +126,13 @@ SimPoint::profile(const std::pair& p) std::sort(counts.begin(), counts.end()); // Print output BBV info - *simpointStream << "T"; + *simpointStream->stream() << "T"; for (auto cnt_itr = counts.begin(); cnt_itr != counts.end(); ++cnt_itr) { - *simpointStream << ":" << cnt_itr->first + *simpointStream->stream() << ":" << cnt_itr->first << ":" << cnt_itr->second << " "; } - *simpointStream << "\n"; + *simpointStream->stream() << "\n"; intervalDrift = (intervalCount + intervalDrift) - intervalSize; intervalCount = 0; diff --git a/src/cpu/simple/probes/simpoint.hh b/src/cpu/simple/probes/simpoint.hh index 2f4ed080d..2873ae410 100644 --- a/src/cpu/simple/probes/simpoint.hh +++ b/src/cpu/simple/probes/simpoint.hh @@ -43,6 +43,7 @@ #include +#include "base/output.hh" #include "cpu/simple_thread.hh" #include "params/SimPoint.hh" #include "sim/probe/probe.hh" @@ -97,7 +98,7 @@ class SimPoint : public ProbeListenerObject /** Excess inst count from previous interval*/ uint64_t intervalDrift; /** Pointer to SimPoint BBV output stream */ - std::ostream *simpointStream; + OutputStream *simpointStream; /** Basic Block information */ struct BBInfo { diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc index 5e457f692..33c5b47ea 100644 --- a/src/cpu/simple_thread.cc +++ b/src/cpu/simple_thread.cc @@ -154,9 +154,9 @@ SimpleThread::startup() void SimpleThread::dumpFuncProfile() { - std::ostream *os = simout.create(csprintf("profile.%s.dat", - baseCpu->name())); - profile->dump(tc, *os); + OutputStream *os(simout.create(csprintf("profile.%s.dat", baseCpu->name()))); + profile->dump(tc, *os->stream()); + simout.close(os); } void diff --git a/src/dev/arm/hdlcd.cc b/src/dev/arm/hdlcd.cc index 2c402b00a..b04de21bf 100644 --- a/src/dev/arm/hdlcd.cc +++ b/src/dev/arm/hdlcd.cc @@ -544,8 +544,8 @@ HDLcd::pxlFrameDone() } assert(pic); - pic->seekp(0); - bmp.write(*pic); + pic->stream()->seekp(0); + bmp.write(*pic->stream()); } } diff --git a/src/dev/arm/hdlcd.hh b/src/dev/arm/hdlcd.hh index 721935457..acce6f191 100644 --- a/src/dev/arm/hdlcd.hh +++ b/src/dev/arm/hdlcd.hh @@ -81,6 +81,7 @@ #include "base/bitmap.hh" #include "base/framebuffer.hh" +#include "base/output.hh" #include "dev/arm/amba_device.hh" #include "dev/pixelpump.hh" #include "sim/serialize.hh" @@ -347,7 +348,7 @@ class HDLcd: public AmbaDmaDevice Bitmap bmp; /** Picture of what the current frame buffer looks like */ - std::ostream *pic; + OutputStream *pic; /** Cached pixel converter, set when the converter is enabled. */ PixelConverter conv; diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc index 179f1bf2d..23ffe58c9 100644 --- a/src/dev/arm/pl111.cc +++ b/src/dev/arm/pl111.cc @@ -523,11 +523,12 @@ Pl111::dmaDone() DPRINTF(PL111, "-- write out frame buffer into bmp\n"); if (!pic) - pic = simout.create(csprintf("%s.framebuffer.bmp", sys->name()), true); + pic = simout.create(csprintf("%s.framebuffer.bmp", sys->name()), + true); assert(pic); - pic->seekp(0); - bmp.write(*pic); + pic->stream()->seekp(0); + bmp.write(*pic->stream()); } // schedule the next read based on when the last frame started diff --git a/src/dev/arm/pl111.hh b/src/dev/arm/pl111.hh index a55e8b8c3..aea78709c 100644 --- a/src/dev/arm/pl111.hh +++ b/src/dev/arm/pl111.hh @@ -51,6 +51,7 @@ #include "base/bitmap.hh" #include "base/framebuffer.hh" +#include "base/output.hh" #include "dev/arm/amba_device.hh" #include "params/Pl111.hh" #include "sim/serialize.hh" @@ -268,7 +269,7 @@ class Pl111: public AmbaDmaDevice Bitmap bmp; /** Picture of what the current frame buffer looks like */ - std::ostream *pic; + OutputStream *pic; /** Frame buffer width - pixels per line */ uint16_t width; diff --git a/src/dev/net/etherdump.cc b/src/dev/net/etherdump.cc index c537fbf57..1fe462764 100644 --- a/src/dev/net/etherdump.cc +++ b/src/dev/net/etherdump.cc @@ -45,7 +45,7 @@ using std::string; EtherDump::EtherDump(const Params *p) - : SimObject(p), stream(simout.create(p->file, true)), + : SimObject(p), stream(simout.create(p->file, true)->stream()), maxlen(p->maxlen) { } diff --git a/src/dev/terminal.cc b/src/dev/terminal.cc index 6db43ef88..53e593f85 100644 --- a/src/dev/terminal.cc +++ b/src/dev/terminal.cc @@ -108,18 +108,14 @@ Terminal::DataEvent::process(int revent) */ Terminal::Terminal(const Params *p) : SimObject(p), termDataAvail(NULL), listenEvent(NULL), dataEvent(NULL), - number(p->number), data_fd(-1), txbuf(16384), rxbuf(16384), outfile(NULL) + number(p->number), data_fd(-1), txbuf(16384), rxbuf(16384), + outfile(p->output ? simout.findOrCreate(p->name) : NULL) #if TRACING_ON == 1 , linebuf(16384) #endif { - if (p->output) { - outfile = simout.find(p->name); - if (!outfile) - outfile = simout.create(p->name); - - outfile->setf(ios::unitbuf); - } + if (outfile) + outfile->stream()->setf(ios::unitbuf); if (p->port) listen(p->port); @@ -347,7 +343,7 @@ Terminal::out(char c) write(c); if (outfile) - outfile->write(&c, 1); + outfile->stream()->write(&c, 1); DPRINTF(TerminalVerbose, "out: \'%c\' %#02x\n", isprint(c) ? c : ' ', (int)c); diff --git a/src/dev/terminal.hh b/src/dev/terminal.hh index 82246b2c1..41c2a9e26 100644 --- a/src/dev/terminal.hh +++ b/src/dev/terminal.hh @@ -46,6 +46,7 @@ #include "params/Terminal.hh" #include "sim/sim_object.hh" +class OutputStream; class TerminalListener; class Terminal : public SimObject @@ -111,7 +112,7 @@ class Terminal : public SimObject protected: CircleBuf txbuf; CircleBuf rxbuf; - std::ostream *outfile; + OutputStream *outfile; #if TRACING_ON == 1 CircleBuf linebuf; #endif diff --git a/src/python/swig/trace.i b/src/python/swig/trace.i index 50ff7fd3d..48caf456a 100644 --- a/src/python/swig/trace.i +++ b/src/python/swig/trace.i @@ -38,12 +38,12 @@ inline void output(const char *filename) { - std::ostream *file_stream = simout.find(filename); + OutputStream *file_stream = simout.find(filename); if (!file_stream) file_stream = simout.create(filename); - Trace::setDebugLogger(new Trace::OstreamLogger(*file_stream)); + Trace::setDebugLogger(new Trace::OstreamLogger(*file_stream->stream())); } inline void diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc index 12df08f2d..44fe2fcae 100644 --- a/src/sim/pseudo_inst.cc +++ b/src/sim/pseudo_inst.cc @@ -592,7 +592,6 @@ writefile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset, { DPRINTF(PseudoInst, "PseudoInst::writefile(0x%x, 0x%x, 0x%x, 0x%x)\n", vaddr, len, offset, filename_addr); - ostream *os; // copy out target filename char fn[100]; @@ -600,16 +599,18 @@ writefile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset, CopyStringOut(tc, fn, filename_addr, 100); filename = std::string(fn); + OutputStream *out; if (offset == 0) { // create a new file (truncate) - os = simout.create(filename, true, true); + out = simout.create(filename, true, true); } else { // do not truncate file if offset is non-zero // (ios::in flag is required as well to keep the existing data // intact, otherwise existing data will be zeroed out.) - os = simout.openFile(simout.directory() + filename, - ios::in | ios::out | ios::binary, true); + out = simout.open(filename, ios::in | ios::out | ios::binary, true); } + + ostream *os(out->stream()); if (!os) panic("could not open file %s\n", filename); @@ -623,7 +624,7 @@ writefile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset, if (os->fail() || os->bad()) panic("Error while doing writefile!\n"); - simout.close(os); + simout.close(out); delete [] buf;