From 2db1b6ea1b61665908138d7004001d494c168d85 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 29 Jan 2004 00:38:18 -0500 Subject: provide an output stream for simulator output. (This takes place of the statStream catchall that we had before) Also provide an optional output directory that multiple simulator output files can be written to. Make most output files use the output directory base/misc.cc: send warnings to the outputStream as well base/trace.cc: dprintf_stream defaults to cerr dev/console.cc: use the output directory for the console output if it exists dev/etherdump.cc: dump to the output directory if it exists sim/builder.cc: sim/builder.hh: move constructor and destructor to .cc file use a function to get the stream that the builder dumps its output to, and create a separate file in the output directory if able sim/main.cc: statStream -> outputStream sim/serialize.cc: dump checkpoints to the output directory if specified sim/universe.cc: provide an output stream for simulator output. (This takes place of the statStream catchall that we had before) Also provide an optional output directory that multiple simulator output files can be written to. --HG-- extra : convert_revision : 03abce20edbbf7ec19c9ddd8d69ec8485c383532 --- sim/builder.hh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'sim/builder.hh') diff --git a/sim/builder.hh b/sim/builder.hh index 0364276bf..e13a85272 100644 --- a/sim/builder.hh +++ b/sim/builder.hh @@ -29,15 +29,18 @@ #ifndef __BUILDER_HH__ #define __BUILDER_HH__ -#include +#include #include +#include #include -#include #include "sim/param.hh" class SimObject; +std::ostream & +builderStream(); + // // A SimObjectBuilder serves as an evaluation context for a set of // parameters that describe a specific instance of a SimObject. This @@ -69,15 +72,9 @@ class SimObjectBuilder : public ParamContext SimObjectBuilder(const std::string &_configClass, const std::string &_instanceName, ConfigNode *_configNode, - const std::string &_simObjClassName) - : ParamContext(_configClass, true), - instanceName(_instanceName), - configNode(_configNode), - simObjClassName(_simObjClassName) - { - } - - virtual ~SimObjectBuilder() {} + const std::string &_simObjClassName); + + virtual ~SimObjectBuilder(); // call parse() on all params in this context to convert string // representations to parameter values -- cgit v1.2.3