make the interaction of the stats event stuff with the

database work better.

base/stats/events.cc:
    properly connect to the database
base/stats/mysql.cc:
    cleanup the event stuff too

--HG--
extra : convert_revision : f05fd6456decc9c4f95beff5c12497439e45f886
This commit is contained in:
Nathan Binkert
2004-05-23 12:53:34 -04:00
parent 6cf04bf31e
commit 3a0dfc43d1
2 changed files with 16 additions and 6 deletions

View File

@@ -66,11 +66,12 @@ __event(const string &stat)
stat));
MySQL::Result result = mysql.store_result();
if (result) {
assert(result.num_fields() == 1);
MySQL::Row row = result.fetch_row();
if (!row)
panic("could not get a run\n%s\n", mysql.error);
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 {
@@ -85,7 +86,6 @@ __event(const string &stat)
event = mysql.insert_id();
}
} else {
event = (*i).second;
}

View File

@@ -134,6 +134,16 @@ MySqlRun::cleanup()
"FROM bins "
"LEFT JOIN data ON bn_id=dt_bin "
"WHERE dt_bin IS NULL");
mysql.query("DELETE events"
"FROM events"
"LEFT JOIN runs ON ev_run=rn_id"
"WHERE rn_id IS NULL");
mysql.query("DELETE event_names"
"FROM event_names"
"LEFT JOIN events ON en_id=ev_event"
"WHERE ev_event IS NULL");
}
void