tools/import-trace: FullTraceImporter added

The FullTraceImporter imports every ip-event into the database.

Change-Id: I1c0ce2a0aae72dcd925930861780f2719d37b985

tools/import-trace/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(SRCS
   Importer.cc
   MemoryImporter.cc
+  FullTraceImporter.cc
 )
 
 if (BUILD_LLVM_DISASSEMBLER)

tools/import-trace/FullTraceImporter.cc

@@ -0,0 +1,72 @@
+#include <string>
+#include <sstream>
+
+#include "util/Logger.hpp"
+#include "util/Database.hpp"
+#include "FullTraceImporter.hpp"
+
+using namespace fail;
+static fail::Logger LOG("FullTraceImporter");
+
+Database *db;
+
+bool FullTraceImporter::handle_ip_event(simtime_t curtime, instruction_count_t instr,
+					Trace_Event &ev) {
+
+	margin_info_t right_margin;
+	right_margin.time = curtime;
+	right_margin.dyninstr = instr; // !< The current instruction
+	right_margin.ip = ev.ip();
+
+	// pass through potentially available extended trace information
+	if (!add_trace_event(right_margin, right_margin, ev)) {
+		LOG << "add_trace_event failed" << std::endl;
+		return false;
+	}
+
+	return true;
+}
+
+bool FullTraceImporter::handle_mem_event(simtime_t curtime, instruction_count_t instr,
+					Trace_Event &ev) {
+	return true;
+}
+
+bool FullTraceImporter::create_database() {
+	std::stringstream create_statement;
+	create_statement << "CREATE TABLE IF NOT EXISTS fulltrace ("
+			"   variant_id int(11) NOT NULL,"
+			"   instr int(10) unsigned NOT NULL,"
+			"   instr_absolute int(10) unsigned DEFAULT NULL,"
+			"       INDEX(instr),"
+			"   PRIMARY KEY (variant_id,instr)"
+			") engine=MyISAM ";
+	return db->query(create_statement.str().c_str());
+}
+
+bool FullTraceImporter::clear_database() {
+	std::stringstream ss;
+	ss << "DELETE FROM fulltrace WHERE variant_id = " << m_variant_id;
+
+	bool ret = db->query(ss.str().c_str()) == 0 ? false : true;
+	LOG << "deleted " << db->affected_rows() << " rows from fulltrace table" << std::endl;
+	return ret;
+}
+
+bool FullTraceImporter::add_trace_event(margin_info_t &begin, margin_info_t &end,
+					Trace_Event &event, bool is_fake) {
+	// Is event a fake mem-event?
+	if (is_fake) {
+		return true;
+	}
+
+	// INSERT group entry
+	std::stringstream sql;
+	sql << "(" << m_variant_id << "," << end.dyninstr << "," << end.ip << ")";
+
+	return db->insert_multiple("INSERT INTO fulltrace (variant_id, instr, instr_absolute) VALUES ", sql.str().c_str());
+}
+
+bool FullTraceImporter::trace_end_reached() {
+	return db->insert_multiple();
+}

tools/import-trace/FullTraceImporter.hpp

@@ -0,0 +1,25 @@
+#ifndef __FULL_TRACE_IMPORTER_H__
+#define __FULL_TRACE_IMPORTER_H__
+
+#include "Importer.hpp"
+#include "util/CommandLine.hpp"
+
+/**
+	The FullTraceImporter imports every dynamic ip-event from the trace into the database.
+*/
+class FullTraceImporter : public Importer {
+
+protected:
+	virtual bool handle_ip_event(fail::simtime_t curtime, instruction_count_t instr,
+				Trace_Event &ev);
+	virtual bool handle_mem_event(fail::simtime_t curtime, instruction_count_t instr,
+				Trace_Event &ev);
+	virtual bool create_database();
+	virtual bool clear_database();
+	using Importer::add_trace_event;
+	virtual bool add_trace_event(margin_info_t &begin, margin_info_t &end,
+				Trace_Event &event, bool is_fake = false);
+	virtual bool trace_end_reached();
+};
+
+#endif

tools/import-trace/main.cc

@@ -7,6 +7,7 @@
 #include <fstream>
 #include <string>
 #include "MemoryImporter.hpp"
+#include "FullTraceImporter.hpp"
 
 #ifdef BUILD_LLVM_DISASSEMBLER
 #include "InstructionImporter.hpp"
@@ -129,6 +130,8 @@ int main(int argc, char *argv[]) {
 		if (imp == "BasicImporter" || imp == "MemoryImporter" || imp == "memory" || imp == "mem") {
 			imp = "MemoryImporter";
 			importer = new MemoryImporter();
+		} else if (imp == "FullTraceImporter") {
+			importer = new FullTraceImporter();
 #ifdef BUILD_LLVM_DISASSEMBLER
 		} else if (imp == "InstructionImporter" || imp == "code") {
 			imp = "InstructionImporter";