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

QResource: consistently cache resourceList()

Browse Source 
Each call to reourceList() uses atomic operations to check whether
resourceGLobalData has not expired, yet.

Some functions already cached the value, but then went on to use the
function directly afterwards. In some cases, this was due to the
cached value being a pointer-to-const and the function later deciding
to mutate the list. But all the code is safe from detaches, so this
distinction need not be made.

Standardize on caching, and using the cached value, except in
functions which call it only once.

Change-Id: I79780b990da539bf7beaa8104e13cb8187f84812
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2019-07-23 08:38:47 +03:00
parent 231b70c294
commit 6e8dd46a6f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/io/qresource.cpp
View File

@ -951,11 +951,12 @@ Q_CORE_EXPORT bool qRegisterResourceData(int version, const unsigned char *tree,
if (resourceGlobalData.isDestroyed()) if (resourceGlobalData.isDestroyed())
return false; return false;
QMutexLocker lock(resourceMutex()); QMutexLocker lock(resourceMutex());
ResourceList *list = resourceList();
if (version >= 0x01 && version <= 0x3) { if (version >= 0x01 && version <= 0x3) {
bool found = false; bool found = false;
QResourceRoot res(version, tree, name, data); QResourceRoot res(version, tree, name, data);
for(int i = 0; i < resourceList()->size(); ++i) { for (int i = 0; i < list->size(); ++i) {
if(*resourceList()->at(i) == res) { if (*list->at(i) == res) {
found = true; found = true;
break; break;
} }
@ -963,7 +964,7 @@ Q_CORE_EXPORT bool qRegisterResourceData(int version, const unsigned char *tree,
if(!found) { if(!found) {
QResourceRoot *root = new QResourceRoot(version, tree, name, data); QResourceRoot *root = new QResourceRoot(version, tree, name, data);
root->ref.ref(); root->ref.ref();
resourceList()->append(root); list->append(root);
} }
return true; return true;
} }
@ -979,9 +980,10 @@ Q_CORE_EXPORT bool qUnregisterResourceData(int version, const unsigned char *tre
QMutexLocker lock(resourceMutex()); QMutexLocker lock(resourceMutex());
if (version >= 0x01 && version <= 0x3) { if (version >= 0x01 && version <= 0x3) {
QResourceRoot res(version, tree, name, data); QResourceRoot res(version, tree, name, data);
for(int i = 0; i < resourceList()->size(); ) { ResourceList *list = resourceList();
if(*resourceList()->at(i) == res) { for (int i = 0; i < list->size(); ) {
QResourceRoot *root = resourceList()->takeAt(i); if (*list->at(i) == res) {
QResourceRoot *root = list->takeAt(i);
if(!root->ref.deref()) if(!root->ref.deref())
delete root; delete root;
} else { } else {
@ -1227,7 +1229,7 @@ QResource::unregisterResource(const QString &rccFilename, const QString &resourc
if(res->type() == QResourceRoot::Resource_File) { if(res->type() == QResourceRoot::Resource_File) {
QDynamicFileResourceRoot *root = reinterpret_cast<QDynamicFileResourceRoot*>(res); QDynamicFileResourceRoot *root = reinterpret_cast<QDynamicFileResourceRoot*>(res);
if (root->mappingFile() == rccFilename && root->mappingRoot() == r) { if (root->mappingFile() == rccFilename && root->mappingRoot() == r) {
resourceList()->removeAt(i); list->removeAt(i);
if(!root->ref.deref()) { if(!root->ref.deref()) {
delete root; delete root;
return true; return true;
@ -1298,7 +1300,7 @@ QResource::unregisterResource(const uchar *rccData, const QString &resourceRoot)
if(res->type() == QResourceRoot::Resource_Buffer) { if(res->type() == QResourceRoot::Resource_Buffer) {
QDynamicBufferResourceRoot *root = reinterpret_cast<QDynamicBufferResourceRoot*>(res); QDynamicBufferResourceRoot *root = reinterpret_cast<QDynamicBufferResourceRoot*>(res);
if (root->mappingBuffer() == rccData && root->mappingRoot() == r) { if (root->mappingBuffer() == rccData && root->mappingRoot() == r) {
resourceList()->removeAt(i); list->removeAt(i);
if(!root->ref.deref()) { if(!root->ref.deref()) {
delete root; delete root;
return true; return true;