Skip to content

Commit 510f602

Browse files
rouaultm-kuhn
authored andcommitted
Fix thread-unsafe initialization of QgsExpression::Functions()
The method initializes the gmFunctions static member, without any mutex protection. This turned out to cause random crashes in the tests of the WFS provider since the downloader thread may evaluate an expression, in parallel of the main thread, which does the same. This was mainly seen on Mac Travis (2 crashes + 1 failures, over 50 iterations), when parallelizing tests so as to get particular scheduling : https://travis-ci.org/rouault/Quantum-GIS/builds/121720556. But I could finally reproduce it systematically on my Linux box when inserting the following sleep. diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp index adc7042..e9e4577 100644 --- a/src/providers/wfs/qgswfsshareddata.cpp +++ b/src/providers/wfs/qgswfsshareddata.cpp @@ -426,6 +426,7 @@ int QgsWFSSharedData::registerToCache( QgsWFSFeatureIterator* iterator, QgsRecta connect( mDownloader, SIGNAL( ready() ), &loop, SLOT( quit() ) ); mDownloader->start(); loop.exec( QEventLoop::ExcludeUserInputEvents ); + usleep( 100 * 1000 ); } if ( mDownloadFinished ) return -1; After applying this commit, the Mac builder is fine: https://travis-ci.org/rouault/Quantum-GIS/builds/121756158
1 parent d4f62ce commit 510f602

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/core/qgsexpression.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <QRegExp>
2222
#include <QColor>
2323
#include <QUuid>
24+
#include <QMutex>
2425

2526
#include <math.h>
2627
#include <limits>
@@ -2857,6 +2858,13 @@ QList<QgsExpression::Function*> QgsExpression::gmOwnedFunctions;
28572858

28582859
const QList<QgsExpression::Function*>& QgsExpression::Functions()
28592860
{
2861+
// The construction of the list isn't thread-safe, and without the mutex,
2862+
// crashes in the WFS provider may occur, since it can parse expressions
2863+
// in parallel.
2864+
// The mutex needs to be recursive.
2865+
static QMutex sFunctionsMutex( QMutex::Recursive );
2866+
QMutexLocker locker( &sFunctionsMutex );
2867+
28602868
if ( gmFunctions.isEmpty() )
28612869
{
28622870
gmFunctions

0 commit comments

Comments
 (0)