Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some data races in tst_qthreadpool

Browse source 
upstream commit:
f22b29162c

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-12-14 10:40:39 +00:00
parent 2888593897
commit 26afc7dd7f
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/auto/qthreadpool/tst_qthreadpool.cpp
View file

@ -225,7 +225,7 @@ void tst_QThreadPool::waitcomplete()
QCOMPARE(testFunctionCount, runs);
}
volatile bool ran;
QAtomicInt ran = QAtomicInt(false); // bool
class TestTask : public QRunnable
{
public:
@ -256,14 +256,14 @@ void tst_QThreadPool::singleton()
QTest::qSleep(100); // no busy loop - this doesn't work with FIFO schedulers
}
int *value = 0;
QAtomicInt *value = 0;
class IntAccessor : public QRunnable
{
public:
void run()
{
for (int i = 0; i < 100; ++i) {
++(*value);
value->ref();
QTest::qSleep(1);
}
}
@ -275,13 +275,12 @@ public:
*/
void tst_QThreadPool::destruction()
{
value = new int;
value = new QAtomicInt(0);
QThreadPool *threadManager = new QThreadPool();
threadManager->start(new IntAccessor());
threadManager->start(new IntAccessor());
delete threadManager;
delete value;
value = 0;
}
QSemaphore threadRecyclingSemaphore;
@ -784,8 +783,8 @@ void tst_QThreadPool::tryStart()
}
QMutex mutex;
int activeThreads = 0;
int peakActiveThreads = 0;
QAtomicInt activeThreads = QAtomicInt(0);
QAtomicInt peakActiveThreads = QAtomicInt(0);
void tst_QThreadPool::tryStartPeakThreadCount()
{
class CounterTask : public QRunnable
@ -797,14 +796,14 @@ void tst_QThreadPool::tryStartPeakThreadCount()
{
{
QMutexLocker lock(&mutex);
++activeThreads;
activeThreads.ref();
peakActiveThreads = qMax(peakActiveThreads, activeThreads);
}
QTest::qWait(100);
{
QMutexLocker lock(&mutex);
--activeThreads;
activeThreads.deref();
}
}
};
@ -816,13 +815,13 @@ void tst_QThreadPool::tryStartPeakThreadCount()
if (threadPool.tryStart(&task) == false)
QTest::qWait(10);
}
QCOMPARE(peakActiveThreads, QThread::idealThreadCount());
QCOMPARE(peakActiveThreads.load(), QThread::idealThreadCount());
for (int i = 0; i < 20; ++i) {
if (threadPool.tryStart(&task) == false)
QTest::qWait(10);
}
QCOMPARE(peakActiveThreads, QThread::idealThreadCount());
QCOMPARE(peakActiveThreads.load(), QThread::idealThreadCount());
}
void tst_QThreadPool::tryStartCount()