1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add categorized logging of delete later machinery"

Browse Source 
This reverts commit c3a2b9f35a9a12ff3c6f5f0d11844de161b47c2a.

Unfortunately, some of the log messages happen WAY too late at process
exit time, when QtCore is unloading. In particular, the worst offender
is the one in QThreadPrivate::finish(), which is called after the last
QObject in the thread that called ::exit() was getting destroyed. This
implies we have Static (De)Initialization Order Fiascos happening (the
logging recurses into qlocale.cpp and the defaultLocalePrivate global
static has already been destroyed).

I need to revert this commit in order to fix QThreadData destruction.
The functionality is welcome back in QtCore once the fixes are in, so
long as whoever does it fixes the issues we're seeing in the CI (and I
can't reproduce on my development machine). I've created QTBUG-132429 to
track the reversal and see if the functionality can be brought back in.

Task-number: QTBUG-120124
Task-number: QTBUG-132429
Change-Id: Iecf8f14529c7a2bb2185fffdfd328066098826b1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 357351b7ab8ab2eee865d2449ffcca9c9f502fd3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 60eaa42a2591b0f4fdd1f8352dea2f5002b4eb28)
This commit is contained in:
Thiago Macieira 2024-12-21 11:01:43 -03:00
parent 516ace2e6a
commit 77ec9dc6de
9 changed files with 17 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/corelib/kernel/qcoreapplication.cpp
View File

@ -115,10 +115,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_QOBJECT
Q_LOGGING_CATEGORY(lcDeleteLater, "qt.core.qobject.deletelater")
#endif
using namespace Qt::StringLiterals;
Q_TRACE_PREFIX(qtcore,
@ -1535,8 +1531,6 @@ void QCoreApplicationPrivate::execCleanup()
{
threadData.loadRelaxed()->quitNow = false;
in_exec = false;
qCDebug(lcDeleteLater) << "Sending deferred delete events as part of exec cleanup";
QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
}
@ -1901,37 +1895,16 @@ void QCoreApplicationPrivate::sendPostedEvents(QObject *receiver, int event_type
// events posted by the current event loop; or
// 3) if the event was posted before the outermost event loop.
const auto *event = static_cast<QDeferredDeleteEvent *>(pe.event);
qCDebug(lcDeleteLater) << "Processing deferred delete event for" << pe.receiver
<< "with loop level" << event->loopLevel() << "and scope level" << event->scopeLevel();
qCDebug(lcDeleteLater) << "Checking" << data->thread << "with loop level"
<< data->loopLevel << "and scope level" << data->scopeLevel;
bool allowDeferredDelete = false;
if (event->loopLevel() == 0 && data->loopLevel > 0) {
qCDebug(lcDeleteLater) << "Event was posted outside outermost event loop"
<< "and current thread has an event loop running.";
allowDeferredDelete = true;
} else {
const int totalEventLevel = event->loopLevel() + event->scopeLevel();
const int totalThreadLevel = data->loopLevel + data->scopeLevel;
if (totalEventLevel > totalThreadLevel) {
qCDebug(lcDeleteLater) << "Combined levels of event" << totalEventLevel
<< "is higher than thread" << totalThreadLevel;
allowDeferredDelete = true;
} else if (event_type == QEvent::DeferredDelete && totalEventLevel == totalThreadLevel) {
qCDebug(lcDeleteLater) << "Explicit send of DeferredDelete and"
<< "levels of event" << totalEventLevel
<< "is same as thread" << totalThreadLevel;
allowDeferredDelete = true;
}
}
const int eventLoopLevel = static_cast<QDeferredDeleteEvent *>(pe.event)->loopLevel();
const int eventScopeLevel = static_cast<QDeferredDeleteEvent *>(pe.event)->scopeLevel();
const bool postedBeforeOutermostLoop = eventLoopLevel == 0;
const bool allowDeferredDelete =
(eventLoopLevel + eventScopeLevel > data->loopLevel + data->scopeLevel
|| (postedBeforeOutermostLoop && data->loopLevel > 0)
|| (event_type == QEvent::DeferredDelete
&& eventLoopLevel + eventScopeLevel == data->loopLevel + data->scopeLevel));
if (!allowDeferredDelete) {
qCDebug(lcDeleteLater) << "Failed conditions for deferred delete. Deferring again";
// cannot send deferred delete
if (!event_type && !receiver) {
// we must copy it first; we want to re-post the event
@ -1948,8 +1921,6 @@ void QCoreApplicationPrivate::sendPostedEvents(QObject *receiver, int event_type
data->postEventList.addEvent(pe_copy);
}
continue;
} else {
qCDebug(lcDeleteLater) << "Sending deferred delete to" << pe.receiver;
}
}

5
src/corelib/kernel/qcoreapplication_p.h
View File

@ -25,7 +25,6 @@
#include "QtCore/qsettings.h"
#endif
#ifndef QT_NO_QOBJECT
#include <qloggingcategory.h>
#include "private/qobject_p.h"
#include "private/qlocking_p.h"
#endif
@ -36,10 +35,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_QOBJECT
Q_DECLARE_LOGGING_CATEGORY(lcDeleteLater)
#endif
typedef QList<QTranslator*> QTranslatorList;
class QAbstractEventDispatcher;

9
src/corelib/kernel/qeventloop.cpp
View File

@ -154,9 +154,6 @@ int QEventLoop::exec(ProcessEventsFlags flags)
auto threadData = d->threadData.loadRelaxed();
++threadData->loopLevel;
threadData->eventLoops.push(d->q_func());
qCDebug(lcDeleteLater) << "Increased" << threadData->thread
<< "loop level to" << threadData->loopLevel
<< "with leaf loop now" << threadData->eventLoops.last();
locker.unlock();
}
@ -175,12 +172,6 @@ int QEventLoop::exec(ProcessEventsFlags flags)
Q_UNUSED(eventLoop); // --release warning
d->inExec = false;
--threadData->loopLevel;
qCDebug(lcDeleteLater) << "Decreased" << threadData->thread
<< "loop level to" << threadData->loopLevel
<< "with leaf loop now" << (threadData->eventLoops.isEmpty()
? nullptr : threadData->eventLoops.last());
}
};
LoopReference ref(d, locker);

13
src/corelib/kernel/qobject.cpp
View File

@ -1400,7 +1400,6 @@ bool QObject::event(QEvent *e)
break;
case QEvent::DeferredDelete:
qCDebug(lcDeleteLater) << "Deferred deleting" << this;
delete this;
break;
@ -2451,10 +2450,8 @@ void QObject::deleteLater()
// as long as we're not guarding every access to the bit field.
Q_D(QObject);
if (d->deleteLaterCalled) {
qCDebug(lcDeleteLater) << "Skipping deleteLater for already deferred object" << this;
if (d->deleteLaterCalled)
return;
}
d->deleteLaterCalled = true;
@ -2480,16 +2477,10 @@ void QObject::deleteLater()
// non-conformant code path, and our best guess is that the scope level
// should be 1. (Loop level 0 is special: it means that no event loops
// are running.)
if (scopeLevel == 0 && loopLevel != 0) {
qCDebug(lcDeleteLater) << "Delete later called with scope level 0"
<< "but loop level is > 0. Assuming scope is 1";
if (scopeLevel == 0 && loopLevel != 0)
scopeLevel = 1;
}
}
qCDebug(lcDeleteLater) << "Posting deferred delete for" << this
<< "with loop level" << loopLevel << "and scope level" << scopeLevel;
eventListLocker.unlock();
QCoreApplication::postEvent(this,
new QDeferredDeleteEvent(loopLevel, scopeLevel));

1
src/corelib/kernel/qtranslator.cpp
View File

@ -19,6 +19,7 @@
#include "qtranslator_p.h"
#include "qlocale.h"
#include "qlogging.h"
#include "qloggingcategory.h"
#include "qdebug.h"
#include "qendian.h"
#include "qresource.h"

15
src/corelib/thread/qthread.cpp
View File

@ -133,21 +133,6 @@ void QAdoptedThread::run()
}
#endif
QScopedScopeLevelCounter::QScopedScopeLevelCounter(QThreadData *threadData)
: threadData(threadData)
{
++threadData->scopeLevel;
qCDebug(lcDeleteLater) << "Increased" << threadData->thread
<< "scope level to" << threadData->scopeLevel;
}
QScopedScopeLevelCounter::~QScopedScopeLevelCounter()
{
--threadData->scopeLevel;
qCDebug(lcDeleteLater) << "Decreased" << threadData->thread
<< "scope level to" << threadData->scopeLevel;
}
#if QT_CONFIG(thread)
/*
QThreadPrivate

7
src/corelib/thread/qthread_p.h
View File

@ -352,8 +352,11 @@ class QScopedScopeLevelCounter
{
QThreadData *threadData;
public:
QScopedScopeLevelCounter(QThreadData *threadData);
~QScopedScopeLevelCounter();
inline QScopedScopeLevelCounter(QThreadData *threadData)
: threadData(threadData)
{ ++threadData->scopeLevel; }
inline ~QScopedScopeLevelCounter()
{ --threadData->scopeLevel; }
};
// thread wrapper for the main() thread

2
src/corelib/thread/qthread_unix.cpp
View File

@ -8,6 +8,7 @@
#include <private/qcoreapplication_p.h>
#include <private/qcore_unix_p.h>
#include "qloggingcategory.h"
#include <private/qtools_p.h>
#if defined(Q_OS_DARWIN)
@ -387,7 +388,6 @@ void QThreadPrivate::finish()
d->priority = QThread::InheritPriority;
locker.unlock();
emit thr->finished(QThread::QPrivateSignal());
qCDebug(lcDeleteLater) << "Sending deferred delete events as part of finishing thread" << thr;
QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
void *data = &d->data->tls;

1
src/corelib/thread/qthread_win.cpp
View File

@ -296,7 +296,6 @@ void QThreadPrivate::finish(bool lockAnyway) noexcept
if (lockAnyway)
locker.unlock();
emit thr->finished(QThread::QPrivateSignal());
qCDebug(lcDeleteLater) << "Sending deferred delete events as part of finishing thread" << thr;
QCoreApplicationPrivate::sendPostedEvents(nullptr, QEvent::DeferredDelete, d->data);
QThreadStorageData::finish(tls_data);
if (lockAnyway)