diff options
Diffstat (limited to 'src/qml/qml/qqmlvme_p.h')
| -rw-r--r-- | src/qml/qml/qqmlvme_p.h | 116 |
1 files changed, 24 insertions, 92 deletions
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h index 13c5524d96..b8dfc28050 100644 --- a/src/qml/qml/qqmlvme_p.h +++ b/src/qml/qml/qqmlvme_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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: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) 2016 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 #ifndef QQMLVME_P_H #define QQMLVME_P_H @@ -51,66 +15,40 @@ // We mean it. // -#include "qqmlerror.h" -#include <private/qbitfield_p.h> #include <private/qrecursionwatcher_p.h> #include <QtCore/QStack> #include <QtCore/QString> #include <QtCore/qelapsedtimer.h> +#include <QtCore/qdeadlinetimer.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qtypeinfo.h> #include <private/qqmlengine_p.h> #include <private/qfinitestack_p.h> +#include <atomic> + QT_BEGIN_NAMESPACE class QObject; -class QJSValue; -class QQmlScriptData; -class QQmlContextData; - -namespace QQmlVMETypes { - struct List - { - List() : type(0) {} - List(int t) : type(t) {} - - int type; - QQmlListProperty<void> qListProperty; - }; - struct State { - enum Flag { Deferred = 0x00000001 }; - - State() : flags(0), context(nullptr), instructionStream(nullptr) {} - quint32 flags; - QQmlContextData *context; - const char *instructionStream; - QBitField bindingSkipList; - }; -} -Q_DECLARE_TYPEINFO(QQmlVMETypes::List, Q_PRIMITIVE_TYPE | Q_MOVABLE_TYPE); -template<> -class QTypeInfo<QQmlVMETypes::State> : public QTypeInfoMerger<QQmlVMETypes::State, QBitField> {}; //Q_DECLARE_TYPEINFO class QQmlInstantiationInterrupt { public: inline QQmlInstantiationInterrupt(); - inline QQmlInstantiationInterrupt(volatile bool *runWhile, int nsecs=0); - inline QQmlInstantiationInterrupt(int nsecs); + inline QQmlInstantiationInterrupt(std::atomic<bool> *runWhile, + QDeadlineTimer deadline = QDeadlineTimer::Forever); + inline QQmlInstantiationInterrupt(QDeadlineTimer deadline); - inline void reset(); inline bool shouldInterrupt() const; private: enum Mode { None, Time, Flag }; Mode mode; - QElapsedTimer timer; - int nsecs; - volatile bool *runWhile; + QDeadlineTimer deadline; + std::atomic<bool> *runWhile = nullptr; }; -class Q_QML_PRIVATE_EXPORT QQmlVME +class Q_QML_EXPORT QQmlVME { public: static void enableComponentComplete(); @@ -141,43 +79,37 @@ public: private: int m_objectCount; - QPointer<QObject> *m_objects; + QQmlGuard<QObject> *m_objects; int m_contextCount; QQmlGuardedContextData *m_contexts; }; QQmlInstantiationInterrupt::QQmlInstantiationInterrupt() - : mode(None), nsecs(0), runWhile(nullptr) -{ -} - -QQmlInstantiationInterrupt::QQmlInstantiationInterrupt(volatile bool *runWhile, int nsecs) - : mode(Flag), nsecs(nsecs), runWhile(runWhile) + : mode(None) { } -QQmlInstantiationInterrupt::QQmlInstantiationInterrupt(int nsecs) - : mode(Time), nsecs(nsecs), runWhile(nullptr) +QQmlInstantiationInterrupt::QQmlInstantiationInterrupt(std::atomic<bool> *runWhile, QDeadlineTimer deadline) + : mode(Flag), deadline(deadline), runWhile(runWhile) { } -void QQmlInstantiationInterrupt::reset() +QQmlInstantiationInterrupt::QQmlInstantiationInterrupt(QDeadlineTimer deadline) + : mode(Time), deadline(deadline) { - if (mode == Time || nsecs) - timer.start(); } bool QQmlInstantiationInterrupt::shouldInterrupt() const { - if (mode == None) { - return false; - } else if (mode == Time) { - return timer.nsecsElapsed() > nsecs; - } else if (mode == Flag) { - return !*runWhile || (nsecs && timer.nsecsElapsed() > nsecs); - } else { + switch (mode) { + case None: return false; + case Time: + return deadline.hasExpired(); + case Flag: + return !runWhile->load(std::memory_order_acquire) || deadline.hasExpired(); } + Q_UNREACHABLE_RETURN(false); } QT_END_NAMESPACE |