mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-01 13:36:48 +08:00
refs #380, use CWorker instead of QConcurrent for threaded reader (bookings/VATSIM file)
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
#include <QDateTime>
|
||||
#include <QTimer>
|
||||
#include <QNetworkReply>
|
||||
#include <QFuture>
|
||||
#include <QCoreApplication>
|
||||
|
||||
namespace BlackMisc
|
||||
@@ -25,102 +24,55 @@ namespace BlackMisc
|
||||
/*!
|
||||
* Support for threaded based reading and parsing tasks such
|
||||
* as data files via http, or file system and parsing (such as FSX models)
|
||||
*
|
||||
* \remarks Header only class to avoid forward instantiations across subprojects
|
||||
*/
|
||||
template <class FutureRet = void> class CThreadedReader : public CContinuousWorker
|
||||
class CThreadedReader : public CContinuousWorker
|
||||
{
|
||||
public:
|
||||
//! Thread safe, set update timestamp
|
||||
//! \threadsafe
|
||||
QDateTime getUpdateTimestamp() const
|
||||
{
|
||||
QReadLocker(&this->m_lock);
|
||||
return this->m_updateTimestamp;
|
||||
}
|
||||
QDateTime getUpdateTimestamp() const;
|
||||
|
||||
//! Thread safe, set update timestamp
|
||||
//! \threadsafe
|
||||
void setUpdateTimestamp(const QDateTime &updateTimestamp)
|
||||
{
|
||||
QWriteLocker(&this->m_lock);
|
||||
this->m_updateTimestamp = updateTimestamp;
|
||||
}
|
||||
void setUpdateTimestamp(const QDateTime &updateTimestamp);
|
||||
|
||||
//! Request to stop
|
||||
//! \threadsafe
|
||||
void requestStop();
|
||||
|
||||
//! Destructor
|
||||
virtual ~CThreadedReader();
|
||||
|
||||
//! \copydoc CContinuousWorker::cleanup
|
||||
virtual void cleanup() override
|
||||
{
|
||||
// shutdown pending
|
||||
QWriteLocker(&this->m_lock);
|
||||
if (this->m_pendingFuture.isRunning())
|
||||
{
|
||||
// cancel does not work with all futures, especially not with QConcurrent::run
|
||||
// the stop flag should the job
|
||||
// but I will cancel anyway
|
||||
this->m_pendingFuture.cancel();
|
||||
}
|
||||
if (this->m_pendingNetworkReply && this->m_pendingNetworkReply->isRunning())
|
||||
{
|
||||
this->m_pendingNetworkReply->abort();
|
||||
}
|
||||
virtual void cleanup() override;
|
||||
|
||||
// cancel or stop flag above should terminate QFuture
|
||||
this->m_pendingFuture.waitForFinished();
|
||||
}
|
||||
//! Thread ended of stop requested
|
||||
virtual bool isFinished() const override;
|
||||
|
||||
/*!
|
||||
* Set the update time
|
||||
* \param updatePeriodMs <=0 stops the timer
|
||||
* \threadsafe
|
||||
*/
|
||||
void setInterval(int updatePeriodMs)
|
||||
{
|
||||
Q_ASSERT(this->m_updateTimer);
|
||||
QWriteLocker(&this->m_lock);
|
||||
if (updatePeriodMs < 1)
|
||||
this->m_updateTimer->stop();
|
||||
else
|
||||
this->m_updateTimer->start(updatePeriodMs);
|
||||
}
|
||||
void setInterval(int updatePeriodMs);
|
||||
|
||||
//! Get the timer interval (ms)
|
||||
//! \threadsafe
|
||||
int interval() const
|
||||
{
|
||||
QReadLocker rl(&this->m_lock);
|
||||
return this->m_updateTimer->interval();
|
||||
}
|
||||
int interval() const;
|
||||
|
||||
protected:
|
||||
//! Constructor
|
||||
CThreadedReader(QObject *owner) : CContinuousWorker(owner),
|
||||
m_updateTimer(new QTimer(this)), m_lock(QReadWriteLock::Recursive)
|
||||
{
|
||||
}
|
||||
CThreadedReader(QObject *owner, const QString &name);
|
||||
|
||||
//! Has pending network replay
|
||||
//! \threadsafe
|
||||
void setPendingNetworkReply(QNetworkReply *reply)
|
||||
{
|
||||
QWriteLocker(&this->m_lock);
|
||||
this->m_pendingNetworkReply = reply;
|
||||
}
|
||||
QTimer *m_updateTimer = nullptr; //!< update timer
|
||||
mutable QReadWriteLock m_lock {QReadWriteLock::Recursive}; //!< lock
|
||||
|
||||
//! Has pending operation
|
||||
//! \threadsafe
|
||||
void setPendingFuture(QFuture<FutureRet> future)
|
||||
{
|
||||
QWriteLocker(&this->m_lock);
|
||||
this->m_pendingFuture = future;
|
||||
}
|
||||
|
||||
QTimer *m_updateTimer = nullptr; //!< update timer
|
||||
mutable QReadWriteLock m_lock; //!< lock
|
||||
//! Make sure everthing runs correctly in own thread
|
||||
void threadAssertCheck() const;
|
||||
|
||||
private:
|
||||
QDateTime m_updateTimestamp; //!< when was file / resource read
|
||||
QFuture<FutureRet> m_pendingFuture; //!< optional future to be stopped
|
||||
QNetworkReply *m_pendingNetworkReply = nullptr; //!< optional network reply to be stopped
|
||||
QDateTime m_updateTimestamp; //!< when was file / resource read
|
||||
bool m_stopped = false; //!< optional network reply to be stopped
|
||||
};
|
||||
} // namespace
|
||||
|
||||
|
||||
Reference in New Issue
Block a user