9aea74f2c6
This was overlooked when enabling setting a custom thread pool for various concurrent methods. Fixes: QTBUG-53465 Change-Id: I8b0a0086e46639639051fe99cf52d049f7bb3bb2 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
159 lines
4.3 KiB
C++
159 lines
4.3 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the QtConcurrent 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$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "qtconcurrentiteratekernel.h"
|
|
|
|
#include <qdeadlinetimer.h>
|
|
#include "private/qfunctions_p.h"
|
|
|
|
|
|
#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC)
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
enum {
|
|
TargetRatio = 100
|
|
};
|
|
|
|
static qint64 getticks()
|
|
{
|
|
return QDeadlineTimer::current(Qt::PreciseTimer).deadlineNSecs();
|
|
}
|
|
|
|
static double elapsed(qint64 after, qint64 before)
|
|
{
|
|
return double(after - before);
|
|
}
|
|
|
|
namespace QtConcurrent {
|
|
|
|
/*!
|
|
\class QtConcurrent::Median
|
|
\inmodule QtConcurrent
|
|
\internal
|
|
*/
|
|
|
|
/*!
|
|
\class QtConcurrent::BlockSizeManager
|
|
\inmodule QtConcurrent
|
|
\internal
|
|
*/
|
|
|
|
/*!
|
|
\class QtConcurrent::ResultReporter
|
|
\inmodule QtConcurrent
|
|
\internal
|
|
*/
|
|
|
|
/*! \fn bool QtConcurrent::selectIteration(std::bidirectional_iterator_tag)
|
|
\internal
|
|
*/
|
|
|
|
/*! \fn bool QtConcurrent::selectIteration(std::forward_iterator_tag)
|
|
\internal
|
|
*/
|
|
|
|
/*! \fn bool QtConcurrent::selectIteration(std::random_access_iterator_tag)
|
|
\internal
|
|
*/
|
|
|
|
/*!
|
|
\class QtConcurrent::IterateKernel
|
|
\inmodule QtConcurrent
|
|
\internal
|
|
*/
|
|
|
|
/*! \internal
|
|
|
|
*/
|
|
BlockSizeManager::BlockSizeManager(QThreadPool *pool, int iterationCount)
|
|
: maxBlockSize(iterationCount / (pool->maxThreadCount() * 2)),
|
|
beforeUser(0), afterUser(0),
|
|
m_blockSize(1)
|
|
{ }
|
|
|
|
// Records the time before user code.
|
|
void BlockSizeManager::timeBeforeUser()
|
|
{
|
|
if (blockSizeMaxed())
|
|
return;
|
|
|
|
beforeUser = getticks();
|
|
controlPartElapsed.addValue(elapsed(beforeUser, afterUser));
|
|
}
|
|
|
|
// Records the time after user code and adjust the block size if we are spending
|
|
// to much time in the for control code compared with the user code.
|
|
void BlockSizeManager::timeAfterUser()
|
|
{
|
|
if (blockSizeMaxed())
|
|
return;
|
|
|
|
afterUser = getticks();
|
|
userPartElapsed.addValue(elapsed(afterUser, beforeUser));
|
|
|
|
if (controlPartElapsed.isMedianValid() == false)
|
|
return;
|
|
|
|
if (controlPartElapsed.median() * TargetRatio < userPartElapsed.median())
|
|
return;
|
|
|
|
m_blockSize = qMin(m_blockSize * 2, maxBlockSize);
|
|
|
|
#ifdef QTCONCURRENT_FOR_DEBUG
|
|
qDebug() << QThread::currentThread() << "adjusting block size" << controlPartElapsed.median() << userPartElapsed.median() << m_blockSize;
|
|
#endif
|
|
|
|
// Reset the medians after adjusting the block size so we get
|
|
// new measurements with the new block size.
|
|
controlPartElapsed.reset();
|
|
userPartElapsed.reset();
|
|
}
|
|
|
|
int BlockSizeManager::blockSize()
|
|
{
|
|
return m_blockSize;
|
|
}
|
|
|
|
} // namespace QtConcurrent
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // QT_NO_CONCURRENT
|