Fix qgis server fcgi response destructor #59632
Draft
+390
−1,030
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🪟 Windows buildsDownload Windows builds of this PR for testing. 🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. |
elpaso
reviewed
Nov 28, 2024
src/server/qgsfcgiserverresponse.h
Outdated
| @@ -45,11 +45,13 @@ class QgsSocketMonitoringThread: public QThread | |||
| * \param isResponseFinished | |||
| * \param feedback | |||
| */ | |||
| QgsSocketMonitoringThread( bool *isResponseFinished, QgsFeedback *feedback ); | |||
| QgsSocketMonitoringThread( QgsFeedback *feedback ); | |||
There was a problem hiding this comment.
What about the feedback? Should it become a shared ptr now that lifetime is decoupled?
There was a problem hiding this comment.
I need to check the side effects
In the previous version, the response destructor waited for the monitoring thread to end that may induce a 333ms sleep each time. We fix that by using a classic ptr to separate the thread and the response lifecycles.
benoitdm-oslandia
force-pushed
the
fix/fcgi_response_destructor
branch
from
97ebe44
to
fc27b8d
Compare
… in QgsFcgiServerResponse
troopa81
reviewed
Dec 2, 2024
| mSocketMonitoringThread->start(); | ||
| } | ||
|
|
||
| QgsFcgiServerResponse::~QgsFcgiServerResponse() | ||
| { | ||
| mFinished = true; | ||
| mSocketMonitoringThread->exit(); | ||
| mSocketMonitoringThread->wait(); | ||
| if ( mSocketMonitoringThread ) |
There was a problem hiding this comment.
If the thread is deleted by deleteLater, mSocketMonitoringThread would not be reset to nullptr. You have to at least use a QPointer.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Suppress wait in fcgi response destructor
In the previous version, the response destructor waited for the monitoring thread to end that may induce a 333ms sleep each time. We fix that by using a classic ptr to separate the thread and the response lifecycles.