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

refs #338 Fixed reentrancy of CLogHandler garbage collection.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-10-21 01:24:41 +01:00
parent f2412483a0
commit b12562ec5f
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/loghandler.cpp
View File

@@ -51,11 +51,6 @@ namespace BlackMisc
{
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];
@@ -111,6 +106,8 @@ namespace BlackMisc
void CLogHandler::logMessage(const CStatusMessage &statusMessage)
{
collectGarbage();
auto handlers = handlersForCategories(statusMessage.getCategories());
if (isFallThroughEnabled(handlers))
@@ -128,4 +125,14 @@ namespace BlackMisc
}
}
void CLogHandler::collectGarbage()
{
auto newEnd = std::stable_partition(m_patternHandlers.begin(), m_patternHandlers.end(), [](const PatternPair &pair)
{
return ! pair.second->canBeDeleted();
});
std::for_each(newEnd, m_patternHandlers.end(), [](const PatternPair &pair) { pair.second->deleteLater(); });
m_patternHandlers.erase(newEnd, m_patternHandlers.end());
}
}

24
src/blackmisc/loghandler.h
View File

@@ -64,6 +64,7 @@ namespace BlackMisc
private:
void logMessage(const BlackMisc::CStatusMessage &message);
void collectGarbage();
QtMessageHandler m_oldHandler = nullptr;
bool m_enableFallThrough = true;
bool isFallThroughEnabled(const QList<CLogCategoryHandler *> &handlers) const;
@@ -90,7 +91,7 @@ namespace BlackMisc
/*!
* 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.
* When all slots are disconnected from this signal, the CLogCategoryHandler could be deleted.
*
* Note that if a message matches more that one category handler, then this signal will be emitted for all of them,
* so if a slot is connected to all of them then it will be called multiple times. Use the methods
@@ -100,25 +101,16 @@ namespace BlackMisc
*/
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:
friend class CLogHandler;
CLogCategoryHandler(QObject *parent, bool enableFallThrough) : QObject(parent), m_enableFallThrough(enableFallThrough) {}
bool m_enableFallThrough;
bool canBeDeleted()
{
static const auto signal = QMetaMethod::fromSignal(&CLogPatternHandler::messageLogged);
return ! isSignalConnected(signal);
}
};
}