Run the disassembler in it's own thread

Makes the gui responsive while the disassembler is working. Would also
allow for severall worker threads in the disassembler in the future --
and more cool stuff!

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index 500f79f1406f661c2a4ac53747fa053898ff0db6..7044381511b32ce270ad6fc32756bc6b2ce4b8bd 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -28,6 +28,7 @@ InformationManager::InformationManager()
 }
 
 InformationManager::~InformationManager() {
 }
 
 InformationManager::~InformationManager() {

+       disassemblerThread.quit();

        for (auto b : blocks)
                delete b.second;
 
        for (auto b : blocks)
                delete b.second;
 


@@ -36,14 +37,19 @@ InformationManager::~InformationManager() {
 
        for (auto i : plugins)
                delete i;
 
        for (auto i : plugins)
                delete i;

+       disassemblerThread.wait();

 }
 
 void InformationManager::reset(const std::string& filename) {
        this->filename = filename;
        disassembler.reset(createLLVMDisassembler(filename, this));
        emit resetEvent();
 }
 
 void InformationManager::reset(const std::string& filename) {
        this->filename = filename;
        disassembler.reset(createLLVMDisassembler(filename, this));
        emit resetEvent();

-       if (disassembler.get() != NULL)
-               disassembler.get()->start();
+       if (disassembler.get() != NULL) {
+               disassembler.get()->moveToThread(&disassemblerThread);
+               connect(&disassemblerThread, &QThread::started,
+                       disassembler.get(), &Disassembler::start);
+               disassemblerThread.start();
+       }

 }
 
 void InformationManager::load(const std::string& filename) {
 }
 
 void InformationManager::load(const std::string& filename) {

diff --git a/src/core/InformationManager.hxx b/src/core/InformationManager.hxx
index a866e0adf62c39791d8a8effe7453794f989cb60..f39f6e4335af3ef80c3cc5be58951293bc740e0b 100644 (file)
--- a/src/core/InformationManager.hxx
+++ b/src/core/InformationManager.hxx
@@ -116,6 +116,7 @@ private:
        std::unique_ptr<QTemporaryFile> tmpfile;
        std::vector<QPluginLoader*> plugins;
 
        std::unique_ptr<QTemporaryFile> tmpfile;
        std::vector<QPluginLoader*> plugins;
 

+       QThread disassemblerThread;

        log4cxx::LoggerPtr logger;
 };
 
        log4cxx::LoggerPtr logger;
 };
 

diff --git a/src/disassembler/Disassembler.hxx b/src/disassembler/Disassembler.hxx
index ad35018e870bab74ae33da162d290be30e3a7832..6971177b63e27487029d643392d48b0f765be962 100644 (file)
--- a/src/disassembler/Disassembler.hxx
+++ b/src/disassembler/Disassembler.hxx
@@ -20,13 +20,13 @@ public:
        Disassembler() {}
        virtual ~Disassembler() {}
 
        Disassembler() {}
        virtual ~Disassembler() {}
 

-       virtual void start() = 0;

        virtual void getSymbols() = 0;
        virtual uint64_t entryAddress() = 0;
 
 #ifndef SWIG
 public slots:
 #endif
        virtual void getSymbols() = 0;
        virtual uint64_t entryAddress() = 0;
 
 #ifndef SWIG
 public slots:
 #endif

+       virtual void start() = 0;

        virtual Function * disassembleFunctionAt(uint64_t address) {
                return disassembleFunctionAt(address, "");
        }
        virtual Function * disassembleFunctionAt(uint64_t address) {
                return disassembleFunctionAt(address, "");
        }