christoph/fail
1
Fork 0
Code Releases Activity

Merge changes If7bbbe14,Ifbf67303

Browse Source 
* changes:
  ecos: DB-related campaign changes
  plugins/tracing: use fixed dereference size of 4
This commit is contained in:
Horst Schirmeier
2013-07-04 10:36:46 +02:00
committed by Gerrit Code Review
parent 286f5a27a1 27f1f77524
commit f67b3c8e00
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/experiments/ecos_kernel_test/campaign.cc
View File

@ -275,7 +275,7 @@ bool EcosKernelTestCampaign::run()
unsigned deleted_rows = db->affected_rows(); unsigned deleted_rows = db->affected_rows();
ss.str(""); ss.str("");
m_log << "Deleted " << deleted_rows << " rows from incomplete jobs" << std::endl; m_log << "Deleted " << deleted_rows << " rows from incomplete jobs" << std::endl;
std::string sql_select = "SELECT STRAIGHT_JOIN p.id AS pilot_id, v.id AS variant_id, v.variant, v.benchmark, p.injection_instr, p.injection_instr_absolute, p.data_address "; std::string sql_select = "SELECT p.id AS pilot_id, v.id AS variant_id, v.variant, v.benchmark, p.injection_instr, p.injection_instr_absolute, p.data_address ";
ss << "FROM variant v " ss << "FROM variant v "
<< "JOIN fsppilot p ON p.variant_id = v.id " << "JOIN fsppilot p ON p.variant_id = v.id "
<< "LEFT JOIN done_pilots d ON d.id = p.id " << "LEFT JOIN done_pilots d ON d.id = p.id "
@ -341,8 +341,6 @@ bool EcosKernelTestCampaign::run()
std::cerr << "mysql_fetch_row failed: " << mysql_error(db->getHandle()) << std::endl; std::cerr << "mysql_fetch_row failed: " << mysql_error(db->getHandle()) << std::endl;
} }
delete db;
m_log << "finished, waiting for the clients to complete ..." << std::endl; m_log << "finished, waiting for the clients to complete ..." << std::endl;
campaignmanager.noMoreParameters(); campaignmanager.noMoreParameters();
@ -350,7 +348,12 @@ bool EcosKernelTestCampaign::run()
collect_thread.join(); collect_thread.join();
#endif #endif
delete db_recv; delete db_recv;
m_log << "results complete, terminating." << std::endl; m_log << "results complete, updating DB statistics ..." << std::endl;
ss.str("");
ss << "ANALYZE TABLE " << m_result_table;
if (!db->query(ss.str().c_str())) return false;
delete db;
m_log << "terminating." << std::endl;
return true; return true;
} }

2
src/plugins/tracing/TracingPlugin.cc
View File

@ -111,7 +111,7 @@ bool TracingPlugin::run()
Trace_Event_Extended_Registers *er = ext.add_registers(); Trace_Event_Extended_Registers *er = ext.add_registers();
er->set_id(ids[i]); er->set_id(ids[i]);
er->set_value(simulator.getCPU(0).getRegisterContent(regs[i])); er->set_value(simulator.getCPU(0).getRegisterContent(regs[i]));
if (er->value() <= mm.getPoolSize() - width) { if (er->value() <= mm.getPoolSize() - 4) {
uint32_t value_deref; uint32_t value_deref;
mm.getBytes(er->value(), 4, &value_deref); mm.getBytes(er->value(), 4, &value_deref);
er->set_value_deref(value_deref); er->set_value_deref(value_deref);