christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Database: more flexible get_variants()

Browse Source 
This change moves prune-trace's --variants-exclude / --benchmarks-exclude
capabilities to Database::get_variants() to make it available to all users.

Change-Id: Icbc6bb1a3ae7c846d2de40b881f47a9cc1ed7bbf
This commit is contained in:
Horst Schirmeier
2014-05-05 09:40:14 +02:00
parent 5efebea5d1
commit 9a81ab4222
5 changed files with 106 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/prune-trace/BasicPruner.cc
View File

@ -19,22 +19,21 @@ bool BasicPruner::prune_all() {
"SELECT 0, variant_id, instr2, " << injection_instr << ", " << injection_instr_absolute << ", "
" data_address, width, " << m_method_id << " "
"FROM trace "
"WHERE variant_id IN (" << m_variant_id_query << ") AND accesstype = 'R'";
"WHERE variant_id IN (" << m_variants_sql << ") AND accesstype = 'R'";
if (!db->query(ss.str().c_str())) return false;
ss.str("");
int rows = db->affected_rows();
// for each variant:
MYSQL_RES *res = db->query(m_variant_id_query.c_str(), true);
MYSQL_ROW row;
while ((row = mysql_fetch_row(res))) {
for (std::vector<fail::Database::Variant>::const_iterator it = m_variants.begin();
it != m_variants.end(); ++it) {
// single entry for known outcome (write access)
ss << "INSERT INTO fsppilot (known_outcome, variant_id, instr2, injection_instr, injection_instr_absolute, data_address, data_width, fspmethod_id) "
"SELECT 1, variant_id, instr2, " << injection_instr << ", " << injection_instr_absolute << ", "
" data_address, width, " << m_method_id << " "
"FROM trace "
"WHERE variant_id = " << row[0] << " AND accesstype = 'W' "
"WHERE variant_id = " << it->id << " AND accesstype = 'W' "
"ORDER BY instr2 ASC "
"LIMIT 1";
if (!db->query(ss.str().c_str())) return false;
@ -50,7 +49,7 @@ bool BasicPruner::prune_all() {
<< "JOIN trace t ON t.variant_id = p.variant_id AND t.instr2 = p.instr2"
<< " AND t.data_address = p.data_address "
<< "WHERE known_outcome = 0 AND p.fspmethod_id = " << m_method_id << " "
<< "AND p.variant_id IN (" << m_variant_id_query << ")";
<< "AND p.variant_id IN (" << m_variants_sql << ")";
if (!db->query(ss.str().c_str())) return false;
ss.str("");
@ -61,7 +60,7 @@ bool BasicPruner::prune_all() {
"FROM fsppilot p "
"JOIN trace t "
"ON t.variant_id = p.variant_id AND p.fspmethod_id = " << m_method_id << " AND p.known_outcome = 1 "
"WHERE t.variant_id IN (" << m_variant_id_query << ") AND t.accesstype = 'W'";
"WHERE t.variant_id IN (" << m_variants_sql << ") AND t.accesstype = 'W'";
if (!db->query(ss.str().c_str())) return false;
ss.str("");
rows += db->affected_rows();