changeset 1af0b428ac2f in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=1af0b428ac2f
summary: Make sure that output files are always checked success before they're
used.
diffstat:
5 files changed, 14 insertions(+), 14 deletions(-)
src/base/output.cc | 4 ++--
src/base/output.hh | 3 ++-
src/dev/etherdump.cc | 14 +++++++-------
src/dev/etherdump.hh | 2 +-
src/mem/cache/tags/split.cc | 5 ++---
diffs (118 lines):
diff -r 7738a042628b -r 1af0b428ac2f src/base/output.cc
--- a/src/base/output.cc Tue May 06 16:22:14 2008 -0400
+++ b/src/base/output.cc Thu May 15 19:10:26 2008 -0400
@@ -98,7 +98,7 @@ OutputDirectory::create(const string &na
ofstream *file = new ofstream(resolve(name).c_str(),
ios::trunc | binary ? ios::binary : (ios::openmode)0);
if (!file->is_open())
- panic("Cannot open file %s", name);
+ fatal("Cannot open file %s", name);
return file;
}
@@ -119,7 +119,7 @@ OutputDirectory::find(const string &name
ofstream *file = new ofstream(filename.c_str(), ios::trunc);
if (!file->is_open())
- panic("Cannot open file %s", filename);
+ fatal("Cannot open file %s", filename);
files[filename] = file;
return file;
diff -r 7738a042628b -r 1af0b428ac2f src/base/output.hh
--- a/src/base/output.hh Tue May 06 16:22:14 2008 -0400
+++ b/src/base/output.hh Thu May 15 19:10:26 2008 -0400
@@ -42,6 +42,8 @@ class OutputDirectory
map_t files;
std::string dir;
+
+ std::string resolve(const std::string &name);
public:
OutputDirectory();
@@ -50,7 +52,6 @@ class OutputDirectory
void setDirectory(const std::string &dir);
const std::string &directory();
- std::string resolve(const std::string &name);
std::ostream *create(const std::string &name, bool binary = false);
std::ostream *find(const std::string &name);
diff -r 7738a042628b -r 1af0b428ac2f src/dev/etherdump.cc
--- a/src/dev/etherdump.cc Tue May 06 16:22:14 2008 -0400
+++ b/src/dev/etherdump.cc Thu May 15 19:10:26 2008 -0400
@@ -45,7 +45,7 @@ using std::string;
using std::string;
EtherDump::EtherDump(const Params *p)
- : SimObject(p), stream(simout.resolve(p->file).c_str()),
+ : SimObject(p), stream(simout.create(p->file, true)),
maxlen(p->maxlen)
{
}
@@ -86,7 +86,7 @@ EtherDump::init()
hdr.sigfigs = 0;
hdr.linktype = DLT_EN10MB;
- stream.write(reinterpret_cast<char *>(&hdr), sizeof(hdr));
+ stream->write(reinterpret_cast<char *>(&hdr), sizeof(hdr));
/*
* output an empty packet with the current time so that we know
@@ -98,9 +98,9 @@ EtherDump::init()
pkthdr.microseconds = 0;
pkthdr.caplen = 0;
pkthdr.len = 0;
- stream.write(reinterpret_cast<char *>(&pkthdr), sizeof(pkthdr));
+ stream->write(reinterpret_cast<char *>(&pkthdr), sizeof(pkthdr));
- stream.flush();
+ stream->flush();
}
void
@@ -111,9 +111,9 @@ EtherDump::dumpPacket(EthPacketPtr &pack
pkthdr.microseconds = (curTick / Clock::Int::us) % ULL(1000000);
pkthdr.caplen = std::min(packet->length, maxlen);
pkthdr.len = packet->length;
- stream.write(reinterpret_cast<char *>(&pkthdr), sizeof(pkthdr));
- stream.write(reinterpret_cast<char *>(packet->data), pkthdr.caplen);
- stream.flush();
+ stream->write(reinterpret_cast<char *>(&pkthdr), sizeof(pkthdr));
+ stream->write(reinterpret_cast<char *>(packet->data), pkthdr.caplen);
+ stream->flush();
}
EtherDump *
diff -r 7738a042628b -r 1af0b428ac2f src/dev/etherdump.hh
--- a/src/dev/etherdump.hh Tue May 06 16:22:14 2008 -0400
+++ b/src/dev/etherdump.hh Thu May 15 19:10:26 2008 -0400
@@ -46,7 +46,7 @@ class EtherDump : public SimObject
class EtherDump : public SimObject
{
private:
- std::ofstream stream;
+ std::ostream *stream;
const int maxlen;
void dumpPacket(EthPacketPtr &packet);
void init();
diff -r 7738a042628b -r 1af0b428ac2f src/mem/cache/tags/split.cc
--- a/src/mem/cache/tags/split.cc Tue May 06 16:22:14 2008 -0400
+++ b/src/mem/cache/tags/split.cc Thu May 15 19:10:26 2008 -0400
@@ -379,13 +379,12 @@ Split::cleanupRefs()
else if (lru_net)
lru_net->cleanupRefs();
- ofstream memPrint(simout.resolve("memory_footprint.txt").c_str(),
- ios::trunc);
+ ostream *memPrint = simout.create("memory_footprint.txt");
// this shouldn't be here but it happens at the end, which is what i want
memIter end = memHash.end();
for (memIter iter = memHash.begin(); iter != end; ++iter) {
- ccprintf(memPrint, "%8x\t%d\n", (*iter).first, (*iter).second);
+ ccprintf(*memPrint, "%8x\t%d\n", (*iter).first, (*iter).second);
}
}
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
