arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-12 05:15:49 +00:00
Code Issues Projects Releases Wiki Activity

drop code oriented on the stream lock in parallel updates

Browse Source 
This fact caused by the qt signal-slot implementation. Even if slots
code is going into parallel they will be called in the main app thread.
And also it is used inside KF5 dataengine implementation, so I'm affraid
that it could not be optimized w\o backend rewriting
This commit is contained in:
arcan1s
2015-10-13 01:49:12 +03:00
parent d3ab0a7228
commit 3be733a775
5 changed files with 16 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sources/awesome-widget/plugin/awdataengineaggregator.cpp
View File

@ -19,8 +19,6 @@
#include <Plasma/DataEngineConsumer>
#include <QTimer>
#include "awdebug.h"
#include "awkeys.h"
@ -30,16 +28,8 @@ AWDataEngineAggregator::AWDataEngineAggregator(QObject *parent, const int interv
{
qCDebug(LOG_AW);
// timer events
m_timer = new QTimer(this);
m_timer->setSingleShot(true);
setInterval(interval);
initDataEngines();
connectVisualization();
connect(this, SIGNAL(startTimer()), m_timer, SLOT(start()));
connect(m_timer, SIGNAL(timeout()), this, SLOT(connectVisualization()));
}
@ -48,7 +38,6 @@ AWDataEngineAggregator::~AWDataEngineAggregator()
qCDebug(LOG_AW);
m_dataEngines.clear();
if (m_timer != nullptr) delete m_timer;
}
@ -58,33 +47,6 @@ void AWDataEngineAggregator::setInterval(const int _interval)
qCDebug(LOG_AW) << "Interval" << _interval;
m_interval = _interval;
m_timer->setInterval(5 * _interval);
}
void AWDataEngineAggregator::connectVisualization()
{
qCDebug(LOG_AW);
// reconnectSources();
connect(this, SIGNAL(updateData(QString, QVariant, QString )),
parent(), SLOT(dataUpdated(QString, QVariant, QString)));
return static_cast<AWKeys *>(parent())->unlock();
}
void AWDataEngineAggregator::disconnectVisualization()
{
qCDebug(LOG_AW);
disconnect(this, SIGNAL(updateData(QString, QVariant, QString)),
parent(), SLOT(dataUpdated(QString, QVariant, QString)));
// m_dataEngines.clear();
// HACK run timer in the main thread since a timer could not be started from
// the different thread
return emit(startTimer());
}
@ -119,8 +81,9 @@ void AWDataEngineAggregator::dataUpdated(const QString sourceName, const Plasma:
// HACK "deep copy" of data to avoid plasma crash on Data object destruction
QString units = data[QString("units")].toString();
// HACK workaround for time values which are stored in the different path
QVariant value = sourceName == QString("Local") ? data[QString("DateTime")]
: data[QString("value")];
QVariant value = sourceName == QString("Local")
? data[QString("DateTime")]
: data[QString("value")];
emit(updateData(sourceName, value, units));
}
@ -141,4 +104,7 @@ void AWDataEngineAggregator::initDataEngines()
static_cast<AWKeys *>(parent())->addDevice(source);
m_dataEngines[QString("systemmonitor")]->connectSource(source, this, m_interval);
});
connect(this, SIGNAL(updateData(QString, QVariant, QString)),
parent(), SLOT(dataUpdated(QString, QVariant, QString)));
}