7d257aab81
Introduce a transaction mechanism that gives the ability to read the data atomically. Current implementation supports transactions for both types of devices. For sequential devices, it records the whole input stream during transaction. For random-access devices, device position is saved when transaction starts. If an error occurs, the application may be able to recover the input stream by rolling back to the start point. Also, QIODevice::peek() was rewritten to make use of transactions internally. The replacement of QIODevicePrivateLinearBuffer by QRingBuffer is closely entangled with that, which makes it unfeasible to do separately. Bump the TypeInformationVersion field in qtHookData, to notify the Qt Creator developers that the offset of QFilePrivate::fileName was changed and dumpers should be adapted. [ChangeLog][QtCore] Added QIODevice's startTransaction(), commitTransaction(), rollbackTransaction(), isTransactionStarted() functions to support the read transactions. Task-number: QTBUG-44418 Change-Id: I3564b343ebeeaaf7c48a1dcdb7ef0a7ffec550f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
164 lines
5.2 KiB
C++
164 lines
5.2 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2015 The Qt Company Ltd.
|
|
** Contact: http://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** 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 http://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at http://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 2.1 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** As a special exception, The Qt Company gives you certain additional
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtTest>
|
|
|
|
//
|
|
// Note:
|
|
//
|
|
// When this test here fails and the change leading to the failure
|
|
// intentionally changed a private class, adjust the test here and bump
|
|
// the TypeInformationVersion field in src/corelib/global/qhooks.cpp
|
|
// in the same commit as the modification to the private class.
|
|
//
|
|
|
|
|
|
// Don't do this at home. This is test code, not production.
|
|
#define protected public
|
|
#define private public
|
|
|
|
#include <private/qdatetime_p.h>
|
|
#include <private/qfile_p.h>
|
|
#include <private/qfileinfo_p.h>
|
|
#include <private/qobject_p.h>
|
|
#include <qobject.h>
|
|
|
|
#if defined(Q_CC_GNU) || defined(Q_CC_MSVC)
|
|
#define RUN_MEMBER_OFFSET_TEST 1
|
|
#else
|
|
#define RUN_MEMBER_OFFSET_TEST 0
|
|
#endif
|
|
|
|
#if RUN_MEMBER_OFFSET_TEST
|
|
template <typename T, typename K>
|
|
size_t pmm_to_offsetof(T K:: *pmm)
|
|
{
|
|
#ifdef Q_CC_MSVC
|
|
// Even on 64 bit MSVC uses 4 byte offsets.
|
|
quint32 ret;
|
|
#else
|
|
size_t ret;
|
|
#endif
|
|
Q_STATIC_ASSERT(sizeof(ret) == sizeof(pmm));
|
|
memcpy(&ret, &pmm, sizeof(ret));
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
class tst_toolsupport : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private slots:
|
|
void offsets();
|
|
void offsets_data();
|
|
};
|
|
|
|
void tst_toolsupport::offsets()
|
|
{
|
|
QFETCH(size_t, actual);
|
|
QFETCH(int, expected32);
|
|
QFETCH(int, expected64);
|
|
size_t expect = sizeof(void *) == 4 ? expected32 : expected64;
|
|
QCOMPARE(actual, expect);
|
|
}
|
|
|
|
void tst_toolsupport::offsets_data()
|
|
{
|
|
QTest::addColumn<size_t>("actual");
|
|
QTest::addColumn<int>("expected32");
|
|
QTest::addColumn<int>("expected64");
|
|
|
|
{
|
|
QTestData &data = QTest::newRow("sizeof(QObjectData)")
|
|
<< sizeof(QObjectData);
|
|
data << 28 << 48; // vptr + 3 ptr + 2 int + ptr
|
|
}
|
|
|
|
#if RUN_MEMBER_OFFSET_TEST
|
|
{
|
|
QTestData &data = QTest::newRow("QObjectPrivate::extraData")
|
|
<< pmm_to_offsetof(&QObjectPrivate::extraData);
|
|
data << 28 << 48; // sizeof(QObjectData)
|
|
}
|
|
|
|
{
|
|
QTestData &data = QTest::newRow("QFileInfoPrivate::fileEntry")
|
|
<< pmm_to_offsetof(&QFileInfoPrivate::fileEntry);
|
|
data << 4 << 8;
|
|
}
|
|
|
|
{
|
|
QTestData &data = QTest::newRow("QFileSystemEntry::filePath")
|
|
<< pmm_to_offsetof(&QFileSystemEntry::m_filePath);
|
|
data << 0 << 0;
|
|
}
|
|
|
|
#ifdef Q_OS_LINUX
|
|
{
|
|
QTestData &data = QTest::newRow("QFilePrivate::fileName")
|
|
<< pmm_to_offsetof(&QFilePrivate::fileName);
|
|
data << 184 << 256;
|
|
}
|
|
#endif
|
|
|
|
{
|
|
#ifdef Q_OS_WIN
|
|
QTest::newRow("QDateTimePrivate::m_msecs")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 8 << 8;
|
|
QTest::newRow("QDateTimePrivate::m_spec")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_spec) << 16 << 16;
|
|
QTest::newRow("QDateTimePrivate::m_offsetFromUtc")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_offsetFromUtc) << 20 << 20;
|
|
QTest::newRow("QDateTimePrivate::m_timeZone")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_timeZone) << 24 << 24;
|
|
QTest::newRow("QDateTimePrivate::m_status")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_status) << 28 << 32;
|
|
#else
|
|
QTest::newRow("QDateTimePrivate::m_msecs")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 4 << 8;
|
|
QTest::newRow("QDateTimePrivate::m_spec")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_spec) << 12 << 16;
|
|
QTest::newRow("QDateTimePrivate::m_offsetFromUtc")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_offsetFromUtc) << 16 << 20;
|
|
QTest::newRow("QDateTimePrivate::m_timeZone")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_timeZone) << 20 << 24;
|
|
QTest::newRow("QDateTimePrivate::m_status")
|
|
<< pmm_to_offsetof(&QDateTimePrivate::m_status) << 24 << 32;
|
|
#endif
|
|
}
|
|
#endif // RUN_MEMBER_OFFSET_TEST
|
|
}
|
|
|
|
|
|
QTEST_APPLESS_MAIN(tst_toolsupport);
|
|
|
|
#include "tst_toolsupport.moc"
|
|
|