Add doc repo as submodule

[frida/frida.git] / src / core / InformationManager.cxx

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index c548a553507dbae95d56e52515f1c494fe6067be..604425e617499fa5155e3db8d84f40af49448824 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -4,7 +4,6 @@
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
 #include "core/Comment.hxx"
-#include "core/events/NewFunctionEvent.hxx"
 #include "core/events/ChangeCommentEvent.hxx"
 
 #include "qt.hxx"
@@ -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);
-       emit newFunctionEvent(&event);
+       emit newFunctionEvent(event);
 }
 
 void InformationManager::finishBasicBlock(BasicBlock*) {