flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #467 Refactored CLogPatternHandler garbage collection by hooking into QObject::disconnectNotify.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-17 21:57:58 +01:00
parent eb6a638099
commit 6d5e3b5897
2 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/blackmisc/loghandler.h
View File

@@ -20,6 +20,8 @@
#include <QPointer>
#include <QThread>
#include <QMetaMethod>
#include <QTimer>
#include <atomic>
namespace BlackMisc
{
@@ -79,14 +81,15 @@ namespace BlackMisc
void enableConsoleOutput(bool enable);
private:
friend class CLogPatternHandler;
void logMessage(const BlackMisc::CStatusMessage &message);
void collectGarbage();
QtMessageHandler m_oldHandler = nullptr;
bool m_enableFallThrough = true;
bool isFallThroughEnabled(const QList<CLogPatternHandler *> &handlers) const;
using PatternPair = std::pair<CLogPattern, CLogPatternHandler *>;
QList<PatternPair> m_patternHandlers;
QList<CLogPatternHandler *> handlersForMessage(const CStatusMessage &message) const;
void removePatternHandler(CLogPatternHandler *);
};
/*!
@@ -110,6 +113,7 @@ namespace BlackMisc
Q_ASSERT(thread() == QThread::currentThread());
m_inheritFallThrough = false;
m_enableFallThrough = enable;
m_subscriptionNeedsUpdate = true;
}
/*!
@@ -123,6 +127,7 @@ namespace BlackMisc
{
Q_ASSERT(thread() == QThread::currentThread());
m_inheritFallThrough = true;
m_subscriptionNeedsUpdate = true;
}
signals:
@@ -158,18 +163,28 @@ namespace BlackMisc
return connect(this, &CLogPatternHandler::messageLogged, slot);
}
protected:
//! \copydoc QObject::connectNotify
virtual void connectNotify(const QMetaMethod &signal) override
{
if (signal == QMetaMethod::fromSignal(&CLogPatternHandler::messageLogged)) { m_subscriptionNeedsUpdate = true; }
}
//! \copydoc QObject::disconnectNotify
virtual void disconnectNotify(const QMetaMethod &signal) override
{
if (signal == QMetaMethod::fromSignal(&CLogPatternHandler::messageLogged)) { m_subscriptionNeedsUpdate = true; }
}
private:
friend class CLogHandler;
CLogPatternHandler(QObject *parent) : QObject(parent) {}
CLogPatternHandler(CLogHandler *parent);
CLogHandler *m_parent = nullptr;
bool m_inheritFallThrough = true;
bool m_enableFallThrough = true;
bool canBeDeleted()
{
if (! m_inheritFallThrough) { return false; }
static const auto signal = QMetaMethod::fromSignal(&CLogPatternHandler::messageLogged);
return ! isSignalConnected(signal);
}
std::atomic<bool> m_subscriptionNeedsUpdate = false;
QTimer m_subscriptionUpdateTimer;
void updateSubscription();
};
/*!