- Reverted a previous commit. Transfer lists refreshers aren't in separate threads anymore: too buggy

Changelog

@@ -41,7 +41,6 @@
     - BUGFIX: search plugin update - do not display only last version changelog
     - BUGFIX: Search plugin update - fixed missing new lines in changelog
     - BUGFIX: The number of search results was not reset when clicking on 'Clear' button
-    - BUGFIX: Transfers lists refreshers were moved to separate threads
     - COSMETIC: Redesigned torrent properties a little
     - COSMETIC: Redesigned options a little
     - COSMETIC: Display more logs messages concerning features

src/FinishedTorrents.cpp

@@ -29,7 +29,6 @@
 #include <QSettings>
 #include <QStandardItemModel>
 #include <QHeaderView>
-#include <QMutexLocker>
 
 FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession){
   setupUi(this);
@@ -51,7 +50,6 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession){
     finishedList->header()->resizeSection(0, 200);
   }
   // Make download list header clickable for sorting
-  qRegisterMetaType<QModelIndex>("QModelIndex");
   finishedList->header()->setClickable(true);
   finishedList->header()->setSortIndicatorShown(true);
   connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortFinishedList(int)));
@@ -68,15 +66,12 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession){
   connect(actionPreview_file, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPreview_file_triggered()));
   connect(actionDelete_Permanently, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_Permanently_triggered()));
   connect(actionTorrent_Properties, SIGNAL(triggered()), this, SLOT(propertiesSelection()));
-  refresher = new FinishedListRefresher(this);
-  refresher->start();
 }
 
 FinishedTorrents::~FinishedTorrents(){
   saveColWidthFinishedList();
   delete finishedListDelegate;
   delete finishedListModel;
-  delete refresher;
 }
 
 void FinishedTorrents::addFinishedSHA(QString hash){
@@ -84,7 +79,6 @@ void FinishedTorrents::addFinishedSHA(QString hash){
     BTSession->setTorrentFinishedChecking(hash);
   }
   if(finishedSHAs.indexOf(hash) == -1) {
-    QMutexLocker locker(&finishedListAccess);
     finishedSHAs << hash;
     int row = finishedListModel->rowCount();
     torrent_handle h = BTSession->getTorrentHandle(hash);
@@ -173,8 +167,6 @@ void FinishedTorrents::on_actionSet_upload_limit_triggered(){
 
 void FinishedTorrents::updateFinishedList(){
 //   qDebug("Updating finished list");
-  if(((GUI*)parent)->getCurrentTab() != 1) return;
-  QMutexLocker locker(&finishedListAccess);
   QString hash;
   foreach(hash, finishedSHAs){
     torrent_handle h = BTSession->getTorrentHandle(hash);
@@ -220,7 +212,6 @@ int FinishedTorrents::getRowFromHash(QString hash) const{
 
 // Will move it to download tab
 void FinishedTorrents::deleteFromFinishedList(QString hash){
-  QMutexLocker locker(&finishedListAccess);
   int row = getRowFromHash(hash);
   if(row == -1){
     std::cerr << "Error: couldn't find hash in finished list\n";
@@ -254,7 +245,6 @@ void FinishedTorrents::showProperties(const QModelIndex &index){
 }
 
 void FinishedTorrents::updateFileSize(QString hash){
-  QMutexLocker locker(&finishedListAccess);
   int row = getRowFromHash(hash);
   finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)BTSession->torrentEffectiveSize(hash)));
 }
@@ -303,7 +293,6 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
  */
 
 void FinishedTorrents::sortFinishedList(int index){
-  QMutexLocker locker(&finishedListAccess);
   static Qt::SortOrder sortOrder = Qt::AscendingOrder;
   if(finishedList->header()->sortIndicatorSection() == index){
     if(sortOrder == Qt::AscendingOrder){

src/FinishedTorrents.h

@@ -26,13 +26,9 @@
 #include "FinishedListDelegate.h"
 #include <libtorrent/torrent_handle.hpp>
 
-#include <QThread>
-#include <QMutex>
-
 class QStandardItemModel;
 class bittorrent;
 class FinishedListDelegate;
-class FinishedListRefresher;
 
 using namespace libtorrent;
 
@@ -45,8 +41,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding{
     QStringList finishedSHAs;
     QStandardItemModel *finishedListModel;
     unsigned int nbFinished;
-    FinishedListRefresher *refresher;
-    QMutex finishedListAccess;
 
   public:
     FinishedTorrents(QObject *parent, bittorrent *BTSession);
@@ -80,27 +74,4 @@ class FinishedTorrents : public QWidget, public Ui::seeding{
 
 };
 
-class FinishedListRefresher : public QThread {
-  private:
-    FinishedTorrents* parent;
-    bool abort;
-  public:
-    FinishedListRefresher(FinishedTorrents* parent){
-      this->parent = parent;
-      abort = false;
-    }
-    ~FinishedListRefresher(){
-      abort = true;
-      wait();
-    }
-  protected:
-    void run(){
-      forever{
-        if(abort) return;
-        parent->updateFinishedList();
-        msleep(2000);
-      }
-    }
-};
-
 #endif

src/GUI.cpp

@@ -29,7 +29,6 @@
 #include <QCloseEvent>
 #include <QShortcut>
 #include <QStandardItemModel>
-#include <QMutexLocker>
 
 #include "GUI.h"
 #include "misc.h"
@@ -180,6 +179,10 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
   connect(downloadList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayDLListMenu(const QPoint&)));
 //   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayGUIMenu(const QPoint&)));
   connect(infoBar, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayInfoBarMenu(const QPoint&)));
+  // Start download list refresher
+  refresher = new QTimer(this);
+  connect(refresher, SIGNAL(timeout()), this, SLOT(updateDlList()));
+  refresher->start(2000);
   // Use a tcp server to allow only one instance of qBittorrent
   tcpServer = new QTcpServer();
   if (!tcpServer->listen(QHostAddress::LocalHost, 1666)) {
@@ -192,9 +195,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
   checkConnect->start(5000);
   previewProcess = new QProcess(this);
   connect(previewProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(cleanTempPreviewFile(int, QProcess::ExitStatus)));
-  // Download list refresher thread
-  refresher = new DownloadListRefresher(this);
-  refresher->start();
   // Accept drag 'n drops
   setAcceptDrops(true);
   // Set info Bar infos
@@ -231,14 +231,6 @@ GUI::~GUI(){
   delete switchRSSShortcut;
 }
 
-int GUI::getCurrentTab() const{
-  if(isHidden() || isMinimized()){
-    return -1;
-  }else{
-    return tabs->currentIndex();
-  }
-}
-
 void GUI::on_actionWebsite_triggered(){
    QDesktopServices::openUrl(QUrl("http://www.qbittorrent.org"));
 }
@@ -562,14 +554,17 @@ void GUI::updateDlList(bool force){
   if(systrayIntegration){
     myTrayIcon->setToolTip("<b>"+tr("qBittorrent")+"</b><br>"+tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(QString(tmp2))+"<br>"+tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(QString(tmp))); // tray icon
   }
-  if( !force && getCurrentTab()){
+  if( !force && (isMinimized() || isHidden() || tabs->currentIndex() > 1)){
     // No need to update if qBittorrent DL list is hidden
     return;
   }
+  if(tabs->currentIndex()){
+    finishedTorrentTab->updateFinishedList();
+    return;
+  }
 //   qDebug("Updating download list");
   LCD_UpSpeed->display(tmp); // UP LCD
   LCD_DownSpeed->display(tmp2); // DL LCD
-  QMutexLocker locker(&DLListAccess);
   // browse handles
   std::vector<torrent_handle> handles = BTSession->getTorrentHandles();
   QStringList finishedSHAs = finishedTorrentTab->getFinishedSHAs();
@@ -612,9 +607,7 @@ void GUI::updateDlList(bool force){
         case torrent_status::finished:
         case torrent_status::seeding:
           qDebug("Warning: this shouldn't happen, no finished torrents in download tab, moving it");
-          DLListAccess.unlock();
           finishedTorrent(h);
-          DLListAccess.lock();
           continue;
         case torrent_status::checking_files:
         case torrent_status::queued_for_checking:
@@ -665,7 +658,6 @@ void GUI::updateDlList(bool force){
 }
 
 void GUI::restoreInDownloadList(torrent_handle h){
-  QMutexLocker locker(&DLListAccess);
   unsigned int row = DLListModel->rowCount();
   QString hash = QString(misc::toString(h.info_hash()).c_str());
   // Adding torrent to download list
@@ -740,7 +732,6 @@ void GUI::sortDownloadListString(int index, Qt::SortOrder sortOrder){
 
 void GUI::sortDownloadList(int index, Qt::SortOrder startSortOrder, bool fromLoadColWidth){
   qDebug("Called sort download list");
-  QMutexLocker locker(&DLListAccess);
   static Qt::SortOrder sortOrder = startSortOrder;
   if(!fromLoadColWidth && downloadList->header()->sortIndicatorSection() == index){
     if(sortOrder == Qt::AscendingOrder){
@@ -996,7 +987,6 @@ void GUI::on_actionOpen_triggered(){
 // delete from download list AND from hard drive
 void GUI::on_actionDelete_Permanently_triggered(){
   if(tabs->currentIndex() > 1) return;
-  QMutexLocker locker(&DLListAccess);
   QModelIndexList selectedIndexes;
   bool inDownloadList;
   if(tabs->currentIndex() == 0) {
@@ -1068,7 +1058,6 @@ void GUI::on_actionDelete_Permanently_triggered(){
 
 // delete selected items in the list
 void GUI::on_actionDelete_triggered(){
-  QMutexLocker locker(&DLListAccess);
   if(tabs->currentIndex() > 1) return;
   QModelIndexList selectedIndexes;
   bool inDownloadList = true;
@@ -1140,7 +1129,6 @@ void GUI::on_actionDelete_triggered(){
 
 // Called when a torrent is added
 void GUI::torrentAdded(QString path, torrent_handle& h, bool fastResume){
-  QMutexLocker locker(&DLListAccess);
   QString hash = QString(misc::toString(h.info_hash()).c_str());
   if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".finished")){
     finishedTorrentTab->addFinishedSHA(hash);
@@ -1383,7 +1371,6 @@ void GUI::configureSession(bool deleteOptions){
 
 // Pause All Downloads in DL list
 void GUI::on_actionPause_All_triggered(){
-  QMutexLocker locker(&DLListAccess);
   QString fileHash;
   // Pause all torrents
   if(BTSession->pauseAllTorrents()){
@@ -1409,7 +1396,6 @@ void GUI::on_actionPause_All_triggered(){
 
 // pause selected items in the list
 void GUI::on_actionPause_triggered(){
-  QMutexLocker locker(&DLListAccess);
   QModelIndexList selectedIndexes = downloadList->selectionModel()->selectedIndexes();
   QModelIndex index;
   foreach(index, selectedIndexes){
@@ -1435,7 +1421,6 @@ void GUI::on_actionPause_triggered(){
 
 // Resume All Downloads in DL list
 void GUI::on_actionStart_All_triggered(){
-  QMutexLocker locker(&DLListAccess);
   QString fileHash;
   // Pause all torrents
   if(BTSession->resumeAllTorrents()){
@@ -1455,7 +1440,6 @@ void GUI::on_actionStart_All_triggered(){
 
 // start selected items in the list
 void GUI::on_actionStart_triggered(){
-  QMutexLocker locker(&DLListAccess);
   QModelIndexList selectedIndexes = downloadList->selectionModel()->selectedIndexes();
   QModelIndex index;
   foreach(index, selectedIndexes){
@@ -1502,7 +1486,6 @@ void GUI::on_actionTorrent_Properties_triggered(){
 
 // called when a torrent has finished
 void GUI::finishedTorrent(torrent_handle& h){
-    QMutexLocker locker(&DLListAccess);
     QSettings settings("qBittorrent", "qBittorrent");
     QString fileName = QString(h.name().c_str());
     int useOSD = settings.value("Options/OSDEnabled", 1).toInt();

src/GUI.h

@@ -23,9 +23,7 @@
 #define GUI_H
 
 #include <QProcess>
-#include <QThread>
 #include <QSystemTrayIcon>
-#include <QMutex>
 #include <libtorrent/torrent_handle.hpp>
 
 #include "ui_MainWindow.h"
@@ -47,7 +45,6 @@ class about;
 class previewSelect;
 class options_imp;
 class QStandardItemModel;
-class DownloadListRefresher;
 
 using namespace libtorrent;
 namespace fs = boost::filesystem;
@@ -67,6 +64,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     // GUI related
     options_imp *options;
     createtorrent *createWindow;
+    QTimer *refresher;
     QSystemTrayIcon *myTrayIcon;
     QMenu *myTrayIconMenu;
     about *aboutdlg;
@@ -79,8 +77,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     bool force_exit;
     bool delayedSorting;
     Qt::SortOrder delayedSortingOrder;
-    DownloadListRefresher *refresher;
-    QMutex DLListAccess;
     // Keyboard shortcuts
     QShortcut *createShortcut;
     QShortcut *openShortcut;
@@ -115,6 +111,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void toggleVisibility(QSystemTrayIcon::ActivationReason e);
     void on_actionAbout_triggered();
     void setInfoBar(QString info, QString color="black");
+    void updateDlList(bool force=false);
     void on_actionCreate_torrent_triggered();
     void on_actionClearLog_triggered();
     void on_actionWebsite_triggered();
@@ -193,7 +190,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void setTabText(int index, QString text);
     void updateFileSize(QString hash);
     void sortProgressColumnDelayed();
-    void updateDlList(bool force=false);
 
   protected:
     void closeEvent(QCloseEvent *);
@@ -206,30 +202,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     // Methods
     int getRowFromHash(QString hash) const;
     QPoint screenCenter();
-    int getCurrentTab() const;
-};
-
-class DownloadListRefresher : public QThread {
-  private:
-    GUI* parent;
-    bool abort;
-  public:
-    DownloadListRefresher(GUI* parent){
-      this->parent = parent;
-      abort = false;
-    }
-    ~DownloadListRefresher(){
-      abort = true;
-      wait();
-    }
-  protected:
-    void run(){
-      forever{
-        if(abort) return;
-        ((GUI*)parent)->updateDlList();
-        msleep(1500);
-      }
-    }
 };
 
 #endif

src/src.pro

@@ -25,8 +25,8 @@ contains(DEBUG_MODE, 0){
   message(Release build!)
 }
 
-QMAKE_CXXFLAGS_RELEASE += -fwrapv
-QMAKE_CXXFLAGS_DEBUG += -fwrapv
+QMAKE_CXXFLAGS_RELEASE += -fwrapv -O2
+QMAKE_CXXFLAGS_DEBUG += -fwrapv -O2
 
 CONFIG += link_pkgconfig
 PKGCONFIG += libtorrent libccext2 libccgnu2