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

Refactor QMetaObject::activate tracepoints

Browse Source 
Use Q_TRACE_SCOPE and the corresponding naming scheme. Additionally,
don't change the behavior of the code when tracing is enabled, i.e.
continue to return early if possible.

Change-Id: I9ba9679869db1541a19bc832beede902224c52f2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Milian Wolff 2019-04-26 15:16:18 +02:00
parent 3308a81942
commit e5eaae100b
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3664,19 +3664,18 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
if (sender->d_func()->blockSig) if (sender->d_func()->blockSig)
return; return;
Q_TRACE_SCOPE(QMetaObject_activate, sender, signal_index);
if (sender->d_func()->isDeclarativeSignalConnected(signal_index) if (sender->d_func()->isDeclarativeSignalConnected(signal_index)
&& QAbstractDeclarativeData::signalEmitted) { && QAbstractDeclarativeData::signalEmitted) {
Q_TRACE(QMetaObject_activate_begin_declarative_signal, sender, signal_index); Q_TRACE_SCOPE(QMetaObject_activate_declarative_signal, sender, signal_index);
QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender, QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender,
signal_index, argv); signal_index, argv);
Q_TRACE(QMetaObject_activate_end_declarative_signal, sender, signal_index);
} }
if (!sender->d_func()->isSignalConnected(signal_index, /*checkDeclarative =*/ false) if (!sender->d_func()->isSignalConnected(signal_index, /*checkDeclarative =*/ false)
&& !qt_signal_spy_callback_set.signal_begin_callback && !qt_signal_spy_callback_set.signal_begin_callback
&& !qt_signal_spy_callback_set.signal_end_callback && !qt_signal_spy_callback_set.signal_end_callback) {
&& !Q_TRACE_ENABLED(QMetaObject_activate_begin_signal)
&& !Q_TRACE_ENABLED(QMetaObject_activate_end_signal)) {
// The possible declarative connection is done, and nothing else is connected, so: // The possible declarative connection is done, and nothing else is connected, so:
return; return;
} }
@ -3686,7 +3685,6 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index, qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index,
argv ? argv : empty_argv); argv ? argv : empty_argv);
} }
Q_TRACE(QMetaObject_activate_begin_signal, sender, signal_index);
{ {
QMutexLocker locker(signalSlotLock(sender)); QMutexLocker locker(signalSlotLock(sender));
@ -3717,7 +3715,6 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
locker.unlock(); locker.unlock();
if (qt_signal_spy_callback_set.signal_end_callback != 0) if (qt_signal_spy_callback_set.signal_end_callback != 0)
qt_signal_spy_callback_set.signal_end_callback(sender, signal_index); qt_signal_spy_callback_set.signal_end_callback(sender, signal_index);
Q_TRACE(QMetaObject_activate_end_signal, sender, signal_index);
return; return;
} }
@ -3778,9 +3775,11 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
c->slotObj->ref(); c->slotObj->ref();
QScopedPointer<QtPrivate::QSlotObjectBase, QSlotObjectBaseDeleter> obj(c->slotObj); QScopedPointer<QtPrivate::QSlotObjectBase, QSlotObjectBaseDeleter> obj(c->slotObj);
locker.unlock(); locker.unlock();
Q_TRACE(QMetaObject_activate_begin_slot_functor, obj.data());
obj->call(receiver, argv ? argv : empty_argv); {
Q_TRACE(QMetaObject_activate_end_slot_functor, obj.data()); Q_TRACE_SCOPE(QMetaObject_activate_slot_functor, obj.data());
obj->call(receiver, argv ? argv : empty_argv);
}
// Make sure the slot object gets destroyed before the mutex is locked again, as the // Make sure the slot object gets destroyed before the mutex is locked again, as the
// destructor of the slot object might also lock a mutex from the signalSlotLock() mutex pool, // destructor of the slot object might also lock a mutex from the signalSlotLock() mutex pool,
@ -3796,11 +3795,12 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
locker.unlock(); locker.unlock();
if (qt_signal_spy_callback_set.slot_begin_callback != 0) if (qt_signal_spy_callback_set.slot_begin_callback != 0)
qt_signal_spy_callback_set.slot_begin_callback(receiver, methodIndex, argv ? argv : empty_argv); qt_signal_spy_callback_set.slot_begin_callback(receiver, methodIndex, argv ? argv : empty_argv);
Q_TRACE(QMetaObject_activate_begin_slot, receiver, methodIndex);
callFunction(receiver, QMetaObject::InvokeMetaMethod, method_relative, argv ? argv : empty_argv); {
Q_TRACE_SCOPE(QMetaObject_activate_slot, receiver, methodIndex);
callFunction(receiver, QMetaObject::InvokeMetaMethod, method_relative, argv ? argv : empty_argv);
}
Q_TRACE(QMetaObject_activate_end_slot, receiver, methodIndex);
if (qt_signal_spy_callback_set.slot_end_callback != 0) if (qt_signal_spy_callback_set.slot_end_callback != 0)
qt_signal_spy_callback_set.slot_end_callback(receiver, methodIndex); qt_signal_spy_callback_set.slot_end_callback(receiver, methodIndex);
locker.relock(); locker.relock();
@ -3813,11 +3813,12 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
method, method,
argv ? argv : empty_argv); argv ? argv : empty_argv);
} }
Q_TRACE(QMetaObject_activate_begin_slot, receiver, method);
metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv); {
Q_TRACE_SCOPE(QMetaObject_activate_slot, receiver, method);
metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv);
}
Q_TRACE(QMetaObject_activate_end_slot, receiver, method);
if (qt_signal_spy_callback_set.slot_end_callback != 0) if (qt_signal_spy_callback_set.slot_end_callback != 0)
qt_signal_spy_callback_set.slot_end_callback(receiver, method); qt_signal_spy_callback_set.slot_end_callback(receiver, method);
@ -3838,7 +3839,6 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
if (qt_signal_spy_callback_set.signal_end_callback != 0) if (qt_signal_spy_callback_set.signal_end_callback != 0)
qt_signal_spy_callback_set.signal_end_callback(sender, signal_index); qt_signal_spy_callback_set.signal_end_callback(sender, signal_index);
Q_TRACE(QMetaObject_activate_end_signal, sender, signal_index);
} }
/*! /*!

16
src/corelib/qtcore.tracepoints
View File

@ -32,13 +32,13 @@ QCoreApplication_notify_after_delivery(QObject *receiver, QEvent *event, int typ
QObject_ctor(QObject *object) QObject_ctor(QObject *object)
QObject_dtor(QObject *object) QObject_dtor(QObject *object)
QMetaObject_activate_begin_signal(QObject *sender, int signalIndex) QMetaObject_activate_entry(QObject *sender, int signalIndex)
QMetaObject_activate_end_signal(QObject *sender, int signalIndex) QMetaObject_activate_exit(QObject *sender, int signalIndex)
QMetaObject_activate_begin_slot(QObject *receiver, int slotIndex) QMetaObject_activate_slot_entry(QObject *receiver, int slotIndex)
QMetaObject_activate_end_slot(QObject *receiver, int slotIndex) QMetaObject_activate_slot_exit(QObject *receiver, int slotIndex)
QMetaObject_activate_begin_slot_functor(void *slotObject) QMetaObject_activate_slot_functor_entry(void *slotObject)
QMetaObject_activate_end_slot_functor(void *slotObject) QMetaObject_activate_slot_functor_exit(void *slotObject)
QMetaObject_activate_begin_declarative_signal(QObject *sender, int signalIndex) QMetaObject_activate_declarative_signal_entry(QObject *sender, int signalIndex)
QMetaObject_activate_end_declarative_signal(QObject *sender, int signalIndex) QMetaObject_activate_declarative_signal_exit(QObject *sender, int signalIndex)
qt_message_print(int type, const char *category, const char *function, const char *file, int line, const QString &message) qt_message_print(int type, const char *category, const char *function, const char *file, int line, const QString &message)