diff options
Diffstat (limited to 'src/corelib/thread/qthreadstorage.cpp')
| -rw-r--r-- | src/corelib/thread/qthreadstorage.cpp | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp index 98d8e87459..c2029fe1b3 100644 --- a/src/corelib/thread/qthreadstorage.cpp +++ b/src/corelib/thread/qthreadstorage.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore 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 #include "qthreadstorage.h" @@ -68,7 +32,7 @@ void qtsDebug(const char *fmt, ...) # define DEBUG_MSG if (false)qDebug #endif -static QBasicMutex destructorsMutex; +Q_CONSTINIT static QBasicMutex destructorsMutex; typedef QList<void (*)(void *)> DestructorMap; Q_GLOBAL_STATIC(DestructorMap, destructors) @@ -87,15 +51,15 @@ QThreadStorageData::QThreadStorageData(void (*func)(void *)) no where to store it, and no way to actually call it. */ QThreadData *data = QThreadData::current(); - id = data->tls.count(); + id = data->tls.size(); DEBUG_MSG("QThreadStorageData: Allocated id %d, destructor %p cannot be stored", id, func); return; } - for (id = 0; id < destr->count(); id++) { + for (id = 0; id < destr->size(); id++) { if (destr->at(id) == nullptr) break; } - if (id == destr->count()) { + if (id == destr->size()) { destr->append(func); } else { (*destr)[id] = func; @@ -225,7 +189,7 @@ void QThreadStorageData::finish(void **p) The hasLocalData() function allows the programmer to determine if data has previously been set using the setLocalData() function. - This is also useful for lazy initializiation. + This is also useful for lazy initialization. If T is a pointer type, QThreadStorage takes ownership of the data (which must be created on the heap with \c new) and deletes it when |