diff options
| -rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 5 | ||||
| -rw-r--r-- | src/qml/qml/qqmldatablob.cpp | 3 | ||||
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qtqml.tracepoints | 7 |
6 files changed, 24 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index e143523165..fb103d492d 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -434,7 +434,7 @@ ReturnedValue VME::exec(CppStackFrame *frame, ExecutionEngine *engine) Function *function = frame->v4Function; Q_TRACE_SCOPE(QQmlV4_function_call, engine, function->name()->toQString(), - function->compilationUnit->fileName(), + function->executableCompilationUnit()->fileName(), function->compiledFunction->location.line, function->compiledFunction->location.column); Profiling::FunctionCallProfiler profiler(engine, function); // start execution profiling diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 112e5b558a..162adf8364 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -54,6 +54,8 @@ #include <private/qv4variantobject_p.h> #include <private/qv4jscall_p.h> +#include <qtqml_tracepoints_p.h> + #include <QVariant> #include <QtCore/qdebug.h> #include <QVector> @@ -182,6 +184,8 @@ void QQmlBinding::update(QQmlPropertyData::WriteFlags flags) if (canUseAccessor()) flags.setFlag(QQmlPropertyData::BypassInterceptor); + Q_TRACE_SCOPE(QQmlBinding, engine, function() ? function()->name()->toQString() : QString(), + sourceLocation().sourceFile, sourceLocation().line, sourceLocation().column); QQmlBindingProfiler prof(QQmlEnginePrivate::get(engine)->profiler, function()); doUpdate(watcher, flags, scope); diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index ff01e737ca..b347bb3829 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -60,6 +60,7 @@ #include <QtCore/qdebug.h> +#include <qtqml_tracepoints_p.h> QT_BEGIN_NAMESPACE @@ -352,6 +353,10 @@ void QQmlBoundSignal_callback(QQmlNotifierEndpoint *e, void **a) QQmlEngine *engine; if (s->m_expression && (engine = s->m_expression->engine())) { + Q_TRACE_SCOPE(QQmlHandlingSignal, engine, + s->m_expression->function() ? s->m_expression->function()->name()->toQString() : QString(), + s->m_expression->sourceLocation().sourceFile, s->m_expression->sourceLocation().line, + s->m_expression->sourceLocation().column); QQmlHandlingSignalProfiler prof(QQmlEnginePrivate::get(engine)->profiler, s->m_expression); s->m_expression->evaluate(a); if (s->m_expression && s->m_expression->hasError()) { diff --git a/src/qml/qml/qqmldatablob.cpp b/src/qml/qml/qqmldatablob.cpp index 750fc6de50..1ab6002f0a 100644 --- a/src/qml/qml/qqmldatablob.cpp +++ b/src/qml/qml/qqmldatablob.cpp @@ -45,6 +45,8 @@ #include <QtQml/qqmlengine.h> +#include <qtqml_tracepoints_p.h> + #ifdef DATABLOB_DEBUG #define ASSERT_CALLBACK() do { if (!m_typeLoader || !m_typeLoader->m_thread->isThisThread()) qFatal("QQmlDataBlob: An API call was made outside a callback"); } while (false) #else @@ -559,6 +561,7 @@ void QQmlDataBlob::notifyAllWaitingOnMe() void QQmlDataBlob::notifyComplete(QQmlDataBlob *blob) { Q_ASSERT(blob->status() == Error || blob->status() == Complete); + Q_TRACE_SCOPE(QQmlCompiling, blob->url()); QQmlCompilingProfiler prof(typeLoader()->profiler(), blob); m_inCallback = true; diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index e0131c0a98..989c3fe4b0 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -51,6 +51,8 @@ #include <QtQml/qqmlextensioninterface.h> #include <QtQml/qqmlfile.h> +#include <qtqml_tracepoints_p.h> + #include <QtCore/qdir.h> #include <QtCore/qdiriterator.h> #include <QtCore/qfile.h> @@ -436,6 +438,7 @@ void QQmlTypeLoader::setData(QQmlDataBlob *blob, const QString &fileName) void QQmlTypeLoader::setData(QQmlDataBlob *blob, const QQmlDataBlob::SourceCodeData &d) { + Q_TRACE_SCOPE(QQmlCompiling, blob->url()); QQmlCompilingProfiler prof(profiler(), blob); blob->m_inCallback = true; @@ -455,6 +458,7 @@ void QQmlTypeLoader::setData(QQmlDataBlob *blob, const QQmlDataBlob::SourceCodeD void QQmlTypeLoader::setCachedUnit(QQmlDataBlob *blob, const QV4::CompiledData::Unit *unit) { + Q_TRACE_SCOPE(QQmlCompiling, blob->url()); QQmlCompilingProfiler prof(profiler(), blob); blob->m_inCallback = true; diff --git a/src/qml/qtqml.tracepoints b/src/qml/qtqml.tracepoints index 841748f201..1043d3bae3 100644 --- a/src/qml/qtqml.tracepoints +++ b/src/qml/qtqml.tracepoints @@ -6,9 +6,16 @@ class CompilationUnit; class Object; } // CompiledData } // QV4 +class QQmlEngine; } QQmlObjectCreator_createInstance_entry(const QV4::CompiledData::CompilationUnit *compilationUnit, const QV4::CompiledData::Object *object, const QUrl &url) QQmlObjectCreator_createInstance_exit(const QString &typeName) +QQmlCompiling_entry(const QUrl &url) +QQmlCompiling_exit() QQmlV4_function_call_entry(const QV4::ExecutionEngine *engine, const QString &function, const QString &fileName, int line, int column) QQmlV4_function_call_exit() +QQmlBinding_entry(const QQmlEngine *engine, const QString &function, const QString &fileName, int line, int column) +QQmlBinding_exit() +QQmlHandlingSignal_entry(const QQmlEngine *engine, const QString &function, const QString &fileName, int line, int column) +QQmlHandlingSignal_exit() |