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

ios: change file engine caching logic for loading assets

Browse Source 
The current caching strategy had a flaw in that it tried
to lazy-lock the mutex only if g_currentAssetData was non-zero.
For this to be somewhat reliable, g_currentAssetData would have
to be volatile. But that would still not be enough since
thread-unaware code optimizations might also happen on the CPU level.

Instead of complicating the current logic more, change it to
only do caching per thread. Since QThreadStorage will take ownership
of its data, we can't let it store a pointer to QIOSAssetData directly
since we need to control the life time of QIOSAssetData using deleteLater.

Change-Id: I2c3ffb3257ec2bdec8be71a3d63f666ab33b5277
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
This commit is contained in:
Richard Moe Gustavsen 2015-04-27 13:41:40 +02:00
parent 52c122e616
commit 6eaee855c7
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/platforms/ios/qiosfileengineassetslibrary.mm
View File

@ -43,6 +43,7 @@
#include <QtCore/qthreadstorage.h> #include <QtCore/qthreadstorage.h>
static QThreadStorage<QString> g_iteratorCurrentUrl; static QThreadStorage<QString> g_iteratorCurrentUrl;
static QThreadStorage<QPointer<QIOSAssetData> > g_assetDataCache;
static const int kBufferSize = 10; static const int kBufferSize = 10;
static ALAsset *kNoAsset = 0; static ALAsset *kNoAsset = 0;
@ -187,16 +188,14 @@ public:
{ {
ensureAuthorizationDialogNotBlocked(); ensureAuthorizationDialogNotBlocked();
if (g_currentAssetData) { if (QIOSAssetData *assetData = g_assetDataCache.localData()) {
// It's a common pattern that QFiles pointing to the same path are created and destroyed // It's a common pattern that QFiles pointing to the same path are created and destroyed
// several times during a single event loop cycle. To avoid loading the same asset // several times during a single event loop cycle. To avoid loading the same asset
// over and over, we check if the last loaded asset has not been destroyed yet, and try to // over and over, we check if the last loaded asset has not been destroyed yet, and try to
// reuse its data. Since QFile is (mostly) reentrant, we need to protect m_currentAssetData // reuse its data.
// from being modified by several threads at the same time. if (assetData->m_assetUrl == assetUrl) {
QMutexLocker lock(&g_mutex); m_assetLibrary = [assetData->m_assetLibrary retain];
if (g_currentAssetData && g_currentAssetData->m_assetUrl == assetUrl) { m_asset = [assetData->m_asset retain];
m_assetLibrary = [g_currentAssetData->m_assetLibrary retain];
m_asset = [g_currentAssetData->m_asset retain];
return; return;
} }
} }
@ -243,17 +242,15 @@ public:
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
dispatch_release(semaphore); dispatch_release(semaphore);
QMutexLocker lock(&g_mutex); g_assetDataCache.setLocalData(this);
g_currentAssetData = this;
} }
~QIOSAssetData() ~QIOSAssetData()
{ {
QMutexLocker lock(&g_mutex);
[m_assetLibrary release]; [m_assetLibrary release];
[m_asset release]; [m_asset release];
if (this == g_currentAssetData) if (g_assetDataCache.localData() == this)
g_currentAssetData = 0; g_assetDataCache.setLocalData(0);
} }
ALAsset *m_asset; ALAsset *m_asset;
@ -261,14 +258,8 @@ public:
private: private:
QString m_assetUrl; QString m_assetUrl;
ALAssetsLibrary *m_assetLibrary; ALAssetsLibrary *m_assetLibrary;
static QBasicMutex g_mutex;
static QPointer<QIOSAssetData> g_currentAssetData;
}; };
QBasicMutex QIOSAssetData::g_mutex;
QPointer<QIOSAssetData> QIOSAssetData::g_currentAssetData = 0;
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
#ifndef QT_NO_FILESYSTEMITERATOR #ifndef QT_NO_FILESYSTEMITERATOR