Developing threaded modbus server

Author: sanny32

omodsim/modbusmultiserver.cpp

@@ -8,16 +8,25 @@
 ModbusMultiServer::ModbusMultiServer(QObject *parent)
     : QObject{parent}
     ,_deviceId(1)
+    ,_workerThread(new QThread(this))
 {
+    moveToThread(_workerThread);
+    _workerThread->start();
+
+    connect(this, &QObject::destroyed, _workerThread, &QThread::quit);
 }
 
 ///
 /// \brief ModbusServer::~ModbusServer
 ///
 ModbusMultiServer::~ModbusMultiServer()
 {
-   for(auto&& s : _modbusServerList)
-       s->disconnectDevice();
+    closeConnections();
+    if(_workerThread && _workerThread->isRunning())
+    {
+       _workerThread->quit();
+       _workerThread->wait();
+    }
 }
 
 ///
@@ -38,6 +47,14 @@ void ModbusMultiServer::setDeviceId(quint8 deviceId)
     if(deviceId == _deviceId)
         return;
 
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this, deviceId]() {
+            setDeviceId(deviceId);
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
     _deviceId = deviceId;
 
     for(auto&& s : _modbusServerList)
@@ -64,7 +81,15 @@ bool ModbusMultiServer::isBusy() const
 ///
 void ModbusMultiServer::setBusy(bool busy)
 {
-     for(auto&& s : _modbusServerList)
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this, busy]() {
+            setBusy(busy);
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
+    for(auto&& s : _modbusServerList)
         s->setValue(QModbusServer::DeviceBusy, busy ? 0xffff : 0x0000);
 }
 
@@ -83,6 +108,14 @@ bool ModbusMultiServer::useGlobalUnitMap() const
 ///
 void ModbusMultiServer::setUseGlobalUnitMap(bool use)
 {
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this, use]() {
+            setUseGlobalUnitMap(use);
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
     _modbusDataUnitMap.setGlobalMap(use);
     reconfigureServers();
 }
@@ -96,6 +129,14 @@ void ModbusMultiServer::setUseGlobalUnitMap(bool use)
 ///
 void ModbusMultiServer::addUnitMap(int id, QModbusDataUnit::RegisterType pointType, quint16 pointAddress, quint16 length)
 {
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this, id, pointType, pointAddress, length]() {
+            addUnitMap(id, pointType, pointAddress, length);
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
     _modbusDataUnitMap.addUnitMap(id, pointType, pointAddress, length);
     reconfigureServers();
 }
@@ -106,6 +147,14 @@ void ModbusMultiServer::addUnitMap(int id, QModbusDataUnit::RegisterType pointTy
 ///
 void ModbusMultiServer::removeUnitMap(int id)
 {
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this, id]() {
+            removeUnitMap(id);
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
     _modbusDataUnitMap.removeUnitMap(id);
     reconfigureServers();
 }
@@ -152,14 +201,24 @@ QSharedPointer<QModbusServer> ModbusMultiServer::findModbusServer(ConnectionType
 ///
 QSharedPointer<QModbusServer> ModbusMultiServer::createModbusServer(const ConnectionDetails& cd)
 {
+    if(QThread::currentThread() != _workerThread)
+    {
+        QSharedPointer<QModbusServer> result;
+        QMetaObject::invokeMethod(this, [&]() {
+            result = createModbusServer(cd);
+        }, Qt::BlockingQueuedConnection);
+
+        return result;
+    }
+
     auto modbusServer = findModbusServer(cd);
     if(modbusServer == nullptr)
     {
         switch(cd.Type)
         {
             case ConnectionType::Tcp:
             {
-                modbusServer = QSharedPointer<QModbusServer>(new ModbusTcpServer(this));
+                modbusServer = QSharedPointer<QModbusServer>(new ModbusTcpServer());
                 modbusServer->setProperty("ConnectionDetails", QVariant::fromValue(cd));
                 modbusServer->setConnectionParameter(QModbusDevice::NetworkPortParameter, cd.TcpParams.ServicePort);
                 modbusServer->setConnectionParameter(QModbusDevice::NetworkAddressParameter, cd.TcpParams.IPAddress);
@@ -217,6 +276,14 @@ QSharedPointer<QModbusServer> ModbusMultiServer::createModbusServer(const Connec
 ///
 void ModbusMultiServer::connectDevice(const ConnectionDetails& cd)
 {
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this, cd]() {
+            connectDevice(cd);
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
     auto modbusServer = findModbusServer(cd);
     if(modbusServer == nullptr)
     {
@@ -243,6 +310,14 @@ void ModbusMultiServer::connectDevice(const ConnectionDetails& cd)
 ///
 void ModbusMultiServer::disconnectDevice(ConnectionType type, const QString& port)
 {
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this, type, port]() {
+            disconnectDevice(type, port);
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
     auto modbusServer = findModbusServer(type, port);
     if(modbusServer != nullptr)
     {
@@ -251,6 +326,23 @@ void ModbusMultiServer::disconnectDevice(ConnectionType type, const QString& por
     }
 }
 
+///
+/// \brief ModbusMultiServer::closeConnections
+///
+void ModbusMultiServer::closeConnections()
+{
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this]() {
+            closeConnections();
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
+    for(auto&& s : _modbusServerList)
+        s->disconnectDevice();
+}
+
 ///
 /// \brief ModbusMultiServer::connections
 /// \return
@@ -291,6 +383,14 @@ void ModbusMultiServer::removeModbusServer(QSharedPointer<QModbusServer> server)
 ///
 void ModbusMultiServer::reconfigureServers()
 {
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this]() {
+            reconfigureServers();
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
     for(auto&& s : _modbusServerList)
         s->setMap(_modbusDataUnitMap);
 }
@@ -347,6 +447,14 @@ QModbusDataUnit ModbusMultiServer::data(QModbusDataUnit::RegisterType pointType,
 ///
 void ModbusMultiServer::setData(const QModbusDataUnit& data)
 {
+    if(QThread::currentThread() != _workerThread)
+    {
+        QMetaObject::invokeMethod(this, [this, data]() {
+            setData(data);
+        }, Qt::BlockingQueuedConnection);
+        return;
+    }
+
     _modbusDataUnitMap.setData(data);
     for(auto&& s : _modbusServerList)
     {

omodsim/modbusmultiserver.h

@@ -2,6 +2,7 @@
 #define MODBUSMULTISERVER_H
 
 #include <QObject>
+#include <QThread>
 #include <QTcpSocket>
 #include <QModbusServer>
 #include <QModbusTcpServer>
@@ -116,6 +117,7 @@ class ModbusMultiServer final : public QObject
 
     void connectDevice(const ConnectionDetails& cd);
     void disconnectDevice(ConnectionType type, const QString& port);
+    void closeConnections();
 
     QList<ConnectionDetails> connections() const;
 
@@ -172,6 +174,7 @@ private slots:
 
 private:
     quint8 _deviceId;
+    QThread* _workerThread;
     ModbusDataUnitMap _modbusDataUnitMap;
     QList<QSharedPointer<QModbusServer>> _modbusServerList;
 };