[afs] Don't lock shared data whilst fetching remote data

nyalldawson · nyalldawson · commit 706266804e4a · 2018-02-20T13:20:38.000+10:00
Since the fetch can be slow, there's no need to lock other
afs threads while we wait for a particular set of results to
be fetched.
diff --git a/src/providers/arcgisrest/qgsafsshareddata.cpp b/src/providers/arcgisrest/qgsafsshareddata.cpp
@@ -62,6 +62,9 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, const QgsRect
     return false;
   }
 
+  // don't lock while doing the fetch
+  locker.unlock();
+
   // Query
   QString errorTitle, errorMessage;
   const QVariantMap queryData = QgsArcGisRestUtils::getObjects(
@@ -75,6 +78,8 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, const QgsRect
     return false;
   }
 
+  // but re-lock while updating cache
+  locker.relock();
   const QVariantList featuresData = queryData[QStringLiteral( "features" )].toList();
   if ( featuresData.isEmpty() )
   {

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, const QgsRect`
`62`	`62`	`return false;`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ // don't lock while doing the fetch`
	`66`	`+ locker.unlock();`
	`67`	`+`
`65`	`68`	`// Query`
`66`	`69`	`QString errorTitle, errorMessage;`
`67`	`70`	`const QVariantMap queryData = QgsArcGisRestUtils::getObjects(`
`@@ -75,6 +78,8 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, const QgsRect`
`75`	`78`	`return false;`
`76`	`79`	`}`
`77`	`80`
	`81`	`+ // but re-lock while updating cache`
	`82`	`+ locker.relock();`
`78`	`83`	`const QVariantList featuresData = queryData[QStringLiteral( "features" )].toList();`
`79`	`84`	`if ( featuresData.isEmpty() )`
`80`	`85`	`{`