GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1267:f8134d25db94

unthread the catalogue controller

trabillard -

r1267:f8134d25db94

parent child

Context file:

r1267:f8134d25db94

app/src/Main.cpp +3 -1

             #endif
                 Q_INIT_RESOURCE(sqpguiresources);
-                SqpApplication a{argc, argv};
                 SqpApplication::setOrganizationName("LPP");
                 SqpApplication::setOrganizationDomain("lpp.fr");
                 SqpApplication::setApplicationName("SciQLop");
+                SqpApplication a{argc, argv};
                 MainWindow w;
                 w.show();

core/include/Catalogue/CatalogueController.h 0 -3

             public slots:
                 /// Manage init/end of the controller
                 void initialize();
-                void finalize();
             private:
-                void waitForFinish();
                 class CatalogueControllerPrivate;
                 spimpl::unique_impl_ptr<CatalogueControllerPrivate> impl;
             };

core/src/Catalogue/CatalogueController.cpp +5 -12

             public:
                 explicit CatalogueControllerPrivate(CatalogueController *parent) : m_Q{parent} {}
-                QMutex m_WorkingMutex;
                 CatalogueDao m_CatalogueDao;
                 QStringList m_RepositoryList;
             {
                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController destruction")
                                                    << QThread::currentThread();
-                this->waitForFinish();
             }
             QStringList CatalogueController::getRepositories() const
             void CatalogueController::initialize()
             {
+            <<<<<<< HEAD
                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController init")
                                                    << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
+            =======
+                qCDebug(LOG_CatalogueController())
+                    << tr("CatalogueController init") << QThread::currentThread();
+            >>>>>>> 286decc... unthread the catalogue controller
                 impl->m_CatalogueDao.initialize();
                 auto defaultRepositoryLocation
                     = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController init END");
             }
-            void CatalogueController::finalize()
-                impl->m_WorkingMutex.unlock();
-            void CatalogueController::waitForFinish()
-                QMutexLocker locker{&impl->m_WorkingMutex};
             void CatalogueController::CatalogueControllerPrivate::copyDBtoDB(const QString &dbFrom,
                                                                              const QString &dbTo)
             {

gui/src/SqpApplication.cpp +1 -13

                     m_VariableControllerThread.setObjectName("VariableControllerThread");
                     m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
                     m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
-                    m_CatalogueController->moveToThread(&m_CatalogueControllerThread);
-                    m_CatalogueControllerThread.setObjectName("CatalogueControllerThread");
                     // Additionnal init
                     m_VariableController->setTimeController(m_TimeController.get());
                     m_VisualizationControllerThread.quit();
                     m_VisualizationControllerThread.wait();
-                    m_CatalogueControllerThread.quit();
-                    m_CatalogueControllerThread.wait();
                 }
                 std::unique_ptr<DataSourceController> m_DataSourceController;
                 QThread m_NetworkControllerThread;
                 QThread m_VariableControllerThread;
                 QThread m_VisualizationControllerThread;
-                QThread m_CatalogueControllerThread;
                 std::unique_ptr<DragDropGuiController> m_DragDropGuiController;
                 std::unique_ptr<ActionsGuiController> m_ActionsGuiController;
                 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
                         impl->m_VisualizationController.get(), &VisualizationController::finalize);
-                connect(&impl->m_CatalogueControllerThread, &QThread::started,
-                        impl->m_CatalogueController.get(), &CatalogueController::initialize);
-                connect(&impl->m_CatalogueControllerThread, &QThread::finished,
-                        impl->m_CatalogueController.get(), &CatalogueController::finalize);
                 impl->m_DataSourceControllerThread.start();
                 impl->m_NetworkControllerThread.start();
                 impl->m_VariableControllerThread.start();
                 impl->m_VisualizationControllerThread.start();
-                impl->m_CatalogueControllerThread.start();
+                impl->m_CatalogueController->initialize();
             }
             SqpApplication::~SqpApplication()

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages