diff options
Diffstat (limited to 'tests/auto')
3 files changed, 12 insertions, 17 deletions
diff --git a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp index 1b41055b4..90b48ba10 100644 --- a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp +++ b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp @@ -71,7 +71,7 @@ public: tst_ArrayResource() : m_value(0) {} - int m_value; + QAtomicInt m_value; }; typedef Qt3D::QHandle<tst_ArrayResource> tHandle; @@ -298,8 +298,7 @@ protected: tst_ArrayResource *r = m_manager->getOrCreateResource(i); i++; QVERIFY(r != Q_NULLPTR); - Manager::WriteLocker lock(m_manager); - r->m_value++; + r->m_value.fetchAndAddOrdered(+1); } qDebug() << QThread::currentThread() << "Done"; } @@ -370,9 +369,8 @@ protected: while (i < max) { tst_ArrayResource *r = m_manager->getOrCreateResource(i); QVERIFY(r != Q_NULLPTR); - Manager::WriteLocker lock(m_manager); - r->m_value++; - if (r->m_value > m_releaseAbove) + int oldValue = r->m_value.fetchAndAddOrdered(+1); + if (oldValue == m_releaseAbove) m_manager->releaseResource(i); i++; } diff --git a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp index b9c18d95e..ffdccf847 100644 --- a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp +++ b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp @@ -71,7 +71,7 @@ public: tst_ArrayResource() : m_value(0) {} - int m_value; + QAtomicInt m_value; }; typedef Qt3D::QHandle<tst_ArrayResource> tHandle; @@ -298,7 +298,7 @@ protected: tst_ArrayResource *r = m_manager->getOrCreateResource(i); i++; QVERIFY(r != Q_NULLPTR); - Manager::WriteLocker lock(m_manager); + Manager::Locker lock(m_manager); r->m_value++; } qDebug() << QThread::currentThread() << "Done"; @@ -370,9 +370,8 @@ protected: while (i < max) { tst_ArrayResource *r = m_manager->getOrCreateResource(i); QVERIFY(r != Q_NULLPTR); - Manager::WriteLocker lock(m_manager); - r->m_value++; - if (r->m_value > m_releaseAbove) + int oldValue = r->m_value.fetchAndAddOrdered(+1); + if (oldValue == m_releaseAbove) m_manager->releaseResource(i); i++; } diff --git a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp index b5bee9b88..abf695093 100644 --- a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp +++ b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp @@ -71,7 +71,7 @@ public: tst_ListResource() : m_value(0) {} - int m_value; + QAtomicInt m_value; }; typedef Qt3D::QHandle<tst_ListResource> tHandle; @@ -298,8 +298,7 @@ protected: tst_ListResource *r = m_manager->getOrCreateResource(i); i++; QVERIFY(r != Q_NULLPTR); - Manager::WriteLocker lock(m_manager); - r->m_value++; + r->m_value.fetchAndAddOrdered(+1); } qDebug() << QThread::currentThread() << "Done"; } @@ -371,9 +370,8 @@ protected: while (i < max) { tst_ListResource *r = m_manager->getOrCreateResource(i); QVERIFY(r != Q_NULLPTR); - Manager::WriteLocker lock(m_manager); - r->m_value++; - if (r->m_value > m_releaseAbove) + int oldValue = r->m_value.fetchAndAddOrdered(+1); + if (oldValue == m_releaseAbove) m_manager->releaseResource(i); i++; } |