1 files changed, 46 insertions, 28 deletions

diff --git a/src/qml/jsruntime/qv4profiling.cpp b/src/qml/jsruntime/qv4profiling.cpp
index b62f367601..a59190b846 100644
--- a/src/qml/jsruntime/qv4profiling.cpp
+++ b/src/qml/jsruntime/qv4profiling.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtQml module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -40,26 +46,35 @@ QT_BEGIN_NAMESPACE
 namespace QV4 {
 namespace Profiling {
 
-FunctionCallProperties FunctionCall::resolve() const
+FunctionLocation FunctionCall::resolveLocation() const
 {
-    FunctionCallProperties props = {
-        m_start,
-        m_end,
+    FunctionLocation location = {
         m_function->name()->toQString(),
         m_function->compilationUnit->fileName(),
         m_function->compiledFunction->location.line,
         m_function->compiledFunction->location.column
     };
-    return props;
+    return location;
 }
 
+FunctionCallProperties FunctionCall::properties() const
+{
+    FunctionCallProperties props = {
+        m_start,
+        m_end,
+        reinterpret_cast<quintptr>(m_function)
+    };
+    return props;
+}
 
 Profiler::Profiler(QV4::ExecutionEngine *engine) : featuresEnabled(0), m_engine(engine)
 {
-    static int meta = qRegisterMetaType<QVector<QV4::Profiling::FunctionCallProperties> >();
-    static int meta2 = qRegisterMetaType<QVector<QV4::Profiling::MemoryAllocationProperties> >();
-    Q_UNUSED(meta);
-    Q_UNUSED(meta2);
+    static const int metatypes[] = {
+        qRegisterMetaType<QVector<QV4::Profiling::FunctionCallProperties> >(),
+        qRegisterMetaType<QVector<QV4::Profiling::MemoryAllocationProperties> >(),
+        qRegisterMetaType<FunctionLocationHash>()
+    };
+    Q_UNUSED(metatypes);
     m_timer.start();
 }
 
@@ -79,13 +94,16 @@ bool operator<(const FunctionCall &call1, const FunctionCall &call2)
 void Profiler::reportData()
 {
     std::sort(m_data.begin(), m_data.end());
-    QVector<FunctionCallProperties> resolved;
-    resolved.reserve(m_data.size());
+    QVector<FunctionCallProperties> properties;
+    QHash<qint64, FunctionLocation> locations;
+    properties.reserve(m_data.size());
 
-    foreach (const FunctionCall &call, m_data)
-        resolved.append(call.resolve());
+    foreach (const FunctionCall &call, m_data) {
+        properties.append(call.properties());
+        locations[properties.constLast().id] = call.resolveLocation();
+    }
 
-    emit dataReady(resolved, m_memory_data);
+    emit dataReady(locations, properties, m_memory_data);
     m_data.clear();
     m_memory_data.clear();
 }