mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-06 01:45:38 +08:00
Ref T312, fixed thread safety of listeners start/stop/check
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include "blackcore/webdataservices.h"
|
||||
#include "blackcore/application.h"
|
||||
#include "blackmisc/directoryutils.h"
|
||||
#include "blackmisc/threadutils.h"
|
||||
#include "blackmisc/logmessage.h"
|
||||
|
||||
#include <QFlag>
|
||||
@@ -1135,6 +1136,14 @@ namespace BlackCore
|
||||
void ISimulatorListener::start()
|
||||
{
|
||||
if (m_isRunning) { return; }
|
||||
if (!CThreadUtils::isCurrentThreadObjectThread(this))
|
||||
{
|
||||
// call in correct thread
|
||||
QPointer<ISimulatorListener> myself(this);
|
||||
QTimer::singleShot(0, this, [ = ] { if (myself) { this->start(); }});
|
||||
return;
|
||||
}
|
||||
|
||||
m_isRunning = true;
|
||||
this->startImpl();
|
||||
}
|
||||
@@ -1142,13 +1151,29 @@ namespace BlackCore
|
||||
void ISimulatorListener::stop()
|
||||
{
|
||||
if (!m_isRunning) { return; }
|
||||
if (!CThreadUtils::isCurrentThreadObjectThread(this))
|
||||
{
|
||||
// call in correct thread
|
||||
QPointer<ISimulatorListener> myself(this);
|
||||
QTimer::singleShot(0, this, [ = ] { if (myself) { this->stop(); }});
|
||||
return;
|
||||
}
|
||||
|
||||
this->stopImpl();
|
||||
m_isRunning = false;
|
||||
}
|
||||
|
||||
void ISimulatorListener::check()
|
||||
{
|
||||
if (!m_isRunning) { return; }
|
||||
if (m_isRunning) { return; }
|
||||
if (!CThreadUtils::isCurrentThreadObjectThread(this))
|
||||
{
|
||||
// call in correct thread
|
||||
QPointer<ISimulatorListener> myself(this);
|
||||
QTimer::singleShot(0, this, [ = ] { if (myself) { this->check(); }});
|
||||
return;
|
||||
}
|
||||
|
||||
this->checkImpl();
|
||||
}
|
||||
} // namespace
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <QFlags>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <atomic>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
@@ -586,12 +587,15 @@ namespace BlackCore
|
||||
|
||||
public slots:
|
||||
//! Start listening for the simulator to start.
|
||||
//! \threadsafe
|
||||
void start();
|
||||
|
||||
//! Stops listening.
|
||||
//! \threadsafe
|
||||
void stop();
|
||||
|
||||
//! Check simulator availability
|
||||
//! \threadsafe
|
||||
void check();
|
||||
|
||||
signals:
|
||||
@@ -617,7 +621,7 @@ namespace BlackCore
|
||||
|
||||
private:
|
||||
BlackMisc::Simulation::CSimulatorPluginInfo m_info;
|
||||
bool m_isRunning = false;
|
||||
std::atomic_bool m_isRunning { false };
|
||||
};
|
||||
|
||||
//! Factory pattern class to create instances of ISimulator
|
||||
|
||||
Reference in New Issue
Block a user