X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fcore%2FInformationManager.cxx;h=604425e617499fa5155e3db8d84f40af49448824;hp=b9649829c48a3554367358e16ad5d21a047b6e5e;hb=HEAD;hpb=919a772f027ac9ac5e611b47a3dad44b611a443c

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index b964982..604425e 100644
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -4,10 +4,9 @@
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
 #include "core/Comment.hxx"
-#include "core/events/NewFunctionEvent.hxx"
 #include "core/events/ChangeCommentEvent.hxx"
 
-#include "gui/qt.hxx"
+#include "qt.hxx"
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 
@@ -19,6 +18,7 @@ InformationManager::InformationManager()
 	: logger(log4cxx::Logger::getLogger("core.InformationManager"))
 {
 	current_information_manager = this;
+	qRegisterMetaType<NewFunctionEvent>("NewFunctionEvent");
 
 	QPluginLoader* loader = new QPluginLoader("libguilePlugin", NULL);
 	if (!loader->load())
@@ -28,6 +28,7 @@ InformationManager::InformationManager()
 }
 
 InformationManager::~InformationManager() {
+	disassemblerThread.quit();
 	for (auto b : blocks)
 		delete b.second;
 
@@ -36,13 +37,23 @@ InformationManager::~InformationManager() {
 
 	for (auto i : plugins)
 		delete i;
+	disassemblerThread.wait();
 }
 
 void InformationManager::reset(const std::string& filename) {
 	this->filename = filename;
 	disassembler.reset(createLLVMDisassembler(filename, this));
-	if (disassembler.get() != NULL)
+	if (disassembler.get() != NULL) {
+		emit resetEvent();
+#ifndef CONFIG_TEST
+		disassembler.get()->moveToThread(&disassemblerThread);
+		connect(&disassemblerThread, &QThread::started,
+		        disassembler.get(), &Disassembler::start);
+		disassemblerThread.start();
+#else
 		disassembler.get()->start();
+#endif
+	}
 }
 
 void InformationManager::load(const std::string& filename) {
@@ -270,7 +281,7 @@ void InformationManager::finishFunction(Function* fun) {
 		blocks.insert(std::make_pair(bl->getStartAddress(), bl));
 	}
 	NewFunctionEvent event(fun->getStartAddress(), fun);
-	dispatch(&event);
+	emit newFunctionEvent(event);
 }
 
 void InformationManager::finishBasicBlock(BasicBlock*) {
@@ -279,7 +290,7 @@ void InformationManager::finishBasicBlock(BasicBlock*) {
 void InformationManager::finishComment(Comment* c) {
 	LOG4CXX_DEBUG(logger, "Finishing comment " << c->getAddress());
 	ChangeCommentEvent event(c->getAddress(), c->getLocation(), c);
-	dispatch(&event);
+	emit changeCommentEvent(&event);
 }
 
 void InformationManager::deleteFunction(Function* f) {