diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-09 11:12:24 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-14 08:36:24 +0000 |
| commit | 6b79bba985858497f6a0786b4bd0d20a0d839017 (patch) | |
| tree | 59465ebfa8c3bc8b6a5d601083a2fba026ac262b /src/plugins/qmlprofiler/memoryusagemodel.cpp | |
| parent | 257d1990c6617bc0a06a552451f30dbec52df846 (diff) | |
QmlProfiler: Don't accept compile events in memory usage model
As compiling happens asynchronously it messes up the stack based
approach used to attribute memory usage to QML/JS events. Compiling
generally doesn't use the JavaScript heap, so we can ignore it here.
Change-Id: If8cc4b0ad2b8c2e0531260a8b92b7e2cd76a6d56
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler/memoryusagemodel.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/memoryusagemodel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmlprofiler/memoryusagemodel.cpp b/src/plugins/qmlprofiler/memoryusagemodel.cpp index 939e95614e1..3a30dd7320a 100644 --- a/src/plugins/qmlprofiler/memoryusagemodel.cpp +++ b/src/plugins/qmlprofiler/memoryusagemodel.cpp @@ -36,7 +36,7 @@ MemoryUsageModel::MemoryUsageModel(QmlProfilerModelManager *manager, QObject *pa QmlProfilerTimelineModel(manager, MemoryAllocation, MaximumRangeType, ProfileMemory, parent) { // Announce additional features. The base class already announces the main feature. - announceFeatures(Constants::QML_JS_RANGE_FEATURES); + announceFeatures(Constants::QML_JS_RANGE_FEATURES ^ (1 << Compiling)); } int MemoryUsageModel::rowMaxValue(int rowNumber) const @@ -128,7 +128,8 @@ QVariantMap MemoryUsageModel::details(int index) const bool MemoryUsageModel::accepted(const QmlEventType &type) const { - return QmlProfilerTimelineModel::accepted(type) || type.rangeType() != MaximumRangeType; + return QmlProfilerTimelineModel::accepted(type) + || (type.rangeType() != MaximumRangeType && type.rangeType() != Compiling); } void MemoryUsageModel::loadEvent(const QmlEvent &event, const QmlEventType &type) |