qt 6.6.0 clean

This commit is contained in:
kleuter
2023-11-01 22:23:55 +01:00
parent 7b5ada15e7
commit 5d8194efa7
1449 changed files with 134276 additions and 31391 deletions

View File

@ -13,7 +13,7 @@ class tst_QFuture : public QObject
Q_OBJECT
private slots:
void makeReadyfuture();
void makeReadyValueFuture();
#ifndef QT_NO_EXCEPTIONS
void makeExceptionalFuture();
#endif
@ -43,10 +43,10 @@ private slots:
void progressText();
};
void tst_QFuture::makeReadyfuture()
void tst_QFuture::makeReadyValueFuture()
{
QBENCHMARK {
auto future = QtFuture::makeReadyFuture(42);
auto future = QtFuture::makeReadyValueFuture(42);
Q_UNUSED(future);
}
}
@ -64,7 +64,7 @@ void tst_QFuture::makeExceptionalFuture()
void tst_QFuture::result()
{
auto future = QtFuture::makeReadyFuture(42);
auto future = QtFuture::makeReadyValueFuture(42);
QBENCHMARK {
auto value = future.result();
@ -92,7 +92,7 @@ void tst_QFuture::results()
void tst_QFuture::takeResult()
{
QBENCHMARK {
auto future = QtFuture::makeReadyFuture(42);
auto future = QtFuture::makeReadyValueFuture(42);
auto value = future.takeResult();
Q_UNUSED(value);
}
@ -140,7 +140,7 @@ void tst_QFuture::reportException()
void tst_QFuture::then()
{
auto f = QtFuture::makeReadyFuture(42);
auto f = QtFuture::makeReadyValueFuture(42);
QBENCHMARK {
auto future = f.then([](int value) { return value; });
Q_UNUSED(future);
@ -149,7 +149,7 @@ void tst_QFuture::then()
void tst_QFuture::thenVoid()
{
auto f = QtFuture::makeReadyFuture();
auto f = QtFuture::makeReadyVoidFuture();
QBENCHMARK {
auto future = f.then([] {});
Q_UNUSED(future);
@ -205,7 +205,7 @@ void tst_QFuture::onFailedVoid()
void tst_QFuture::thenOnFailed()
{
auto f = QtFuture::makeReadyFuture(42);
auto f = QtFuture::makeReadyValueFuture(42);
QBENCHMARK {
auto future =
f.then([](int) { throw std::runtime_error("error"); }).onFailed([] { return 0; });
@ -215,7 +215,7 @@ void tst_QFuture::thenOnFailed()
void tst_QFuture::thenOnFailedVoid()
{
auto f = QtFuture::makeReadyFuture();
auto f = QtFuture::makeReadyVoidFuture();
QBENCHMARK {
auto future = f.then([] { throw std::runtime_error("error"); }).onFailed([] {});
Q_UNUSED(future);

View File

@ -9,6 +9,8 @@
//#define USE_SEM_T
using namespace std::chrono_literals;
#if defined(Q_OS_UNIX)
#if !defined(USE_SEM_T)
# include <pthread.h>
@ -228,7 +230,8 @@ void tst_QMutex::contendedNative_data()
class NativeMutexThread : public QThread
{
NativeMutexType *mutex1, *mutex2;
int iterations, msleepDuration;
int iterations;
std::chrono::milliseconds msleepDuration;
bool use2mutexes;
public:
bool done;
@ -246,8 +249,8 @@ public:
NativeMutexLock(mutex1);
if (use2mutexes)
NativeMutexLock(mutex2);
if (msleepDuration >= 0)
msleep(msleepDuration);
if (msleepDuration >= 0ms)
sleep(msleepDuration);
if (use2mutexes)
NativeMutexUnlock(mutex2);
NativeMutexUnlock(mutex1);
@ -298,7 +301,8 @@ void tst_QMutex::contendedNative()
class QMutexThread : public QThread
{
QMutex *mutex1, *mutex2;
int iterations, msleepDuration;
int iterations;
std::chrono::milliseconds msleepDuration;
bool use2mutexes;
public:
bool done;
@ -316,8 +320,8 @@ public:
mutex1->lock();
if (use2mutexes)
mutex2->lock();
if (msleepDuration >= 0)
msleep(msleepDuration);
if (msleepDuration >= 0ms)
sleep(msleepDuration);
if (use2mutexes)
mutex2->unlock();
mutex1->unlock();
@ -363,7 +367,8 @@ void tst_QMutex::contendedQMutex()
class QMutexLockerThread : public QThread
{
QMutex *mutex1, *mutex2;
int iterations, msleepDuration;
int iterations;
std::chrono::milliseconds msleepDuration;
bool use2mutexes;
public:
bool done;
@ -381,8 +386,8 @@ public:
{
QMutexLocker locker1(mutex1);
QMutexLocker locker2(use2mutexes ? mutex2 : 0);
if (msleepDuration >= 0)
msleep(msleepDuration);
if (msleepDuration >= 0ms)
sleep(msleepDuration);
}
QThread::yieldCurrentThread();