1 files changed, 11 insertions, 120 deletions

diff --git a/src/base/stats/events.cc b/src/base/stats/events.cc
index 6ecc5434c..dc56fe75f 100644
--- a/src/base/stats/events.cc
+++ b/src/base/stats/events.cc
@@ -31,20 +31,8 @@
 #include <vector>
 
 #include "base/stats/events.hh"
-
-#if USE_MYSQL
-#include "base/cprintf.hh"
-#include "base/misc.hh"
-#include "base/mysql.hh"
-#include "base/stats/mysql.hh"
-#include "base/stats/mysql_run.hh"
-#include "base/str.hh"
-#endif
-
-#include "base/match.hh"
+#include "base/stats/output.hh"
 #include "sim/host.hh"
-#include "sim/sim_object.hh"
-#include "sim/root.hh"
 
 using namespace std;
 
@@ -52,118 +40,21 @@ namespace Stats {
 
 Tick EventStart = ULL(0x7fffffffffffffff);
 
-ObjectMatch event_ignore;
+extern list<Output *> OutputList;
 
 #if USE_MYSQL
-class InsertEvent
-{
-  private:
-    char *query;
-    int size;
-    bool first;
-    static const int maxsize = 1024*1024;
-
-    typedef map<string, uint32_t> event_map_t;
-    event_map_t events;
-
-    MySQL::Connection &mysql;
-    uint16_t run;
-
-  public:
-    InsertEvent()
-        : mysql(MySqlDB.conn()), run(MySqlDB.run())
-    {
-        query = new char[maxsize + 1];
-        size = 0;
-        first = true;
-        flush();
-    }
-    ~InsertEvent()
-    {
-        flush();
-    }
-
-    void flush();
-    void insert(const string &stat);
-};
-
 void
-InsertEvent::insert(const string &stat)
+__event(const string &event)
 {
-    assert(mysql.connected());
-
-    event_map_t::iterator i = events.find(stat);
-    uint32_t event;
-    if (i == events.end()) {
-        mysql.query(
-            csprintf("SELECT en_id "
-                     "from event_names "
-                     "where en_name=\"%s\"",
-                     stat));
-
-        MySQL::Result result = mysql.store_result();
-        if (!result)
-            panic("could not get a run\n%s\n", mysql.error);
-
-        assert(result.num_fields() == 1);
-        MySQL::Row row = result.fetch_row();
-        if (row) {
-            if (!to_number(row[0], event))
-                panic("invalid event id: %s\n", row[0]);
-        } else {
-            mysql.query(
-                csprintf("INSERT INTO "
-                         "event_names(en_name)"
-                         "values(\"%s\")",
-                         stat));
-
-            if (mysql.error)
-                panic("could not get a run\n%s\n", mysql.error);
-
-            event = mysql.insert_id();
-        }
-    } else {
-        event = (*i).second;
+    list<Output *>::iterator i = OutputList.begin();
+    list<Output *>::iterator end = OutputList.end();
+    for (; i != end; ++i) {
+        Output *output = *i;
+        if (!output->valid())
+            continue;
+
+        output->event(event);
     }
-
-    if (size + 1024 > maxsize)
-        flush();
-
-    if (!first) {
-        query[size++] = ',';
-        query[size] = '\0';
-    }
-
-    first = false;
-
-    size += sprintf(query + size, "(%u,%u,%llu)",
-                    event, run, (unsigned long long)curTick);
-}
-
-void
-InsertEvent::flush()
-{
-    static const char query_header[] = "INSERT INTO "
-        "events(ev_event, ev_run, ev_tick)"
-        "values";
-
-    if (size) {
-        MySQL::Connection &mysql = MySqlDB.conn();
-        assert(mysql.connected());
-        mysql.query(query);
-    }
-
-    query[0] = '\0';
-    size = sizeof(query_header);
-    first = true;
-    memcpy(query, query_header, size);
-}
-
-void
-__event(const string &stat)
-{
-    static InsertEvent event;
-    event.insert(stat);
 }
 
 #endif