diff options
Diffstat (limited to 'src/qml/qml/qqmldatablob.cpp')
| -rw-r--r-- | src/qml/qml/qqmldatablob.cpp | 128 |
1 files changed, 48 insertions, 80 deletions
diff --git a/src/qml/qml/qqmldatablob.cpp b/src/qml/qml/qqmldatablob.cpp index 750fc6de50..6b354c337f 100644 --- a/src/qml/qml/qqmldatablob.cpp +++ b/src/qml/qml/qqmldatablob.cpp @@ -1,50 +1,17 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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: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 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 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. -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <private/qqmldatablob_p.h> #include <private/qqmlglobal_p.h> #include <private/qqmlprofiler_p.h> #include <private/qqmltypeloader_p.h> #include <private/qqmltypeloaderthread_p.h> +#include <private/qqmlsourcecoordinate_p.h> #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 @@ -53,6 +20,8 @@ DEFINE_BOOL_CONFIG_OPTION(dumpErrors, QML_DUMP_ERRORS); +Q_DECLARE_LOGGING_CATEGORY(lcCycle) + QT_BEGIN_NAMESPACE /*! @@ -70,16 +39,14 @@ The QQmlTypeLoader invokes callbacks on the QQmlDataBlob as data becomes availab This enum describes the status of the data blob. -\list -\li Null The blob has not yet been loaded by a QQmlTypeLoader -\li Loading The blob is loading network data. The QQmlDataBlob::setData() callback has not yet been - invoked or has not yet returned. -\li WaitingForDependencies The blob is waiting for dependencies to be done before continuing. - This status only occurs after the QQmlDataBlob::setData() callback has been made, and when the - blob has outstanding dependencies. -\li Complete The blob's data has been loaded and all dependencies are done. -\li Error An error has been set on this blob. -\endlist +\value Null The blob has not yet been loaded by a QQmlTypeLoader +\value Loading The blob is loading network data. The QQmlDataBlob::setData() callback has + not yet been invoked or has not yet returned. +\value WaitingForDependencies The blob is waiting for dependencies to be done before continuing. + This status only occurs after the QQmlDataBlob::setData() callback has been made, + and when the blob has outstanding dependencies. +\value Complete The blob's data has been loaded and all dependencies are done. +\value Error An error has been set on this blob. */ /*! @@ -87,11 +54,9 @@ This enum describes the status of the data blob. This enum describes the type of the data blob. -\list -\li QmlFile This is a QQmlTypeData -\li JavaScriptFile This is a QQmlScriptData -\li QmldirFile This is a QQmlQmldirData -\endlist +\value QmlFile This is a QQmlTypeData +\value JavaScriptFile This is a QQmlScriptData +\value QmldirFile This is a QQmlQmldirData */ /*! @@ -102,9 +67,8 @@ QQmlDataBlob::QQmlDataBlob(const QUrl &url, Type type, QQmlTypeLoader *manager) m_inCallback(false), m_isDone(false) { //Set here because we need to get the engine from the manager - if (m_typeLoader->engine() && m_typeLoader->engine()->urlInterceptor()) - m_url = m_typeLoader->engine()->urlInterceptor()->intercept(m_url, - (QQmlAbstractUrlInterceptor::DataType)m_type); + if (const QQmlEngine *qmlEngine = m_typeLoader->engine()) + m_url = qmlEngine->interceptUrl(m_url, (QQmlAbstractUrlInterceptor::DataType)m_type); } /*! \internal */ @@ -287,12 +251,23 @@ void QQmlDataBlob::setError(const QList<QQmlError> &errors) Q_ASSERT(status() != Error); Q_ASSERT(m_errors.isEmpty()); - m_errors = errors; // Must be set before the m_data fence + // m_errors must be set before the m_data fence + m_errors.reserve(errors.size()); + for (const QQmlError &error : errors) { + if (error.url().isEmpty()) { + QQmlError mutableError = error; + mutableError.setUrl(url()); + m_errors.append(mutableError); + } else { + m_errors.append(error); + } + } + m_data.setStatus(Error); if (dumpErrors()) { qWarning().nospace() << "Errors for " << urlString(); - for (int ii = 0; ii < errors.count(); ++ii) + for (int ii = 0; ii < errors.size(); ++ii) qWarning().nospace() << " " << qPrintable(errors.at(ii).toString()); } cancelAllWaitingFor(); @@ -304,28 +279,13 @@ void QQmlDataBlob::setError(const QList<QQmlError> &errors) void QQmlDataBlob::setError(const QQmlJS::DiagnosticMessage &error) { QQmlError e; - e.setColumn(error.column); - e.setLine(error.line); + e.setColumn(qmlConvertSourceCoordinate<quint32, int>(error.loc.startColumn)); + e.setLine(qmlConvertSourceCoordinate<quint32, int>(error.loc.startLine)); e.setDescription(error.message); e.setUrl(url()); setError(e); } -void QQmlDataBlob::setError(const QVector<QQmlJS::DiagnosticMessage> &errors) -{ - QList<QQmlError> finalErrors; - finalErrors.reserve(errors.count()); - for (const auto &error : errors) { - QQmlError e; - e.setColumn(error.column); - e.setLine(error.line); - e.setDescription(error.message); - e.setUrl(url()); - finalErrors << e; - } - setError(finalErrors); -} - void QQmlDataBlob::setError(const QString &description) { QQmlError e; @@ -351,7 +311,7 @@ void QQmlDataBlob::addDependency(QQmlDataBlob *blob) status() == Error || status() == Complete || m_isDone) return; - for (const auto &existingDep: qAsConst(m_waitingFor)) + for (const auto &existingDep: std::as_const(m_waitingFor)) if (existingDep.data() == blob) return; @@ -359,6 +319,13 @@ void QQmlDataBlob::addDependency(QQmlDataBlob *blob) m_waitingFor.append(blob); blob->m_waitingOnMe.append(this); + + // Check circular dependency + if (m_waitingOnMe.indexOf(blob) >= 0) { + qCWarning(lcCycle) << "Cyclic dependency detected between" << this->url().toString() + << "and" << blob->url().toString(); + m_data.setStatus(Error); + } } /*! @@ -535,7 +502,7 @@ void QQmlDataBlob::tryDone() void QQmlDataBlob::cancelAllWaitingFor() { - while (m_waitingFor.count()) { + while (m_waitingFor.size()) { QQmlRefPointer<QQmlDataBlob> blob = m_waitingFor.takeLast(); Q_ASSERT(blob->m_waitingOnMe.contains(this)); @@ -546,7 +513,7 @@ void QQmlDataBlob::cancelAllWaitingFor() void QQmlDataBlob::notifyAllWaitingOnMe() { - while (m_waitingOnMe.count()) { + while (m_waitingOnMe.size()) { QQmlDataBlob *blob = m_waitingOnMe.takeLast(); Q_ASSERT(std::any_of(blob->m_waitingFor.constBegin(), blob->m_waitingFor.constEnd(), @@ -559,12 +526,13 @@ 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; QQmlRefPointer<QQmlDataBlob> blobRef; - for (int i = 0; i < m_waitingFor.count(); ++i) { + for (int i = 0; i < m_waitingFor.size(); ++i) { if (m_waitingFor.at(i).data() == blob) { blobRef = m_waitingFor.takeAt(i); break; @@ -607,7 +575,7 @@ QString QQmlDataBlob::SourceCodeData::readAll(QString *error) const } QByteArray data(fileSize, Qt::Uninitialized); - if (f.read(data.data(), data.length()) != data.length()) { + if (f.read(data.data(), data.size()) != data.size()) { *error = f.errorString(); return QString(); } |