Get rid of the Statistics and Statreset ParamContexts, and

expose all of the relevant functionality to python.  Clean
up the mysql code while we're at it.

--HG--
extra : convert_revision : 5b711202a5a452b8875ebefb136a156b65c24279

5 files changed, 174 insertions, 21 deletions

diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index 0fb31f4ce..01a82c4bf 100644
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -49,14 +49,6 @@ using namespace std;
 
 namespace Stats {
 
-MySqlRun MySqlDB;
-
-bool
-MySqlConnected()
-{
-    return MySqlDB.connected();
-}
-
 void
 MySqlRun::connect(const string &host, const string &user, const string &passwd,
                   const string &db, const string &name, const string &sample,
@@ -198,7 +190,7 @@ SetupStat::init()
 unsigned
 SetupStat::setup()
 {
-    MySQL::Connection &mysql = MySqlDB.conn();
+    MySQL::Connection &mysql = run->conn();
 
     stringstream insert;
     ccprintf(insert,
@@ -317,7 +309,7 @@ void
 InsertData::flush()
 {
     if (size) {
-        MySQL::Connection &mysql = MySqlDB.conn();
+        MySQL::Connection &mysql = run->conn();
         assert(mysql.connected());
         mysql.query(query);
         if (mysql.error)
@@ -349,7 +341,7 @@ InsertData::insert()
     first = false;
 
     size += sprintf(query + size, "(%u,%d,%d,%u,%llu,\"%f\")",
-                    stat, x, y, MySqlDB.run(), (unsigned long long)tick,
+                    stat, x, y, run->run(), (unsigned long long)tick,
                     data);
 }
 
@@ -367,7 +359,7 @@ struct InsertSubData
 void
 InsertSubData::setup()
 {
-    MySQL::Connection &mysql = MySqlDB.conn();
+    MySQL::Connection &mysql = run->conn();
     assert(mysql.connected());
     stringstream insert;
     ccprintf(insert,
@@ -386,7 +378,7 @@ InsertSubData::setup()
 void
 InsertFormula(uint16_t stat, const string &formula)
 {
-    MySQL::Connection &mysql = MySqlDB.conn();
+    MySQL::Connection &mysql = run->conn();
     assert(mysql.connected());
     stringstream insert_formula;
     ccprintf(insert_formula,
@@ -400,7 +392,7 @@ InsertFormula(uint16_t stat, const string &formula)
     stringstream insert_ref;
     ccprintf(insert_ref,
              "INSERT INTO formula_ref(fr_stat,fr_run) values(%d, %d)",
-             stat, MySqlDB.run());
+             stat, run->run());
 
     mysql.query(insert_ref);
 //    if (mysql.error)
@@ -413,7 +405,7 @@ InsertFormula(uint16_t stat, const string &formula)
 void
 UpdatePrereq(uint16_t stat, uint16_t prereq)
 {
-    MySQL::Connection &mysql = MySqlDB.conn();
+    MySQL::Connection &mysql = run->conn();
     assert(mysql.connected());
     stringstream update;
     ccprintf(update, "UPDATE stats SET st_prereq=%d WHERE st_id=%d",
@@ -426,6 +418,29 @@ UpdatePrereq(uint16_t stat, uint16_t prereq)
         panic("could not commit transaction\n%s\n", mysql.error);
 }
 
+MySql::MySql()
+    : run(new MySqlRun)
+{}
+
+MySql::~MySql()
+{
+    delete run;
+}
+
+void
+MySql::connect(const string &host, const string &user, const string &passwd,
+               const string &db, const string &name, const string &sample,
+               const string &project)
+{
+    run->connect(host, user, passwd, db, name, sample, project);
+}
+
+bool
+MySql::connected() const
+{
+    run->connected();
+}
+
 void
 MySql::configure()
 {
@@ -434,7 +449,7 @@ MySql::configure()
      */
     using namespace Database;
 
-    MySQL::Connection &mysql = MySqlDB.conn();
+    MySQL::Connection &mysql = run->conn();
 
     stat_list_t::const_iterator i, end = stats().end();
     for (i = stats().begin(); i != end; ++i) {
@@ -605,7 +620,7 @@ MySql::configure(const FormulaData &data)
 bool
 MySql::valid() const
 {
-    return MySqlDB.connected();
+    return run->connected();
 }
 
 void
@@ -620,7 +635,7 @@ MySql::output()
     // store sample #
     newdata.tick = curTick;
 
-    MySQL::Connection &mysql = MySqlDB.conn();
+    MySQL::Connection &mysql = run->conn();
 
     Database::stat_list_t::const_iterator i, end = Database::stats().end();
     for (i = Database::stats().begin(); i != end; ++i) {
@@ -825,4 +840,21 @@ MySql::visit(const FormulaData &data)
         output(data);
 }
 
-/* namespace Stats */ }
+bool
+initMySQL(string host, string user, string password, string database,
+           string name, string sample, string project)
+{
+    extern list<Output *> OutputList;
+    static MySql mysql;
+
+    if (mysql.connected())
+        return false;
+
+    if (user.empty())
+        user = username();
+
+    mysql.connect(host, user, password, database, name, sample, project);
+    OutputList.push_back(&mysql);
+
+    return true;
+}
diff --git a/src/base/stats/mysql.hh b/src/base/stats/mysql.hh
index 50f7d9e97..a43c74ecc 100644
--- a/src/base/stats/mysql.hh
+++ b/src/base/stats/mysql.hh
@@ -35,14 +35,13 @@
 #include <string>
 
 #include "base/stats/output.hh"
+#include "config/use_mysql.hh"
 
 namespace MySQL { class Connection; }
 namespace Stats {
 
 class DistDataData;
 class MySqlRun;
-bool MySqlConnected();
-extern MySqlRun MySqlDB;
 
 struct SetupStat
 {
@@ -95,6 +94,9 @@ class InsertData
 class MySql : public Output
 {
   protected:
+    MySqlRun *run; /* Hide the implementation so we don't have a
+                      #include mess */
+
     SetupStat stat;
     InsertData newdata;
     std::list<FormulaData *> formulas;
@@ -116,6 +118,17 @@ class MySql : public Output
         assert(i != idmap.end());
         return (*i).second;
     }
+
+  public:
+    MySql(MySqlRun &_run){}
+    ~MySql();
+
+    void connect(const std::string &host, const std::string &user,
+                 const std::string &passwd, const std::string &db,
+                 const std::string &name, const std::string &sample,
+                 const std::string &project);
+    bool connected() const;
+
   public:
     // Implement Visit
     virtual void visit(const ScalarData &data);
@@ -149,6 +162,20 @@ class MySql : public Output
     void configure(const FormulaData &data);
 };
 
+bool initMySQL(std::string host, std::string database, std::string user = "",
+    std::string passwd = "", std::string name = "test",
+    std::string sample = "0", std::string project = "test");
+
+#if !USE_MYSQL
+inline bool
+initMySQL(std::string host, std::string user, std::string password,
+    std::string database, std::string name, std::string sample,
+    std::string project)
+{
+    return false;
+}
+#endif
+
 /* namespace Stats */ }
 
 #endif // __BASE_STATS_MYSQL_HH__
diff --git a/src/base/stats/output.cc b/src/base/stats/output.cc
new file mode 100644
index 000000000..9f2b91c77
--- /dev/null
+++ b/src/base/stats/output.cc
@@ -0,0 +1,70 @@
+/*
+ * 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 "sim/eventq.hh"
+#include "sim/host.hh"
+
+using namespace std;
+
+namespace Stats {
+
+Tick lastDump(0);
+list<Output *> OutputList;
+
+void
+dump()
+{
+    assert(lastDump <= curTick);
+    if (lastDump == curTick)
+        return;
+    lastDump = curTick;
+
+    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/text.cc b/src/base/stats/text.cc
index ae0d65537..66c5955d7 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -725,4 +725,25 @@ Text::visit(const FormulaData &data)
     visit((const VectorData &)data);
 }
 
+bool
+initText(const string &filename, bool desc, bool compat)
+{
+    static Text text;
+    static bool connected = false;
+
+    if (connected)
+        return false;
+
+    extern list<Output *> OutputList;
+
+    text.open(*simout.find(filename));
+    text.descriptions = desc;
+    text.compat = compat;
+    OutputList.push_back(&text);
+    connected = true;
+
+    return true;
+}
+
+
 /* namespace Stats */ }
diff --git a/src/base/stats/text.hh b/src/base/stats/text.hh
index b3faf5ad5..0516bc60d 100644
--- a/src/base/stats/text.hh
+++ b/src/base/stats/text.hh
@@ -34,6 +34,7 @@
 #include <iosfwd>
 #include <string>
 
+#include "base/output.hh"
 #include "base/stats/output.hh"
 
 namespace Stats {
@@ -73,6 +74,8 @@ class Text : public Output
     virtual void output();
 };
 
+bool initText(const std::string &filename, bool desc=true, bool compat=true);
+
 /* namespace Stats */ }
 
 #endif // __BASE_STATS_TEXT_HH__