Only use one single lock

qgis · Sep 7, 2018 · ea15e44 · ea15e44
1 parent e41680a
commit ea15e44
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp
@@ -70,7 +70,7 @@ QgsFeatureIds QgsFeaturePool::getFeatureIds() const
 
 QgsFeatureIds QgsFeaturePool::getIntersects( const QgsRectangle &rect ) const
 {
-  QgsReadWriteLocker locker( mIndexLock, QgsReadWriteLocker::Read );
+  QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Read );
   QgsFeatureIds ids = QgsFeatureIds::fromList( mIndex.intersects( rect ) );
   return ids;
 }
@@ -84,14 +84,14 @@ QgsVectorLayer *QgsFeaturePool::layer() const
 
 void QgsFeaturePool::insertFeature( const QgsFeature &feature )
 {
-  QgsReadWriteLocker locker( mIndexLock, QgsReadWriteLocker::Write );
+  QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Write );
   mFeatureCache.insert( feature.id(), new QgsFeature( feature ) );
   mIndex.insertFeature( feature );
 }
 
 void QgsFeaturePool::refreshCache( const QgsFeature &feature )
 {
-  QgsReadWriteLocker locker( mIndexLock, QgsReadWriteLocker::Write );
+  QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Write );
   mFeatureCache.remove( feature.id() );
   mIndex.deleteFeature( feature );
   locker.unlock();
@@ -103,7 +103,7 @@ void QgsFeaturePool::refreshCache( const QgsFeature &feature )
 void QgsFeaturePool::removeFeature( const QgsFeatureId featureId )
 {
   QgsFeature origFeature;
-  QgsReadWriteLocker locker( mIndexLock, QgsReadWriteLocker::Unlocked );
+  QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Unlocked );
   if ( get( featureId, origFeature ) )
   {
     locker.changeMode( QgsReadWriteLocker::Write );

diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.h b/src/analysis/vector/geometry_checker/qgsfeaturepool.h
@@ -132,9 +132,8 @@ class ANALYSIS_EXPORT QgsFeaturePool : public QgsFeatureSink
     static const int CACHE_SIZE = 1000;
     QCache<QgsFeatureId, QgsFeature> mFeatureCache;
     QPointer<QgsVectorLayer> mLayer;
-    QReadWriteLock mCacheLock;
+    mutable QReadWriteLock mCacheLock;
     QgsFeatureIds mFeatureIds;
-    mutable QReadWriteLock mIndexLock;
     QgsSpatialIndex mIndex;
     double mLayerToMapUnits = 1.0;
     QgsCoordinateTransform mLayerToMapTransform;