Merge pull request #5569 from OpenMathLib/revert-5479-forklock

martin-frbg · web-flow · commit 5766adbcad6e · 2025-12-25T17:10:29.000+01:00
Revert "[WIP,Testing] remove the lock around the thread shutdown function again"
diff --git a/driver/others/blas_server.c b/driver/others/blas_server.c
@@ -982,6 +982,8 @@ int BLASFUNC(blas_thread_shutdown)(void){
 
   int i;
 
+  LOCK_COMMAND(&server_lock);
+
   //Free buffers allocated for threads
   for(i=0; i<MAX_CPU_NUMBER; i++){
     if(blas_thread_buffer[i]!=NULL){
@@ -1021,6 +1023,7 @@ int BLASFUNC(blas_thread_shutdown)(void){
     blas_server_avail = 0;
 
   }
+  UNLOCK_COMMAND(&server_lock);
 
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -982,6 +982,8 @@ int BLASFUNC(blas_thread_shutdown)(void){`
`982`	`982`
`983`	`983`	`int i;`
`984`	`984`
	`985`	`+ LOCK_COMMAND(&server_lock);`
	`986`	`+`
`985`	`987`	`//Free buffers allocated for threads`
`986`	`988`	`for(i=0; i<MAX_CPU_NUMBER; i++){`
`987`	`989`	`if(blas_thread_buffer[i]!=NULL){`
`@@ -1021,6 +1023,7 @@ int BLASFUNC(blas_thread_shutdown)(void){`
`1021`	`1023`	`blas_server_avail = 0;`
`1022`	`1024`
`1023`	`1025`	`}`
	`1026`	`+ UNLOCK_COMMAND(&server_lock);`
`1024`	`1027`
`1025`	`1028`	`return 0;`
`1026`	`1029`	`}`