diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/SConscript | 2 | ||||
| -rw-r--r-- | src/base/statistics.cc | 60 | ||||
| -rw-r--r-- | src/base/statistics.hh | 28 | ||||
| -rw-r--r-- | src/base/stats/info.hh | 4 | ||||
| -rw-r--r-- | src/base/stats/mysql.cc | 52 | ||||
| -rw-r--r-- | src/base/stats/mysql.hh | 10 | ||||
| -rw-r--r-- | src/base/stats/output.cc | 73 | ||||
| -rw-r--r-- | src/base/stats/output.hh | 24 | ||||
| -rw-r--r-- | src/base/stats/text.cc | 29 | ||||
| -rw-r--r-- | src/base/stats/text.hh | 5 | ||||
| -rw-r--r-- | src/base/stats/visit.cc | 41 | ||||
| -rw-r--r-- | src/base/stats/visit.hh | 59 |
12 files changed, 86 insertions, 301 deletions
diff --git a/src/base/SConscript b/src/base/SConscript index 3f069bf9e..7835ec71f 100644 --- a/src/base/SConscript +++ b/src/base/SConscript @@ -71,9 +71,7 @@ Source('loader/object_file.cc') Source('loader/raw_object.cc') Source('loader/symtab.cc') -Source('stats/output.cc') Source('stats/text.cc') -Source('stats/visit.cc') if env['USE_MYSQL']: Source('mysql.cc') diff --git a/src/base/statistics.cc b/src/base/statistics.cc index f1a368f47..e3f3ad78b 100644 --- a/src/base/statistics.cc +++ b/src/base/statistics.cc @@ -433,66 +433,18 @@ Formula::str() const return root ? root->str() : ""; } -void -enable() -{ - typedef list<Info *>::iterator iter_t; - - iter_t i, end = statsList().end(); - for (i = statsList().begin(); i != end; ++i) { - Info *info = *i; - assert(info); - if (!info->check() || !info->baseCheck()) - panic("stat check failed for '%s' %d\n", info->name, info->id); - } - - off_t j = 0; - for (i = statsList().begin(); i != end; ++i) { - Info *info = *i; - if (!(info->flags & display)) - info->name = "__Stat" + to_string(j++); - } - - statsList().sort(Info::less); - - for (i = statsList().begin(); i != end; ++i) { - Info *info = *i; - info->enable(); - } -} - -void -prepare() -{ - list<Info *>::iterator i = statsList().begin(); - list<Info *>::iterator end = statsList().end(); - while (i != end) { - Info *info = *i; - info->prepare(); - ++i; - } -} - CallbackQueue resetQueue; void -reset() -{ - list<Info *>::iterator i = statsList().begin(); - list<Info *>::iterator end = statsList().end(); - while (i != end) { - Info *info = *i; - info->reset(); - ++i; - } - - resetQueue.process(); -} - -void registerResetCallback(Callback *cb) { resetQueue.add(cb); } } // namespace Stats + +void +debugDumpStats() +{ + Stats::dump(); +} diff --git a/src/base/statistics.hh b/src/base/statistics.hh index f139bce61..cf8349d24 100644 --- a/src/base/statistics.hh +++ b/src/base/statistics.hh @@ -60,8 +60,8 @@ #include <vector> #include "base/stats/info.hh" +#include "base/stats/output.hh" #include "base/stats/types.hh" -#include "base/stats/visit.hh" #include "base/cast.hh" #include "base/cprintf.hh" #include "base/intmath.hh" @@ -90,7 +90,7 @@ class InfoProxy : public Base void prepare() { s.prepare(); } void reset() { s.reset(); } void - visit(Visit &visitor) + visit(Output &visitor) { visitor.visit(*static_cast<Base *>(this)); } @@ -738,7 +738,7 @@ class ProxyInfo : public ScalarInfo void reset() { } bool zero() const { return value() == 0; } - void visit(Visit &visitor) { visitor.visit(*this); } + void visit(Output &visitor) { visitor.visit(*this); } }; template <class T> @@ -2933,28 +2933,10 @@ sum(Temp val) return NodePtr(new SumNode<std::plus<Result> >(val)); } -/** - * Enable the statistics package. Before the statistics package is - * enabled, all statistics must be created and initialized and once - * the package is enabled, no more statistics can be created. - */ -void enable(); - -/** - * Prepare all stats for data access. This must be done before - * dumping and serialization. - */ -void prepare(); - -/** - * Dump all statistics data to the registered outputs - */ +/** Dump all statistics data to the registered outputs */ void dump(); - -/** - * Reset all statistics to the base state - */ void reset(); + /** * Register a callback that should be called whenever statistics are * reset diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh index 1759b4796..fa7c8cc3d 100644 --- a/src/base/stats/info.hh +++ b/src/base/stats/info.hh @@ -62,7 +62,7 @@ const FlagsType nonan = 0x0200; const FlagsType __reserved = init | display; struct StorageParams; -struct Visit; +struct Output; class Info { @@ -129,7 +129,7 @@ class Info /** * Visitor entry for outputing statistics data */ - virtual void visit(Visit &visitor) = 0; + virtual void visit(Output &visitor) = 0; /** * Checks if the first stat's name is alphabetically less than the second. diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc index c08394605..9f9a862d4 100644 --- a/src/base/stats/mysql.cc +++ b/src/base/stats/mysql.cc @@ -395,7 +395,8 @@ MySql::configure() list<Info *>::const_iterator i, end = statsList().end(); for (i = statsList().begin(); i != end; ++i) { - (*i)->visit(*this); + Info *info = *i; + info->visit(*this); } for (i = statsList().begin(); i != end; ++i) { @@ -606,7 +607,7 @@ MySql::valid() const } void -MySql::output() +MySql::begin() { assert(valid()); @@ -615,21 +616,23 @@ MySql::output() // store sample # newdata.tick = curTick(); +} - MySQL::Connection &mysql = run->conn(); - - list<Info *>::const_iterator i, end = statsList().end(); - for (i = statsList().begin(); i != end; ++i) { - Info *stat = *i; - stat->visit(*this); - if (mysql.commit()) - panic("could not commit transaction\n%s\n", mysql.error); - } - +void +MySql::end() +{ newdata.flush(); } void +MySql::commit() +{ + MySQL::Connection &mysql = run->conn(); + if (mysql.commit()) + panic("could not commit transaction\n%s\n", mysql.error); +} + +void MySql::output(const ScalarInfo &info) { if (!(info.flags & display)) @@ -641,6 +644,8 @@ MySql::output(const ScalarInfo &info) newdata.data = info.value(); newdata.insert(); + + commit(); } void @@ -659,6 +664,8 @@ MySql::output(const VectorInfo &info) newdata.data = cvec[x]; newdata.insert(); } + + commit(); } void @@ -708,6 +715,8 @@ MySql::output(const DistData &data, const DistParams *params) newdata.insert(); } } + + commit(); } void @@ -719,6 +728,8 @@ MySql::output(const DistInfo &info) newdata.stat = find(info.id); newdata.y = 0; output(info.data, safe_cast<const DistParams *>(info.storageParams)); + + commit(); } void @@ -735,6 +746,8 @@ MySql::output(const VectorDistInfo &info) output(info.data[y], safe_cast<const DistParams *>(info.storageParams)); } + + commit(); } void @@ -754,6 +767,8 @@ MySql::output(const Vector2dInfo &info) newdata.insert(); } } + + commit(); } void @@ -821,20 +836,17 @@ MySql::visit(const FormulaInfo &info) output(info); } -bool +Output * initMySQL(string host, string user, string password, string database, string project, string name, string sample) { - extern list<Output *> OutputList; static MySql mysql; - if (mysql.connected()) - return false; - - mysql.connect(host, user, password, database, name, sample, project); - OutputList.push_back(&mysql); + if (mysql.connected()) { + mysql.connect(host, user, password, database, name, sample, project); + } - return true; + return &mysql; } } // namespace Stats diff --git a/src/base/stats/mysql.hh b/src/base/stats/mysql.hh index caee2a1c2..a305304a2 100644 --- a/src/base/stats/mysql.hh +++ b/src/base/stats/mysql.hh @@ -147,10 +147,12 @@ class MySql : public Output // Implement Output virtual bool valid() const; - virtual void output(); + virtual void begin(); + virtual void end(); protected: // Output helper + void commit(); void output(const ScalarInfo &info); void output(const VectorInfo &info); void output(const DistInfo &info); @@ -169,17 +171,17 @@ class MySql : public Output void configure(const FormulaInfo &info); }; -bool initMySQL(std::string host, std::string database, std::string user, +Output *initMySQL(std::string host, std::string database, std::string user, std::string passwd, std::string project, std::string name, std::string sample); #if !USE_MYSQL -inline bool +inline Output * initMySQL(std::string host, std::string user, std::string password, std::string database, std::string project, std::string name, std::string sample) { - return false; + return NULL; } #endif diff --git a/src/base/stats/output.cc b/src/base/stats/output.cc deleted file mode 100644 index 6e1ba1c3b..000000000 --- a/src/base/stats/output.cc +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Nathan Binkert - */ - -#include <list> - -#include "base/stats/output.hh" -#include "base/statistics.hh" -#include "base/types.hh" -#include "sim/eventq.hh" - -using namespace std; - -namespace Stats { - -Tick lastDump(0); -list<Output *> OutputList; - -void -dump() -{ - assert(lastDump <= curTick()); - if (lastDump == curTick()) - return; - lastDump = curTick(); - - prepare(); - - list<Output *>::iterator i = OutputList.begin(); - list<Output *>::iterator end = OutputList.end(); - for (; i != end; ++i) { - Output *output = *i; - if (!output->valid()) - continue; - - output->output(); - } -} - -} // namespace Stats - -void -debugDumpStats() -{ - Stats::dump(); -} - diff --git a/src/base/stats/output.hh b/src/base/stats/output.hh index 0f485dee3..d45e32f77 100644 --- a/src/base/stats/output.hh +++ b/src/base/stats/output.hh @@ -31,17 +31,31 @@ #ifndef __BASE_STATS_OUTPUT_HH__ #define __BASE_STATS_OUTPUT_HH__ +#include <list> #include <string> -#include "base/stats/visit.hh" - namespace Stats { -struct Output : public Visit +class Info; +class ScalarInfo; +class VectorInfo; +class DistInfo; +class VectorDistInfo; +class Vector2dInfo; +class FormulaInfo; + +struct Output { - inline void operator()() { output(); } - virtual void output() = 0; + virtual void begin() = 0; + virtual void end() = 0; virtual bool valid() const = 0; + + virtual void visit(const ScalarInfo &info) = 0; + virtual void visit(const VectorInfo &info) = 0; + virtual void visit(const DistInfo &info) = 0; + virtual void visit(const VectorDistInfo &info) = 0; + virtual void visit(const Vector2dInfo &info) = 0; + virtual void visit(const FormulaInfo &info) = 0; }; } // namespace Stats diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc index f1ba59f0e..45d59ff29 100644 --- a/src/base/stats/text.cc +++ b/src/base/stats/text.cc @@ -48,7 +48,6 @@ #include "base/stats/info.hh" #include "base/stats/text.hh" -#include "base/stats/visit.hh" #include "base/cast.hh" #include "base/misc.hh" #include "base/str.hh" @@ -138,12 +137,14 @@ Text::valid() const } void -Text::output() +Text::begin() { ccprintf(*stream, "\n---------- Begin Simulation Statistics ----------\n"); - list<Info *>::const_iterator i, end = statsList().end(); - for (i = statsList().begin(); i != end; ++i) - (*i)->visit(*this); +} + +void +Text::end() +{ ccprintf(*stream, "\n---------- End Simulation Statistics ----------\n"); stream->flush(); } @@ -580,23 +581,19 @@ Text::visit(const FormulaInfo &info) visit((const VectorInfo &)info); } -bool +Output * initText(const string &filename, bool desc) { static Text text; static bool connected = false; - if (connected) - return false; - - extern list<Output *> OutputList; - - text.open(*simout.find(filename)); - text.descriptions = desc; - OutputList.push_back(&text); - connected = true; + if (!connected) { + text.open(*simout.find(filename)); + text.descriptions = desc; + connected = true; + } - return true; + return &text; } } // namespace Stats diff --git a/src/base/stats/text.hh b/src/base/stats/text.hh index de2bf9401..24abaac97 100644 --- a/src/base/stats/text.hh +++ b/src/base/stats/text.hh @@ -70,10 +70,11 @@ class Text : public Output // Implement Output virtual bool valid() const; - virtual void output(); + virtual void begin(); + virtual void end(); }; -bool initText(const std::string &filename, bool desc); +Output *initText(const std::string &filename, bool desc); } // namespace Stats diff --git a/src/base/stats/visit.cc b/src/base/stats/visit.cc deleted file mode 100644 index 1d13bc25d..000000000 --- a/src/base/stats/visit.cc +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Nathan Binkert - */ - -#include "base/stats/visit.hh" - -namespace Stats { - -Visit::Visit() -{} - -Visit::~Visit() -{} - -} // namespace Stats diff --git a/src/base/stats/visit.hh b/src/base/stats/visit.hh deleted file mode 100644 index 606d1c633..000000000 --- a/src/base/stats/visit.hh +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Nathan Binkert - */ - -#ifndef __BASE_STATS_VISIT_HH__ -#define __BASE_STATS_VISIT_HH__ - -namespace Stats { - -class Info; -class ScalarInfo; -class VectorInfo; -class DistInfo; -class VectorDistInfo; -class Vector2dInfo; -class FormulaInfo; - -struct Visit -{ - Visit(); - virtual ~Visit(); - - virtual void visit(const ScalarInfo &info) = 0; - virtual void visit(const VectorInfo &info) = 0; - virtual void visit(const DistInfo &info) = 0; - virtual void visit(const VectorDistInfo &info) = 0; - virtual void visit(const Vector2dInfo &info) = 0; - virtual void visit(const FormulaInfo &info) = 0; -}; - -} // namespace Stats - -#endif // __BASE_STATS_VISIT_HH__ |