sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-05 00:09:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow users to set maximum thread count for rendering to 1

Browse Source 
(This setting can sometimes unwantedly occur when using the same
profile across sessions of newer to very old QGIS versions)

The option is a misleading, as it's actually setting the global
thread limit for the entire QGIS application. If we allow this
to be set to a limit of 1 thread, then deadlocks
occur from the QImage internals in unpredictable ways.
This commit is contained in:
Nyall Dawson 2023-03-03 13:33:05 +10:00
parent 4dad60215a
commit 06b3678a57
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/qgsapplication.sip.in
View File

@ -695,7 +695,7 @@ Set maximum concurrent thread count
.. note:: .. note::
must be between 1 and \#cores, -1 means use all available cores must be between 2 and \#cores, -1 means use all available cores
.. versionadded:: 2.4 .. versionadded:: 2.4
%End %End

4
src/app/options/qgsrenderingoptions.cpp
View File

@ -32,8 +32,8 @@ QgsRenderingOptionsWidget::QgsRenderingOptionsWidget( QWidget *parent )
QgsSettings settings; QgsSettings settings;
chkAddedVisibility->setChecked( settings.value( QStringLiteral( "/qgis/new_layers_visible" ), true ).toBool() ); chkAddedVisibility->setChecked( settings.value( QStringLiteral( "/qgis/new_layers_visible" ), true ).toBool() );
spinMaxThreads->setRange( 0, QThread::idealThreadCount() ); spinMaxThreads->setRange( 1, QThread::idealThreadCount() );
spinMaxThreads->setClearValue( 0, tr( "All Available (%1)" ).arg( QThread::idealThreadCount() ) ); spinMaxThreads->setClearValue( 1, tr( "All Available (%1)" ).arg( QThread::idealThreadCount() ) );
if ( QgsApplication::maxThreads() != -1 ) if ( QgsApplication::maxThreads() != -1 )
spinMaxThreads->setValue( QgsApplication::maxThreads() ); spinMaxThreads->setValue( QgsApplication::maxThreads() );
else else

5
src/core/qgsapplication.cpp
View File

@ -2351,10 +2351,13 @@ void QgsApplication::setMaxThreads( int maxThreads )
QgsDebugMsgLevel( QStringLiteral( "maxThreads: %1" ).arg( maxThreads ), 2 ); QgsDebugMsgLevel( QStringLiteral( "maxThreads: %1" ).arg( maxThreads ), 2 );
// make sure value is between 1 and #cores, if not set to -1 (use #cores) // make sure value is between 1 and #cores, if not set to -1 (use #cores)
// 0 could be used to disable any parallel processing
if ( maxThreads < 1 || maxThreads > QThread::idealThreadCount() ) if ( maxThreads < 1 || maxThreads > QThread::idealThreadCount() )
maxThreads = -1; maxThreads = -1;
// force at least 2 threads -- anything less risks deadlocks within Qt itself (e.g in QImage internal mutexes)
if ( maxThreads > 0 && maxThreads < 2 )
maxThreads = 2;
// save value // save value
ABISYM( sMaxThreads ) = maxThreads; ABISYM( sMaxThreads ) = maxThreads;

2
src/core/qgsapplication.h
View File

@ -670,7 +670,7 @@ class CORE_EXPORT QgsApplication : public QApplication
/** /**
* Set maximum concurrent thread count * Set maximum concurrent thread count
* \note must be between 1 and \#cores, -1 means use all available cores * \note must be between 2 and \#cores, -1 means use all available cores
* \since QGIS 2.4 * \since QGIS 2.4
*/ */
static void setMaxThreads( int maxThreads ); static void setMaxThreads( int maxThreads );