From 53f5fda5de2b2ed7229cec0118d27ab420f8dca1 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Sat, 3 Mar 2007 07:45:55 -0800
Subject: [PATCH] Do the default argument stuff in python

--HG--
extra : convert_revision : 235f85e611a669401c6ddfbdf14244e80eb55888
---
 src/base/stats/mysql.cc |  5 +----
 src/base/stats/mysql.hh | 10 ++++-----
 src/python/m5/stats.py  | 46 +++++++++++++++++++++++++++++++++++++++++
 src/python/swig/stats.i |  6 +++---
 4 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 src/python/m5/stats.py

diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index d4035986b..39a687fff 100644
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -930,7 +930,7 @@ MySql::visit(const FormulaData &data)
 
 bool
 initMySQL(string host, string user, string password, string database,
-          string name, string sample, string project)
+          string project, string name, string sample)
 {
     extern list<Output *> OutputList;
     static MySql mysql;
@@ -938,9 +938,6 @@ initMySQL(string host, string user, string password, string database,
     if (mysql.connected())
         return false;
 
-    if (user.empty())
-        user = username();
-
     mysql.connect(host, user, password, database, name, sample, project);
     OutputList.push_back(&mysql);
 
diff --git a/src/base/stats/mysql.hh b/src/base/stats/mysql.hh
index 52f93ac61..0ce381c2f 100644
--- a/src/base/stats/mysql.hh
+++ b/src/base/stats/mysql.hh
@@ -187,15 +187,15 @@ 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");
+bool 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
 initMySQL(std::string host, std::string user, std::string password,
-    std::string database, std::string name, std::string sample,
-    std::string project)
+          std::string database, std::string project, std::string name,
+          std::string sample)
 {
     return false;
 }
diff --git a/src/python/m5/stats.py b/src/python/m5/stats.py
new file mode 100644
index 000000000..041a3f58d
--- /dev/null
+++ b/src/python/m5/stats.py
@@ -0,0 +1,46 @@
+# Copyright (c) 2007 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
+
+import internal
+
+from internal.stats import dump
+from internal.stats import initSimStats
+from internal.stats import reset
+from internal.stats import StatEvent as event
+
+def initText(filename, desc=True, compat=True):
+    internal.stats.initText(filename, desc, compat)
+
+def initMySQL(host, database, user='', passwd='', project='test', name='test',
+              sample='0'):
+    if not user:
+        import getpass
+        user = getpass.getuser()
+
+    internal.stats.initMySQL(host, database, user, passwd, project, name,
+                             sample)
diff --git a/src/python/swig/stats.i b/src/python/swig/stats.i
index b7cd47157..d36f82dbc 100644
--- a/src/python/swig/stats.i
+++ b/src/python/swig/stats.i
@@ -42,9 +42,9 @@
 namespace Stats {
 void initSimStats();
 void initText(const std::string &filename, bool desc=true, bool compat=true);
-void 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");
+void initMySQL(std::string host, std::string database, std::string user,
+    std::string passwd, std::string project, std::string name,
+    std::string sample);
 
 void StatEvent(bool dump, bool reset, Tick when = curTick, Tick repeat = 0);
 
-- 
2.30.2