Added concurrency for getting function and section lists, and replace…

…d loading dialog with progress dialog
jubal-R · Sep 3, 2017 · ef7a01b · ef7a01b
1 parent 75a0b36
commit ef7a01b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 85 deletions.
diff --git a/src/ObjGui.pro b/src/ObjGui.pro
@@ -44,7 +44,6 @@ HEADERS  += mainwindow.h \
     dataStructures/strings.h
 
 FORMS    += mainwindow.ui \
-    loadingdialog.ui \
     resultsdialog.ui
 
 RESOURCES += \

diff --git a/src/ObjGui.pro.user b/src/ObjGui.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2017-09-02T09:37:31. -->
+<!-- Written by QtCreator 3.5.1, 2017-09-02T22:20:58. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/src/loadingdialog.ui b/src/loadingdialog.ui
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -5,6 +5,9 @@
 #include "QScrollBar"
 #include "QSettings"
 #include "QInputDialog"
+#include "QProgressDialog"
+#include "QFuture"
+#include "QtConcurrent/QtConcurrent"
 
 #include "QDebug"
 
@@ -14,10 +17,8 @@
 #include "highlighters/headerhighlighter.h"
 #include "objdumper.h"
 #include "dataStructures/strings.h"
-#include "ui_loadingdialog.h"
 #include "resultsdialog.h"
 
-using namespace std;
 
 Files files;
 FunctionList functionList;
@@ -276,12 +277,28 @@ void MainWindow::loadBinary(QString file){
              *  Disassemble Binary and Display Values
             */
 
+            QProgressDialog progress("Loading Disassembly", "", 0, 4, this);
+            progress.setCancelButton(0);
+            progress.setWindowModality(Qt::WindowModal);
+            progress.setMinimumDuration(500);
+            progress.setValue(0);
+
             // Get base offsets
             baseOffsets = objDumper.getBaseOffset(file);
 
-            // Disassemble and get function list
+            // Disassemble, and get function and section lists
             functionList.nukeList();
-            functionList = objDumper.getFunctionList(file, baseOffsets);
+            QFuture<FunctionList> futureFunctionList = QtConcurrent::run(&objDumper, &ObjDumper::getFunctionList, file, baseOffsets);
+            sectionList.nukeList();
+            QFuture<SectionList> futureSectionList = QtConcurrent::run(&objDumper, &ObjDumper::getSectionList, file);
+
+            while (!futureFunctionList.isFinished() || !futureSectionList.isFinished()){
+                qApp->processEvents();
+            }
+            functionList = futureFunctionList.result();
+            sectionList = futureSectionList.result();
+
+            progress.setValue(1);
 
             // If functionlist is empty
             if (functionList.isEmpty()){
@@ -306,9 +323,9 @@ void MainWindow::loadBinary(QString file){
                 ui->actionFind_Calls_to_Current_Location->setEnabled(true);
             }
 
-            // Get section list and set hex values
-            sectionList.nukeList();
-            sectionList = objDumper.getSectionList(file);
+            progress.setValue(2);
+
+            // Set hex view values
             int len = sectionList.getLength();
             QByteArray addressStr;
             QByteArray hexStr;
@@ -323,6 +340,8 @@ void MainWindow::loadBinary(QString file){
             ui->hexAddressBrowser->setPlainText(addressStr);
             ui->hexBrowser->setPlainText(hexStr);
 
+            progress.setValue(3);
+
             // Set file format value in statusbar
             ui->fileFormatlabel->setText(objDumper.getFileFormat(file));
             ui->symbolsBrowser->setPlainText(objDumper.getSymbolsTable(file));
@@ -340,33 +359,24 @@ void MainWindow::loadBinary(QString file){
 
             ui->tabWidget->setCurrentIndex(0);
             ui->codeBrowser->setFocus();
+
+            progress.setValue(4);
         }
     }
 }
 
 // Disassemble
 void MainWindow::on_actionOpen_triggered()
 {
-    // Setup loading message dialog
-    QDialog* dialog = new QDialog(this, Qt::FramelessWindowHint);
-    Ui_Dialog loadingDialogUi;
-    loadingDialogUi.setupUi(dialog);
-    dialog->show();
-
     // Prompt user for file
     QString file = QFileDialog::getOpenFileName(this, tr("Open File"), files.getCurrentDirectory(), tr("All (*)"));
 
-    // Set and display loading message
-    loadingDialogUi.label->setText("Disassembling binary...");
-    qApp->processEvents();
-
     // Update current directory and load file
     if (file != ""){
         files.setCurrentDirectory(file);
         loadBinary(file);
     }
-    // Delete loading dialog
-    delete dialog;
+
 }
 
 /*

diff --git a/src/objdumper.cpp b/src/objdumper.cpp
@@ -57,7 +57,7 @@ QString ObjDumper::getDump(QString args, QString file){
 }
 
 // Parses disassembly and populates function list
-FunctionList ObjDumper::getFunctionList(QString file, QVector<QString> baseOffsets){
+extern FunctionList ObjDumper::getFunctionList(QString file, QVector<QString> baseOffsets){
    FunctionList functionList;
    QString dump = getDisassembly(file);