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

refs #336 Delete CLogCategoryHandler when it is no longer used, and thread safety.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-10-12 20:25:35 +01:00
parent 4549e84e05
commit 09685e8b37
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/loghandler.cpp
View File

@@ -48,9 +48,17 @@ namespace BlackMisc
CLogCategoryHandler *CLogHandler::handlerForCategoryPrefix(const QString &category) CLogCategoryHandler *CLogHandler::handlerForCategoryPrefix(const QString &category)
{ {
Q_ASSERT(thread() == QThread::currentThread());
if (! m_categoryPrefixHandlers.contains(category)) if (! m_categoryPrefixHandlers.contains(category))
{ {
m_categoryPrefixHandlers[category] = new CLogCategoryHandler(this, m_enableFallThrough); m_categoryPrefixHandlers[category] = new CLogCategoryHandler(this, m_enableFallThrough);
connect(m_categoryPrefixHandlers[category], &CLogCategoryHandler::ps_canBeDeleted, [this](CLogCategoryHandler *handler)
{
m_categoryPrefixHandlers.remove(m_categoryPrefixHandlers.key(handler));
QMetaObject::invokeMethod(handler, "deleteLater");
});
} }
return m_categoryPrefixHandlers[category]; return m_categoryPrefixHandlers[category];
@@ -71,6 +79,8 @@ namespace BlackMisc
void CLogHandler::enableConsoleOutput(bool enable) void CLogHandler::enableConsoleOutput(bool enable)
{ {
Q_ASSERT(thread() == QThread::currentThread());
m_enableFallThrough = enable; m_enableFallThrough = enable;
for (auto *handler : m_categoryPrefixHandlers.values()) for (auto *handler : m_categoryPrefixHandlers.values())
{ {

22
src/blackmisc/loghandler.h
View File

@@ -42,9 +42,11 @@ namespace BlackMisc
void install(); void install();
//! Return a category handler for subscribing to all messages with a category starting with the given prefix. //! Return a category handler for subscribing to all messages with a category starting with the given prefix.
//! \warning This must only be called from the main thread.
CLogCategoryHandler *handlerForCategoryPrefix(const QString &prefix); CLogCategoryHandler *handlerForCategoryPrefix(const QString &prefix);
//! Enable or disable the default Qt handler. //! Enable or disable the default Qt handler.
//! \warning This must only be called from the main thread.
void enableConsoleOutput(bool enable); void enableConsoleOutput(bool enable);
signals: signals:
@@ -82,15 +84,33 @@ namespace BlackMisc
/*! /*!
* Enable or disable the default Qt handler for messages in relevant categories. * Enable or disable the default Qt handler for messages in relevant categories.
* This can override the setting of the parent CLogHandler. * This can override the setting of the parent CLogHandler.
* \warning This must only be called from the main thread.
*/ */
void enableConsoleOutput(bool enable) { m_enableFallThrough = enable; } void enableConsoleOutput(bool enable) { Q_ASSERT(thread() == QThread::currentThread()); m_enableFallThrough = enable; }
signals: signals:
/*! /*!
* Emitted when a message is logged in a relevant category. * Emitted when a message is logged in a relevant category.
*
* When all slots are disconnected from this signal, the CLogCategoryHandler is allowed to delete itself.
*/ */
void messageLogged(const CStatusMessage &message); void messageLogged(const CStatusMessage &message);
/*!
* Emitted when there are no more slots connected to the messageLogged signal.
*/
void ps_canBeDeleted(CLogCategoryHandler *handler);
protected:
/*!
* \copydoc QObject::disconnectNotify
*/
virtual void disconnectNotify(const QMetaMethod &) override
{
static const QMetaMethod signal = QMetaMethod::fromSignal(&CLogCategoryHandler::messageLogged);
if (! isSignalConnected(signal)) { emit ps_canBeDeleted(this); }
}
private: private:
friend class CLogHandler; friend class CLogHandler;
CLogCategoryHandler(QObject *parent, bool enableFallThrough) : QObject(parent), m_enableFallThrough(enableFallThrough) {} CLogCategoryHandler(QObject *parent, bool enableFallThrough) : QObject(parent), m_enableFallThrough(enableFallThrough) {}