From 7811d69006d298dcbe2abff874b02dfa80d8bf80 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 8 Jul 2019 13:13:20 +0200 Subject: Move the memory pool into the common code We need it in both, the compiler and the runtime. Change-Id: Iffacb9d150bf9eef6ef477bfd427dbac9bf49359 Reviewed-by: Simon Hausmann --- src/qml/common/common.pri | 4 +- src/qml/common/qqmljsfixedpoolarray_p.h | 140 +++++++++++++++++++++++++ src/qml/common/qqmljsmemorypool_p.h | 179 ++++++++++++++++++++++++++++++++ 3 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 src/qml/common/qqmljsfixedpoolarray_p.h create mode 100644 src/qml/common/qqmljsmemorypool_p.h (limited to 'src/qml/common') diff --git a/src/qml/common/common.pri b/src/qml/common/common.pri index de95772120..9de4fcae16 100644 --- a/src/qml/common/common.pri +++ b/src/qml/common/common.pri @@ -1,3 +1,5 @@ HEADERS += \ $$PWD/qqmlapiversion_p.h \ - $$PWD/qqmljsdiagnosticmessage_p.h + $$PWD/qqmljsdiagnosticmessage_p.h \ + $$PWD/qqmljsfixedpoolarray_p.h \ + $$PWD/qqmljsmemorypool_p.h diff --git a/src/qml/common/qqmljsfixedpoolarray_p.h b/src/qml/common/qqmljsfixedpoolarray_p.h new file mode 100644 index 0000000000..b65b994d6c --- /dev/null +++ b/src/qml/common/qqmljsfixedpoolarray_p.h @@ -0,0 +1,140 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef QQMLJSFIXEDPOOLARRAY_P_H +#define QQMLJSFIXEDPOOLARRAY_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include + +QT_BEGIN_NAMESPACE + +namespace QQmlJS { + +template +class FixedPoolArray +{ + T *data; + int count = 0; + +public: + FixedPoolArray() + : data(nullptr) + {} + + FixedPoolArray(MemoryPool *pool, int size) + { allocate(pool, size); } + + void allocate(MemoryPool *pool, int size) + { + count = size; + data = reinterpret_cast(pool->allocate(count * sizeof(T))); + } + + void allocate(MemoryPool *pool, const QVector &vector) + { + count = vector.count(); + data = reinterpret_cast(pool->allocate(count * sizeof(T))); + + if (QTypeInfo::isComplex) { + for (int i = 0; i < count; ++i) + new (data + i) T(vector.at(i)); + } else { + memcpy(data, static_cast(vector.constData()), count * sizeof(T)); + } + } + + template + void allocate(MemoryPool *pool, const Container &container) + { + count = container.count(); + data = reinterpret_cast(pool->allocate(count * sizeof(T))); + typename Container::ConstIterator it = container.constBegin(); + for (int i = 0; i < count; ++i) + new (data + i) T(*it++); + } + + int size() const + { return count; } + + const T &at(int index) const { + Q_ASSERT(index >= 0 && index < count); + return data[index]; + } + + T &at(int index) { + Q_ASSERT(index >= 0 && index < count); + return data[index]; + } + + T &operator[](int index) { + return at(index); + } + + + int indexOf(const T &value) const { + for (int i = 0; i < count; ++i) + if (data[i] == value) + return i; + return -1; + } + + const T *begin() const { return data; } + const T *end() const { return data + count; } + + T *begin() { return data; } + T *end() { return data + count; } +}; + +} // namespace QQmlJS + +QT_END_NAMESPACE + +#endif // QQMLJSFIXEDPOOLARRAY_P_H diff --git a/src/qml/common/qqmljsmemorypool_p.h b/src/qml/common/qqmljsmemorypool_p.h new file mode 100644 index 0000000000..0cf7ea84e6 --- /dev/null +++ b/src/qml/common/qqmljsmemorypool_p.h @@ -0,0 +1,179 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef QQMLJSMEMORYPOOL_P_H +#define QQMLJSMEMORYPOOL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include + +#include + +QT_BEGIN_NAMESPACE + +namespace QQmlJS { + +class Managed; + +class MemoryPool : public QSharedData +{ + MemoryPool(const MemoryPool &other); + void operator =(const MemoryPool &other); + +public: + MemoryPool() {} + + ~MemoryPool() + { + if (_blocks) { + for (int i = 0; i < _allocatedBlocks; ++i) { + if (char *b = _blocks[i]) + free(b); + } + + free(_blocks); + } + qDeleteAll(strings); + } + + inline void *allocate(size_t size) + { + size = (size + 7) & ~size_t(7); + if (Q_LIKELY(_ptr && (_ptr + size < _end))) { + void *addr = _ptr; + _ptr += size; + return addr; + } + return allocate_helper(size); + } + + void reset() + { + _blockCount = -1; + _ptr = _end = nullptr; + } + + template Tp *New() { return new (this->allocate(sizeof(Tp))) Tp(); } + template Tp *New(Ta... args) + { return new (this->allocate(sizeof(Tp))) Tp(args...); } + + QStringRef newString(const QString &string) { + strings.append(new QString(string)); + return QStringRef(strings.last()); + } + +private: + Q_NEVER_INLINE void *allocate_helper(size_t size) + { + size_t currentBlockSize = DEFAULT_BLOCK_SIZE; + while (Q_UNLIKELY(size >= currentBlockSize)) + currentBlockSize *= 2; + + if (++_blockCount == _allocatedBlocks) { + if (! _allocatedBlocks) + _allocatedBlocks = DEFAULT_BLOCK_COUNT; + else + _allocatedBlocks *= 2; + + _blocks = reinterpret_cast(realloc(_blocks, sizeof(char *) * size_t(_allocatedBlocks))); + Q_CHECK_PTR(_blocks); + + for (int index = _blockCount; index < _allocatedBlocks; ++index) + _blocks[index] = nullptr; + } + + char *&block = _blocks[_blockCount]; + + if (! block) { + block = reinterpret_cast(malloc(currentBlockSize)); + Q_CHECK_PTR(block); + } + + _ptr = block; + _end = _ptr + currentBlockSize; + + void *addr = _ptr; + _ptr += size; + return addr; + } + +private: + char **_blocks = nullptr; + int _allocatedBlocks = 0; + int _blockCount = -1; + char *_ptr = nullptr; + char *_end = nullptr; + QVector strings; + + enum + { + DEFAULT_BLOCK_SIZE = 8 * 1024, + DEFAULT_BLOCK_COUNT = 8 + }; +}; + +class Managed +{ + Q_DISABLE_COPY(Managed) +public: + Managed() = default; + ~Managed() = default; + + void *operator new(size_t size, MemoryPool *pool) { return pool->allocate(size); } + void operator delete(void *) {} + void operator delete(void *, MemoryPool *) {} +}; + +} // namespace QQmlJS + +QT_END_NAMESPACE + +#endif -- cgit v1.2.3