From c37ea37404af59be99598311436994bb52fbcbe1 Mon Sep 17 00:00:00 2001 From: "justforlxz.com" Date: Fri, 28 Jun 2019 16:58:31 +0800 Subject: [PATCH] refactor: plugin init is done in other threads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 加载插件是按队列进行的，但是插件初始化是不需要按队列来的 --- frame/util/abstractpluginscontroller.cpp | 9 ++++- frame/window/mainwindow.cpp | 2 +- plugins/datetime/datetimeplugin.cpp | 47 +++++++++++++++--------- plugins/tray/trayplugin.cpp | 38 ++++++++++--------- 4 files changed, 57 insertions(+), 39 deletions(-) diff --git a/frame/util/abstractpluginscontroller.cpp b/frame/util/abstractpluginscontroller.cpp index 2c574c14b..2e67f5136 100644 --- a/frame/util/abstractpluginscontroller.cpp +++ b/frame/util/abstractpluginscontroller.cpp @@ -133,7 +133,7 @@ void AbstractPluginsController::startLoader(PluginLoader *loader) QGSettings gsetting("com.deepin.dde.dock", "/com/deepin/dde/dock/"); QTimer::singleShot(gsetting.get("delay-plugins-time").toUInt(), - loader, [=] { loader->start(QThread::NormalPriority); }); + loader, [=] { loader->start(QThread::LowestPriority); }); } void AbstractPluginsController::displayModeChanged() @@ -205,7 +205,12 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile) return; } - initPlugin(interface); + // NOTE(justforlxz): 插件的所有初始化工作都在init函数中进行， + // loadPlugin函数是按队列执行的，initPlugin函数会有可能导致 + // 函数执行被阻塞。 + QTimer::singleShot(1, this, [=] { + initPlugin(interface); + }); } void AbstractPluginsController::initPlugin(PluginsItemInterface *interface) { diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index 79d6b5379..df248c9d5 100644 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -141,7 +141,7 @@ void MainWindow::launch() }); qApp->processEvents(); - QTimer::singleShot(0, this, &MainWindow::show); + QTimer::singleShot(300, this, &MainWindow::show); } bool MainWindow::event(QEvent *e) diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index 7fe4a2d1c..36f0ab09d 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -29,22 +29,8 @@ #define TIME_FORMAT_KEY "24HourFormat" DatetimePlugin::DatetimePlugin(QObject *parent) - : QObject(parent), - - m_dateTipsLabel(new TipsWidget), - - m_refershTimer(new QTimer(this)) + : QObject(parent) { - m_dateTipsLabel->setObjectName("datetime"); - - m_refershTimer->setInterval(1000); - m_refershTimer->start(); - - m_centralWidget = new DatetimeWidget; - - connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); }); - - connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString); } const QString DatetimePlugin::pluginName() const @@ -60,7 +46,6 @@ const QString DatetimePlugin::pluginDisplayName() const void DatetimePlugin::init(PluginProxyInterface *proxyInter) { m_proxyInter = proxyInter; - m_centralWidget->set24HourFormat(m_proxyInter->getValue(this, TIME_FORMAT_KEY, true).toBool()); // transfer config QSettings settings("deepin", "dde-dock-datetime"); @@ -71,8 +56,34 @@ void DatetimePlugin::init(PluginProxyInterface *proxyInter) QFile::remove(settings.fileName()); } - if (!pluginIsDisable()) - m_proxyInter->itemAdded(this, pluginName()); + if (pluginIsDisable()) { + return; + } + + m_dateTipsLabel = new TipsWidget; + m_refershTimer = new QTimer(this); + m_dateTipsLabel->setObjectName("datetime"); + + m_refershTimer->setInterval(1000); + m_refershTimer->start(); + + m_centralWidget = new DatetimeWidget; + m_dateTipsLabel = new TipsWidget; + m_refershTimer = new QTimer(this); + m_dateTipsLabel->setObjectName("datetime"); + + m_refershTimer->setInterval(1000); + m_refershTimer->start(); + + m_centralWidget = new DatetimeWidget; + + connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); }); + + connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString); + connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); }); + + connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString); + m_proxyInter->itemAdded(this, pluginName()); } void DatetimePlugin::pluginStateSwitched() diff --git a/plugins/tray/trayplugin.cpp b/plugins/tray/trayplugin.cpp index 2767e931f..75153aca6 100644 --- a/plugins/tray/trayplugin.cpp +++ b/plugins/tray/trayplugin.cpp @@ -41,24 +41,8 @@ using org::kde::StatusNotifierWatcher; TrayPlugin::TrayPlugin(QObject *parent) - : QObject(parent), - m_trayInter(new DBusTrayManager(this)), - m_sniWatcher(new StatusNotifierWatcher(SNI_WATCHER_SERVICE, SNI_WATCHER_PATH, QDBusConnection::sessionBus(), this)), - m_fashionItem (new FashionTrayItem(this)), - m_systemTraysController(new SystemTraysController(this)), - m_refreshXEmbedItemsTimer(new QTimer(this)), - m_refreshSNIItemsTimer(new QTimer(this)), - m_tipsLabel(new TipsWidget) + : QObject(parent) { - m_refreshXEmbedItemsTimer->setInterval(0); - m_refreshXEmbedItemsTimer->setSingleShot(true); - - m_refreshSNIItemsTimer->setInterval(0); - m_refreshSNIItemsTimer->setSingleShot(true); - - m_tipsLabel->setObjectName("tray"); - m_tipsLabel->setText(tr("System Tray")); - m_tipsLabel->setVisible(false); } const QString TrayPlugin::pluginName() const @@ -83,8 +67,26 @@ void TrayPlugin::init(PluginProxyInterface *proxyInter) return; } + m_trayInter = new DBusTrayManager(this); + m_sniWatcher = new StatusNotifierWatcher(SNI_WATCHER_SERVICE, SNI_WATCHER_PATH, QDBusConnection::sessionBus(), this); + m_fashionItem = new FashionTrayItem(this); + m_systemTraysController = new SystemTraysController(this); + m_refreshXEmbedItemsTimer = new QTimer(this); + m_refreshSNIItemsTimer = new QTimer(this); + m_tipsLabel = new TipsWidget; + + m_refreshXEmbedItemsTimer->setInterval(0); + m_refreshXEmbedItemsTimer->setSingleShot(true); + + m_refreshSNIItemsTimer->setInterval(0); + m_refreshSNIItemsTimer->setSingleShot(true); + + m_tipsLabel->setObjectName("tray"); + m_tipsLabel->setText(tr("System Tray")); + m_tipsLabel->setVisible(false); + connect(m_systemTraysController, &SystemTraysController::pluginItemAdded, this, &TrayPlugin::addTrayWidget); - connect(m_systemTraysController, &SystemTraysController::pluginItemRemoved, this, [=](const QString &itemKey) {trayRemoved(itemKey);}); + connect(m_systemTraysController, &SystemTraysController::pluginItemRemoved, this, [=](const QString &itemKey) { trayRemoved(itemKey); }); m_trayInter->Manage();