fixup! fix(qgisserver): suppress wait in fcgi response destructor by using timed_mutex

benoitdm-oslandia · benoitdm-oslandia · commit 1aaee08e3888 · 2024-12-09T07:46:02.000+01:00
diff --git a/src/server/qgsfcgiserverresponse.cpp b/src/server/qgsfcgiserverresponse.cpp
@@ -104,8 +104,6 @@ void QgsSocketMonitoringThread::setResponseFinished( bool responseFinished )
 
 void QgsSocketMonitoringThread::run( )
 {
-  const pid_t threadId = gettid();
-
   if ( mIpcFd < 0 )
   {
     QgsMessageLog::logMessage( QStringLiteral( "Socket monitoring disabled: no socket fd!" ),
@@ -115,6 +113,8 @@ void QgsSocketMonitoringThread::run( )
   }
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID)
+  const pid_t threadId = gettid();
+
   mIsResponseFinished.store( false );
   char c;
   while ( !mIsResponseFinished.load() )

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,6 @@ void QgsSocketMonitoringThread::setResponseFinished( bool responseFinished )`
`104`	`104`
`105`	`105`	`void QgsSocketMonitoringThread::run( )`
`106`	`106`	`{`
`107`		`- const pid_t threadId = gettid();`
`108`		`-`
`109`	`107`	`if ( mIpcFd < 0 )`
`110`	`108`	`{`
`111`	`109`	`QgsMessageLog::logMessage( QStringLiteral( "Socket monitoring disabled: no socket fd!" ),`
`@@ -115,6 +113,8 @@ void QgsSocketMonitoringThread::run( )`
`115`	`113`	`}`
`116`	`114`
`117`	`115`	`#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID)`
	`116`	`+ const pid_t threadId = gettid();`
	`117`	`+`
`118`	`118`	`mIsResponseFinished.store( false );`
`119`	`119`	`char c;`
`120`	`120`	`while ( !mIsResponseFinished.load() )`