1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFile benchmark: always use Unbuffered for QFSFileEngine tests

Browse Source 
Support for buffered usage with QFSFileEngine was dropped in 5.10;
trying to use it triggers an assert.

Task-number: QTBUG-91713
Pick-to: 5.15 6.1 6.2
Change-Id: I5f46e9f793310538344b96bf2efbeba34098de83
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Edward Welbourne 2021-07-05 17:59:29 +02:00
parent 74e9b77f4f
commit f74b2e3479
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/benchmarks/corelib/io/qfile/main.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the test suite of the Qt Toolkit. ** This file is part of the test suite of the Qt Toolkit.
@ -193,9 +193,8 @@ void tst_qfile::readBigFile_QFile_data()
void tst_qfile::readBigFile_QFSFileEngine_data() void tst_qfile::readBigFile_QFSFileEngine_data()
{ {
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
readBigFile_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::NotOpen); // Support for buffering dropped at 5.10, so only test Unbuffered
readBigFile_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::Unbuffered); readBigFile_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::Unbuffered);
readBigFile_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::NotOpen);
readBigFile_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::Unbuffered); readBigFile_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::Unbuffered);
#else #else
QTest::addColumn<int>("dummy"); QTest::addColumn<int>("dummy");
@ -356,7 +355,7 @@ void tst_qfile::seek()
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
case(QFSFileEngineBenchmark): { case(QFSFileEngineBenchmark): {
QFSFileEngine fse(filename); QFSFileEngine fse(filename);
fse.open(QIODevice::ReadOnly); fse.open(QIODevice::ReadOnly | QIODevice::Unbuffered);
QBENCHMARK { QBENCHMARK {
i=(i+1)%sp_size; i=(i+1)%sp_size;
fse.seek(seekpos[i]); fse.seek(seekpos[i]);
@ -437,7 +436,7 @@ void tst_qfile::open()
case(QFSFileEngineBenchmark): { case(QFSFileEngineBenchmark): {
QBENCHMARK { QBENCHMARK {
QFSFileEngine fse(filename); QFSFileEngine fse(filename);
fse.open(QIODevice::ReadOnly); fse.open(QIODevice::ReadOnly | QIODevice::Unbuffered);
fse.close(); fse.close();
} }
} }
@ -521,9 +520,8 @@ void tst_qfile::readSmallFiles_QFile_data()
void tst_qfile::readSmallFiles_QFSFileEngine_data() void tst_qfile::readSmallFiles_QFSFileEngine_data()
{ {
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::NotOpen); // Support for buffering dropped at 5.10, so only test Unbuffered
readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::Unbuffered); readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::Unbuffered);
readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::NotOpen);
readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::Unbuffered); readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::Unbuffered);
#else #else
QTest::addColumn<int>("dummy"); QTest::addColumn<int>("dummy");