whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add reference-count manipulation functions to QArrayData and hide ref 

The next change will stop using some values in the reference counter as
settings from the data.

Change-Id: I94df1fe643896373fac2f000fff55bc7708fc807
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
bb10
Thiago Macieira 2012-06-11 19:42:05 +02:00 committed by Lars Knoll
parent a3aa2fcfa7
commit 62c673ccc6
16 changed files with 124 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qmetaobject.cpp
View File

@ -158,7 +158,7 @@ static inline const QByteArray stringData(const QMetaObject *mo, int index)
{
Q_ASSERT(priv(mo->d.data)->revision >= 7);
const QByteArrayDataPtr data = { const_cast<QByteArrayData*>(&mo->d.stringdata[index]) };
Q_ASSERT(data.ptr->ref.isStatic());
Q_ASSERT(data.ptr->isStatic());
Q_ASSERT(data.ptr->allocatedCapacity() == 0);
Q_ASSERT(data.ptr->size >= 0);
return data;

8
src/corelib/serialization/qbinaryjsonvalue.cpp
View File

@ -66,7 +66,7 @@ QBinaryJsonValue::QBinaryJsonValue(QBinaryJsonPrivate::MutableData *data,
case QJsonValue::String: {
QString s = v.toString(parent);
stringData = s.data_ptr();
stringData->ref.ref();
stringData->ref();
break;
}
case QJsonValue::Array:
@ -82,7 +82,7 @@ QBinaryJsonValue::QBinaryJsonValue(QBinaryJsonPrivate::MutableData *data,
QBinaryJsonValue::QBinaryJsonValue(QString string)
: stringData(*reinterpret_cast<QStringData **>(&string)), t(QJsonValue::String)
{
stringData->ref.ref();
stringData->ref();
}
QBinaryJsonValue::QBinaryJsonValue(const QBinaryJsonArray &a)
@ -101,7 +101,7 @@ QBinaryJsonValue::QBinaryJsonValue(const QBinaryJsonObject &o)
QBinaryJsonValue::~QBinaryJsonValue()
{
if (t == QJsonValue::String && stringData && !stringData->ref.deref())
if (t == QJsonValue::String && stringData && !stringData->deref())
free(stringData);
if (d && !d->ref.deref())
@ -134,7 +134,7 @@ QString QBinaryJsonValue::toString() const
{
if (t != QJsonValue::String)
return QString();
stringData->ref.ref(); // the constructor below doesn't add a ref.
stringData->ref(); // the constructor below doesn't add a ref.
QStringDataPtr holder = { stringData };
return QString(holder);
}

22
src/corelib/text/qbytearray.cpp
View File

@ -1184,8 +1184,8 @@ QByteArray qUncompress(const uchar* data, int nbytes)
*/
QByteArray &QByteArray::operator=(const QByteArray & other) noexcept
{
other.d->ref.ref();
if (!d->ref.deref())
other.d->ref();
if (!d->deref())
Data::deallocate(d);
d = other.d;
return *this;
@ -1215,8 +1215,8 @@ QByteArray &QByteArray::operator=(const char *str)
memcpy(x->data(), str, fullLen); // include null terminator
x->size = len;
}
x->ref.ref();
if (!d->ref.deref())
x->ref();
if (!d->deref())
Data::deallocate(d);
d = x;
return *this;
@ -1755,12 +1755,12 @@ void QByteArray::resize(int size)
if (size < 0)
size = 0;
if (!d->ref.isShared() && !d->isMutable() && size < d->size) {
if (!d->isShared() && !d->isMutable() && size < d->size) {
d->size = size;
return;
}
if (d->size == 0 && d->ref.isStatic()) {
if (d->size == 0 && d->isStatic()) {
//
// Optimize the idiom:
// QByteArray a;
@ -1811,7 +1811,7 @@ void QByteArray::reallocData(uint alloc, Data::ArrayOptions options)
x->size = qMin(int(alloc) - 1, d->size);
::memcpy(x->data(), d->data(), x->size);
x->data()[x->size] = '\0';
if (!d->ref.deref())
if (!d->deref())
Data::deallocate(d);
d = x;
} else {
@ -1869,7 +1869,7 @@ QByteArray QByteArray::nulTerminated() const
QByteArray &QByteArray::prepend(const QByteArray &ba)
{
if (d->size == 0 && d->ref.isStatic() && !IS_RAW_DATA(ba.d)) {
if (d->size == 0 && d->isStatic() && !IS_RAW_DATA(ba.d)) {
*this = ba;
} else if (ba.d->size != 0) {
QByteArray tmp = *this;
@ -1961,7 +1961,7 @@ QByteArray &QByteArray::prepend(char ch)
QByteArray &QByteArray::append(const QByteArray &ba)
{
if (d->size == 0 && d->ref.isStatic() && !IS_RAW_DATA(ba.d)) {
if (d->size == 0 && d->isStatic() && !IS_RAW_DATA(ba.d)) {
*this = ba;
} else if (ba.d->size != 0) {
if (d->needsDetach() || d->size + ba.d->size > capacity())
@ -3239,7 +3239,7 @@ QByteArray QByteArray::toUpper_helper(QByteArray &a)
void QByteArray::clear()
{
if (!d->ref.deref())
if (!d->deref())
Data::deallocate(d);
d = Data::sharedNull();
}
@ -4471,7 +4471,7 @@ QByteArray &QByteArray::setRawData(const char *data, uint size)
{
if (!data || !size) {
clear();
} else if (d->ref.isShared() || (d->flags & Data::RawDataType) == 0) {
} else if (d->isShared() || (d->flags & Data::RawDataType) == 0) {
*this = fromRawData(data, size);
} else {
d->size = size;

8
src/corelib/text/qbytearray.h
View File

@ -123,7 +123,7 @@ template<int N> struct QStaticByteArrayData
QByteArrayData *data_ptr() const
{
Q_ASSERT(ba.ref.isStatic());
Q_ASSERT(ba.isStatic());
return const_cast<QByteArrayData *>(&ba);
}
};
@ -469,7 +469,7 @@ public:
Q_DECLARE_OPERATORS_FOR_FLAGS(QByteArray::Base64Options)
inline QByteArray::QByteArray() noexcept : d(Data::sharedNull()) { }
inline QByteArray::~QByteArray() { if (!d->ref.deref()) Data::deallocate(d); }
inline QByteArray::~QByteArray() { if (!d->deref()) Data::deallocate(d); }
inline int QByteArray::size() const
{ return d->size; }
@ -497,9 +497,9 @@ inline const char *QByteArray::constData() const
inline void QByteArray::detach()
{ if (d->needsDetach()) reallocData(uint(d->size) + 1u, d->detachFlags()); }
inline bool QByteArray::isDetached() const
{ return !d->ref.isShared(); }
{ return !d->isShared(); }
inline QByteArray::QByteArray(const QByteArray &a) noexcept : d(a.d)
{ d->ref.ref(); }
{ d->ref(); }
inline int QByteArray::capacity() const
{ int realCapacity = d->constAllocatedCapacity(); return realCapacity ? realCapacity - 1 : 0; }

14
src/corelib/text/qstring.cpp
View File

@ -2265,7 +2265,7 @@ void QString::resize(int size)
if (size < 0)
size = 0;
if (!d->ref.isShared() && !d->isMutable() && size < d->size) {
if (!d->isShared() && !d->isMutable() && size < d->size) {
d->size = size;
return;
}
@ -2359,7 +2359,7 @@ void QString::reallocData(uint alloc, bool grow)
x->size = qMin(int(alloc) - 1, d->size);
::memcpy(x->data(), d->data(), x->size * sizeof(QChar));
x->data()[x->size] = 0;
if (!d->ref.deref())
if (!d->deref())
Data::deallocate(d);
d = x;
} else {
@ -2391,8 +2391,8 @@ void QString::expand(int i)
QString &QString::operator=(const QString &other) noexcept
{
other.d->ref.ref();
if (!d->ref.deref())
other.d->ref();
if (!d->deref())
Data::deallocate(d);
d = other.d;
return *this;
@ -2677,7 +2677,7 @@ QString &QString::append(const QString &str)
QString &QString::append(const QChar *str, int len)
{
if (str && len > 0) {
if (d->ref.isShared() || uint(d->size + len) + 1u > d->allocatedCapacity())
if (d->isShared() || uint(d->size + len) + 1u > d->allocatedCapacity())
reallocData(uint(d->size + len) + 1u, true);
memcpy(d->data() + d->size, str, len * sizeof(QChar));
d->size += len;
@ -5372,7 +5372,7 @@ QString::Data *QString::fromLatin1_helper(const char *str, int size)
QString::Data *QString::fromAscii_helper(const char *str, int size)
{
QString s = fromUtf8(str, size);
s.d->ref.ref();
s.d->ref();
return s.d;
}
@ -9151,7 +9151,7 @@ QString &QString::setRawData(const QChar *unicode, int size)
{
if (!unicode || !size) {
clear();
} else if (d->ref.isShared() || !IS_RAW_DATA(d)) {
} else if (d->isShared() || !IS_RAW_DATA(d)) {
*this = fromRawData(unicode, size);
} else {
d->size = size;

8
src/corelib/text/qstring.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2016 Intel Corporation.
** Copyright (C) 2019 Intel Corporation.
** Copyright (C) 2019 Mail.ru Group.
** Contact: https://www.qt.io/licensing/
**
@ -1043,11 +1043,11 @@ inline const QChar *QString::constData() const
inline void QString::detach()
{ if (d->needsDetach()) reallocData(uint(d->size) + 1u); }
inline bool QString::isDetached() const
{ return !d->ref.isShared(); }
{ return !d->isShared(); }
inline void QString::clear()
{ if (!isNull()) *this = QString(); }
inline QString::QString(const QString &other) noexcept : d(other.d)
{ Q_ASSERT(&other != this); d->ref.ref(); }
{ Q_ASSERT(&other != this); d->ref(); }
inline int QString::capacity() const
{ int realCapacity = d->constAllocatedCapacity(); return realCapacity ? realCapacity - 1 : 0; }
inline QString &QString::setNum(short n, int base)
@ -1259,7 +1259,7 @@ inline void QCharRef::setCell(uchar acell) { QChar(*this).setCell(acell); }
inline QString::QString() noexcept : d(Data::sharedNull()) {}
inline QString::~QString() { if (!d->ref.deref()) Data::deallocate(d); }
inline QString::~QString() { if (!d->deref()) Data::deallocate(d); }
inline void QString::reserve(int asize)
{

2
src/corelib/text/qstringliteral.h
View File

@ -94,7 +94,7 @@ struct QStaticStringData
QStringData *data_ptr() const
{
Q_ASSERT(str.ref.isStatic());
Q_ASSERT(str.isStatic());
return const_cast<QStringData *>(static_cast<const QStringData*>(&str));
}
};

6
src/corelib/tools/qarraydata.cpp
View File

@ -183,7 +183,7 @@ static QArrayData *allocateData(size_t allocSize, uint options)
{
QArrayData *header = static_cast<QArrayData *>(::malloc(allocSize));
if (header) {
header->ref.atomic.storeRelaxed(1);
header->ref_.atomic.storeRelaxed(1);
header->flags = options;
header->size = 0;
}
@ -247,7 +247,7 @@ QArrayData *QArrayData::reallocateUnaligned(QArrayData *data, size_t objectSize,
{
Q_ASSERT(data);
Q_ASSERT(data->isMutable());
Q_ASSERT(!data->ref.isShared());
Q_ASSERT(!data->isShared());
options |= ArrayOption(AllocatedDataType);
size_t headerSize = sizeof(QArrayData);
@ -267,7 +267,7 @@ void QArrayData::deallocate(QArrayData *data, size_t objectSize,
&& !(alignment & (alignment - 1)));
Q_UNUSED(objectSize) Q_UNUSED(alignment)
Q_ASSERT_X(data == 0 || !data->ref.isStatic(), "QArrayData::deallocate",
Q_ASSERT_X(data == 0 || !data->isStatic(), "QArrayData::deallocate",
"Static data cannot be deleted");
::free(data);
}

26
src/corelib/tools/qarraydata.h
View File

@ -67,7 +67,7 @@ struct Q_CORE_EXPORT QArrayData
};
Q_DECLARE_FLAGS(ArrayOptions, ArrayOption)
QtPrivate::RefCount ref;
QtPrivate::RefCount ref_;
uint flags;
int size;
uint alloc;
@ -84,6 +84,16 @@ struct Q_CORE_EXPORT QArrayData
return alloc;
}
bool ref()
{
return ref_.ref();
}
bool deref()
{
return ref_.deref();
}
void *data()
{
Q_ASSERT(size == 0
@ -106,13 +116,23 @@ struct Q_CORE_EXPORT QArrayData
return flags & Mutable;
}
bool isStatic() const
{
return ref_.isStatic();
}
bool isShared() const
{
return ref_.isShared();
}
// Returns true if a detach is necessary before modifying the data
// This method is intentionally not const: if you want to know whether
// detaching is necessary, you should be in a non-const function already
bool needsDetach()
{
// ### optimize me -- this currently requires 3 conditionals!
return !isMutable() || ref.isShared();
return !isMutable() || isShared();
}
size_t detachCapacity(size_t newSize) const
@ -290,7 +310,7 @@ struct QTypedArrayData
Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
QTypedArrayData *result = static_cast<QTypedArrayData *>(prepareRawData(options));
if (result) {
Q_ASSERT(!result->ref.isShared()); // No shared empty, please!
Q_ASSERT(!result->isShared()); // No shared empty, please!
result->offset = reinterpret_cast<const char *>(data)
- reinterpret_cast<const char *>(result);

26
src/corelib/tools/qarraydataops.h
View File

@ -61,7 +61,7 @@ struct QPodArrayOps
void appendInitialize(size_t newSize)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(newSize > uint(this->size));
Q_ASSERT(newSize <= this->allocatedCapacity());
@ -72,7 +72,7 @@ struct QPodArrayOps
void copyAppend(const T *b, const T *e)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(b < e);
Q_ASSERT(e - b <= this->allocatedCapacity() - this->size);
@ -84,7 +84,7 @@ struct QPodArrayOps
void copyAppend(size_t n, const T &t)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(n <= uint(this->allocatedCapacity() - this->size));
T *iter = this->end();
@ -97,7 +97,7 @@ struct QPodArrayOps
void truncate(size_t newSize)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(newSize < size_t(this->size));
this->size = int(newSize);
@ -106,7 +106,7 @@ struct QPodArrayOps
void destroyAll() // Call from destructors, ONLY!
{
Q_ASSERT(this->isMutable());
Q_ASSERT(this->ref.atomic.loadRelaxed() == 0);
Q_ASSERT(this->ref_.atomic.loadRelaxed() == 0);
// As this is to be called only from destructor, it doesn't need to be
// exception safe; size not updated.
@ -115,7 +115,7 @@ struct QPodArrayOps
void insert(T *where, const T *b, const T *e)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(where >= this->begin() && where < this->end()); // Use copyAppend at end
Q_ASSERT(b < e);
Q_ASSERT(e <= where || b > this->end()); // No overlap
@ -148,7 +148,7 @@ struct QGenericArrayOps
void appendInitialize(size_t newSize)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(newSize > uint(this->size));
Q_ASSERT(newSize <= this->allocatedCapacity());
@ -161,7 +161,7 @@ struct QGenericArrayOps
void copyAppend(const T *b, const T *e)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(b < e);
Q_ASSERT(e - b <= this->allocatedCapacity() - this->size);
@ -175,7 +175,7 @@ struct QGenericArrayOps
void copyAppend(size_t n, const T &t)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(n <= size_t(this->allocatedCapacity() - this->size));
T *iter = this->end();
@ -189,7 +189,7 @@ struct QGenericArrayOps
void truncate(size_t newSize)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(newSize < size_t(this->size));
const T *const b = this->begin();
@ -204,7 +204,7 @@ struct QGenericArrayOps
// As this is to be called only from destructor, it doesn't need to be
// exception safe; size not updated.
Q_ASSERT(this->ref.atomic.loadRelaxed() == 0);
Q_ASSERT(this->ref_.atomic.loadRelaxed() == 0);
const T *const b = this->begin();
const T *i = this->end();
@ -216,7 +216,7 @@ struct QGenericArrayOps
void insert(T *where, const T *b, const T *e)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(where >= this->begin() && where < this->end()); // Use copyAppend at end
Q_ASSERT(b < e);
Q_ASSERT(e <= where || b > this->end()); // No overlap
@ -312,7 +312,7 @@ struct QMovableArrayOps
void insert(T *where, const T *b, const T *e)
{
Q_ASSERT(this->isMutable());
Q_ASSERT(!this->ref.isShared());
Q_ASSERT(!this->isShared());
Q_ASSERT(where >= this->begin() && where < this->end()); // Use copyAppend at end
Q_ASSERT(b < e);
Q_ASSERT(e <= where || b > this->end()); // No overlap

4
src/corelib/tools/qarraydatapointer.h
View File

@ -58,7 +58,7 @@ public:
}
QArrayDataPointer(const QArrayDataPointer &other)
: d(other.d->ref.ref()
: d(other.d->ref()
? other.d
: other.clone(other.d->cloneFlags()))
{
@ -109,7 +109,7 @@ public:
~QArrayDataPointer()
{
if (!d->ref.deref()) {
if (!d->deref()) {
if (d->isMutable())
(*this)->destroyAll();
Data::deallocate(d);

20
src/corelib/tools/qvector.h
View File

@ -89,7 +89,7 @@ public:
explicit QVector(int size);
QVector(int size, const T &t);
inline QVector(const QVector<T> &v);
inline ~QVector() { if (!d->ref.deref()) freeData(d); }
inline ~QVector() { if (!d->deref()) freeData(d); }
QVector<T> &operator=(const QVector<T> &v);
QVector(QVector<T> &&other) noexcept : d(other.d) { other.d = Data::sharedNull(); }
QVector<T> &operator=(QVector<T> &&other) noexcept
@ -114,17 +114,17 @@ public:
void reserve(int size);
inline void squeeze()
{
if (d->size < int(d->alloc)) {
if (d->size < int(d->allocatedCapacity())) {
if (!d->size) {
*this = QVector<T>();
return;
}
realloc(d->size, QArrayData::ArrayOptions(d->flags));
realloc(d->size, d->detachFlags());
}
}
inline void detach();
inline bool isDetached() const { return !d->ref.isShared(); }
inline bool isDetached() const { return !d->isShared(); }
inline bool isSharedWith(const QVector<T> &other) const { return d == other.d; }
@ -365,7 +365,7 @@ void QVector<T>::destruct(T *from, T *to)
template <typename T>
inline QVector<T>::QVector(const QVector<T> &v)
{
if (v.d->ref.ref()) {
if (v.d->ref()) {
d = v.d;
} else {
if (v.d->flags & Data::CapacityReserved) {
@ -391,7 +391,7 @@ template <typename T>
void QVector<T>::detach()
{
// ### check whether this is still required
if (d->ref.isStatic())
if (d->isStatic())
return;
if (d->needsDetach())
@ -581,14 +581,14 @@ void QVector<T>::realloc(int aalloc, QArrayData::ArrayOptions options)
Q_ASSERT(aalloc >= d->size);
Data *x = d;
const bool isShared = d->ref.isShared();
const bool isShared = d->isShared();
QT_TRY {
// allocate memory
x = Data::allocate(aalloc, options);
Q_CHECK_PTR(x);
// aalloc is bigger then 0 so it is not [un]sharedEmpty
Q_ASSERT(!x->ref.isStatic());
Q_ASSERT(!x->isStatic());
x->size = d->size;
T *srcBegin = d->begin();
@ -621,7 +621,7 @@ void QVector<T>::realloc(int aalloc, QArrayData::ArrayOptions options)
}
Q_ASSERT(d != x);
if (!d->ref.deref()) {
if (!d->deref()) {
if (!QTypeInfoQuery<T>::isRelocatable || !aalloc || (isShared && QTypeInfo<T>::isComplex)) {
// data was copy constructed, we need to call destructors
// or if !alloc we did nothing to the old 'd'.
@ -701,7 +701,7 @@ void QVector<T>::removeLast()
Q_ASSERT(!isEmpty());
Q_ASSERT(d->allocatedCapacity());
if (d->ref.isShared())
if (d->isShared())
detach();
--d->size;
if (QTypeInfo<T>::isComplex)

6
tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
View File

@ -189,7 +189,7 @@ QByteArray verifyZeroTermination(const QByteArray &ba)
QByteArray::DataPtr baDataPtr = const_cast<QByteArray &>(ba).data_ptr();
// Skip if isStatic() or fromRawData(), as those offer no guarantees
if (baDataPtr->ref.isStatic()
if (baDataPtr->isStatic()
|| baDataPtr->offset != QByteArray().data_ptr()->offset)
return ba;
@ -201,7 +201,7 @@ QByteArray verifyZeroTermination(const QByteArray &ba)
.arg(baTerminator, 2, 16, QChar('0')).toLatin1();
// Skip mutating checks on shared strings
if (baDataPtr->ref.isShared())
if (baDataPtr->isShared())
return ba;
const char *baData = ba.constData();
@ -2198,7 +2198,7 @@ void tst_QByteArray::literals()
QVERIFY(str.length() == 4);
QVERIFY(str == "abcd");
QVERIFY(str.data_ptr()->ref.isStatic());
QVERIFY(str.data_ptr()->isStatic());
QVERIFY(str.data_ptr()->offset == sizeof(QByteArrayData));
const char *s = str.constData();

6
tests/auto/corelib/text/qstring/tst_qstring.cpp
View File

@ -608,7 +608,7 @@ QString verifyZeroTermination(const QString &str)
QString::DataPtr strDataPtr = const_cast<QString &>(str).data_ptr();
// Skip if isStatic() or fromRawData(), as those offer no guarantees
if (strDataPtr->ref.isStatic()
if (strDataPtr->isStatic()
|| strDataPtr->offset != QString().data_ptr()->offset)
return str;
@ -620,7 +620,7 @@ QString verifyZeroTermination(const QString &str)
.arg(strTerminator.unicode(), 4, 16, QChar('0'));
// Skip mutating checks on shared strings
if (strDataPtr->ref.isShared())
if (strDataPtr->isShared())
return str;
const QChar *strData = str.constData();
@ -6637,7 +6637,7 @@ void tst_QString::literals()
QVERIFY(str.length() == 4);
QVERIFY(str == QLatin1String("abcd"));
QVERIFY(str.data_ptr()->ref.isStatic());
QVERIFY(str.data_ptr()->isStatic());
QVERIFY(str.data_ptr()->offset == sizeof(QStringData));
const QChar *s = str.constData();

6
tests/auto/corelib/tools/qarraydata/simplevector.h
View File

@ -85,8 +85,8 @@ public:
bool isNull() const { return d.isNull(); }
bool isEmpty() const { return this->empty(); }
bool isStatic() const { return d->ref.isStatic(); }
bool isShared() const { return d->ref.isShared(); }
bool isStatic() const { return d->isStatic(); }
bool isShared() const { return d->isShared(); }
bool isSharedWith(const SimpleVector &other) const { return d == other.d; }
size_t size() const { return d->size; }
@ -141,7 +141,7 @@ public:
if (n <= capacity()) {
if (d->flags & Data::CapacityReserved)
return;
if (!d->ref.isShared()) {
if (!d->isShared()) {
d->flags |= Data::CapacityReserved;
return;
}

67
tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
View File

@ -37,8 +37,8 @@ struct SharedNullVerifier
{
SharedNullVerifier()
{
Q_ASSERT(QArrayData::shared_null[0].ref.isStatic());
Q_ASSERT(QArrayData::shared_null[0].ref.isShared());
Q_ASSERT(QArrayData::shared_null[0].isStatic());
Q_ASSERT(QArrayData::shared_null[0].isShared());
}
};
@ -86,24 +86,24 @@ void tst_QArrayData::referenceCounting()
// Reference counting initialized to 1 (owned)
QArrayData array = { { Q_BASIC_ATOMIC_INITIALIZER(1) }, QArrayData::DefaultRawFlags, 0, 0, 0 };
QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
QCOMPARE(array.ref_.atomic.loadRelaxed(), 1);
QVERIFY(!array.ref.isStatic());
QVERIFY(!array.isStatic());
QVERIFY(array.ref.ref());
QCOMPARE(array.ref.atomic.loadRelaxed(), 2);
QVERIFY(array.ref());
QCOMPARE(array.ref_.atomic.loadRelaxed(), 2);
QVERIFY(array.ref.deref());
QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
QVERIFY(array.deref());
QCOMPARE(array.ref_.atomic.loadRelaxed(), 1);
QVERIFY(array.ref.ref());
QCOMPARE(array.ref.atomic.loadRelaxed(), 2);
QVERIFY(array.ref());
QCOMPARE(array.ref_.atomic.loadRelaxed(), 2);
QVERIFY(array.ref.deref());
QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
QVERIFY(array.deref());
QCOMPARE(array.ref_.atomic.loadRelaxed(), 1);
QVERIFY(!array.ref.deref());
QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
QVERIFY(!array.deref());
QCOMPARE(array.ref_.atomic.loadRelaxed(), 0);
// Now would be a good time to free/release allocated data
}
@ -111,15 +111,15 @@ void tst_QArrayData::referenceCounting()
// Reference counting initialized to -1 (static read-only data)
QArrayData array = { Q_REFCOUNT_INITIALIZE_STATIC, QArrayData::StaticDataFlags, 0, 0, 0 };
QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
QCOMPARE(array.ref_.atomic.loadRelaxed(), -1);
QVERIFY(array.ref.isStatic());
QVERIFY(array.isStatic());
QVERIFY(array.ref.ref());
QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
QVERIFY(array.ref());
QCOMPARE(array.ref_.atomic.loadRelaxed(), -1);
QVERIFY(array.ref.deref());
QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
QVERIFY(array.deref());
QCOMPARE(array.ref_.atomic.loadRelaxed(), -1);
}
}
@ -129,26 +129,23 @@ void tst_QArrayData::sharedNullEmpty()
QArrayData *null = const_cast<QArrayData *>(QArrayData::shared_null);
QArrayData *empty = QArrayData::allocate(1, alignof(QArrayData), 0);
QVERIFY(null->ref.isStatic());
QVERIFY(null->ref.isShared());
QVERIFY(null->isStatic());
QVERIFY(null->isShared());
QVERIFY(empty->ref.isStatic());
QVERIFY(empty->ref.isShared());
QVERIFY(empty->isStatic());
QVERIFY(empty->isShared());
QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
QCOMPARE(null->ref_.atomic.loadRelaxed(), -1);
QCOMPARE(empty->ref_.atomic.loadRelaxed(), -1);
QVERIFY(null->ref.ref());
QVERIFY(empty->ref.ref());
QCOMPARE(null->ref_.atomic.loadRelaxed(), -1);
QCOMPARE(empty->ref_.atomic.loadRelaxed(), -1);
QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
QVERIFY(null->deref());
QVERIFY(empty->deref());
QVERIFY(null->ref.deref());
QVERIFY(empty->ref.deref());
QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
QCOMPARE(null->ref_.atomic.loadRelaxed(), -1);
QCOMPARE(empty->ref_.atomic.loadRelaxed(), -1);
QVERIFY(null != empty);