whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSignalSpy: de-inline private helpers 

Reduces the code a compiler including qsignalspy.h needs to parse and
codegen.

The order of the functions in the .cpp file is chosen to minimize the
diffs to follow-up changes.

We can't de-inline the private ctor, because that would pin the vtable
to the qsignalspy.cpp TU, which would require us to export the class
wholesale to make the vtable accessible to users of the class, but we
can't export the class because it inherits QList.

Task-number: QTBUG-123544
Change-Id: Ib26fdb68e1fc0e6f6919e4cd25759b7047f9977c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Marc Mutz 2024-03-21 12:08:40 +01:00
parent 2822b22610
commit 88b5b1bce9
2 changed files with 87 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/testlib/qsignalspy.cpp
View File

@ -147,4 +147,86 @@ QT_BEGIN_NAMESPACE
\endcode
*/
bool QSignalSpy::isSignalMetaMethodValid(const QMetaMethod &signal)
{
if (!signal.isValid()) {
qWarning("QSignalSpy: Null signal is not valid");
return false;
}
if (signal.methodType() != QMetaMethod::Signal) {
qWarning("QSignalSpy: Not a signal: '%s'", signal.methodSignature().constData());
return false;
}
return true;
}
bool QSignalSpy::isObjectValid(const QObject *object)
{
const bool valid = !!object;
if (!valid)
qWarning("QSignalSpy: Cannot spy on a null object");
return valid;
}
void QSignalSpy::initArgs(const QMetaMethod &member, const QObject *obj)
{
QMutexLocker locker(&m_mutex);
args.reserve(member.parameterCount());
for (int i = 0; i < member.parameterCount(); ++i) {
QMetaType tp = member.parameterMetaType(i);
if (!tp.isValid() && obj) {
locker.unlock();
void *argv[] = { &tp, &i };
QMetaObject::metacall(const_cast<QObject*>(obj),
QMetaObject::RegisterMethodArgumentMetaType,
member.methodIndex(), argv);
locker.relock();
}
if (!tp.isValid()) {
qWarning("QSignalSpy: Unable to handle parameter '%s' of type '%s' of method '%s',"
" use qRegisterMetaType to register it.",
member.parameterNames().at(i).constData(),
member.parameterTypes().at(i).constData(),
member.name().constData());
}
args << tp.id();
}
}
bool QSignalSpy::connectToSignal(const QObject *sender, int sigIndex)
{
static const int memberOffset = QObject::staticMetaObject.methodCount();
const bool connected = QMetaObject::connect(
sender, sigIndex, this, memberOffset, Qt::DirectConnection, nullptr);
if (!connected)
qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
return connected;
}
void QSignalSpy::appendArgs(void **a)
{
QMutexLocker locker(&m_mutex);
QList<QVariant> list;
list.reserve(args.size());
for (qsizetype i = 0; i < args.size(); ++i) {
const QMetaType::Type type = static_cast<QMetaType::Type>(args.at(i));
if (type == QMetaType::QVariant)
list << *reinterpret_cast<QVariant *>(a[i + 1]);
else
list << QVariant(QMetaType(type), a[i + 1]);
}
append(std::move(list));
if (m_waiting) {
locker.unlock();
m_loop.exitLoop();
}
}
QT_END_NAMESPACE

83
src/testlib/qsignalspy.h
View File

@ -126,87 +126,14 @@ private:
sig = os.sig.methodSignature();
}
bool connectToSignal(const QObject *sender, int sigIndex)
{
static const int memberOffset = QObject::staticMetaObject.methodCount();
const bool connected = QMetaObject::connect(
sender, sigIndex, this, memberOffset, Qt::DirectConnection, nullptr);
if (!connected)
qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
Q_TESTLIB_EXPORT bool connectToSignal(const QObject *sender, int sigIndex);
return connected;
}
Q_TESTLIB_EXPORT static bool isSignalMetaMethodValid(const QMetaMethod &signal);
Q_TESTLIB_EXPORT static bool isObjectValid(const QObject *object);
static bool isSignalMetaMethodValid(const QMetaMethod &signal)
{
if (!signal.isValid()) {
qWarning("QSignalSpy: Null signal is not valid");
return false;
}
if (signal.methodType() != QMetaMethod::Signal) {
qWarning("QSignalSpy: Not a signal: '%s'", signal.methodSignature().constData());
return false;
}
return true;
}
static bool isObjectValid(const QObject *object)
{
const bool valid = !!object;
if (!valid)
qWarning("QSignalSpy: Cannot spy on a null object");
return valid;
}
void initArgs(const QMetaMethod &member, const QObject *obj)
{
QMutexLocker locker(&m_mutex);
args.reserve(member.parameterCount());
for (int i = 0; i < member.parameterCount(); ++i) {
QMetaType tp = member.parameterMetaType(i);
if (!tp.isValid() && obj) {
locker.unlock();
void *argv[] = { &tp, &i };
QMetaObject::metacall(const_cast<QObject*>(obj),
QMetaObject::RegisterMethodArgumentMetaType,
member.methodIndex(), argv);
locker.relock();
}
if (!tp.isValid()) {
qWarning("QSignalSpy: Unable to handle parameter '%s' of type '%s' of method '%s',"
" use qRegisterMetaType to register it.",
member.parameterNames().at(i).constData(),
member.parameterTypes().at(i).constData(),
member.name().constData());
}
args << tp.id();
}
}
void appendArgs(void **a)
{
QMutexLocker locker(&m_mutex);
QList<QVariant> list;
list.reserve(args.size());
for (qsizetype i = 0; i < args.size(); ++i) {
const QMetaType::Type type = static_cast<QMetaType::Type>(args.at(i));
if (type == QMetaType::QVariant)
list << *reinterpret_cast<QVariant *>(a[i + 1]);
else
list << QVariant(QMetaType(type), a[i + 1]);
}
append(std::move(list));
if (m_waiting) {
locker.unlock();
m_loop.exitLoop();
}
}
Q_TESTLIB_EXPORT void initArgs(const QMetaMethod &member, const QObject *obj);
Q_TESTLIB_EXPORT void appendArgs(void **a);
// the full, normalized signal name
QByteArray sig;