Merge pull request #318 from YosysHQ/povik/fix-atomic_store-call

Fix types in call to atomic_store_explicit
berkeley-abc · Aug 8, 2024 · 762a123 · 762a123
2 parents dce6e48 + 2d26778
commit 762a123
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/misc/util/utilPth.c b/src/misc/util/utilPth.c
@@ -36,6 +36,7 @@
 using namespace std;
 #else
 #include <stdatomic.h>
+#include <stdbool.h>
 #endif
 
 #endif
@@ -103,7 +104,7 @@ void * Util_Thread( void * pArg )
             return NULL;
         }
         pThData->pUserFunc( pThData->pUserData );
-        atomic_store_explicit(&pThData->fWorking, 0, memory_order_release);
+        atomic_store_explicit(&pThData->fWorking, false, memory_order_release);
     }
     assert( 0 );
     return NULL;
@@ -133,7 +134,7 @@ void Util_ProcessThreads( int (*pUserFunc)(void *), void * vData, int nProcs, in
         ThData[i].pUserFunc = pUserFunc;
         ThData[i].iThread   = i;
         ThData[i].nTimeOut  = TimeOut;
-        atomic_store_explicit(&ThData[i].fWorking, 0, memory_order_release);
+        atomic_store_explicit(&ThData[i].fWorking, false, memory_order_release);
         status = pthread_create( WorkerThread + i, NULL, Util_Thread, (void *)(ThData + i) );  assert( status == 0 );
     }
 
@@ -150,7 +151,7 @@ void Util_ProcessThreads( int (*pUserFunc)(void *), void * vData, int nProcs, in
             if ( atomic_load_explicit(&ThData[i].fWorking, memory_order_acquire) )
                 continue;
             ThData[i].pUserData = Vec_PtrPop( vStack );
-            atomic_store_explicit(&ThData[i].fWorking, 1, memory_order_release);
+            atomic_store_explicit(&ThData[i].fWorking, true, memory_order_release);
             break;
         }
     }
@@ -168,7 +169,7 @@ void Util_ProcessThreads( int (*pUserFunc)(void *), void * vData, int nProcs, in
     for ( i = 0; i < nProcs; i++ )
     {
         ThData[i].pUserData = NULL;
-        atomic_store_explicit(&ThData[i].fWorking, 1, memory_order_release);
+        atomic_store_explicit(&ThData[i].fWorking, true, memory_order_release);
     }
 
     // Join threads

diff --git a/src/proof/ssw/sswPart.c b/src/proof/ssw/sswPart.c
@@ -37,6 +37,7 @@
 using namespace std;
 #else
 #include <stdatomic.h>
+#include <stdbool.h>
 #endif
 
 #endif
@@ -126,7 +127,7 @@ void * Ssw_GiaWorkerThread( void * pArg )
             return NULL;
         }
         Cec_ManLSCorrespondenceClasses( pThData->p, &pThData->CorPars );
-        atomic_store_explicit(&pThData->fWorking, 0, memory_order_release);
+        atomic_store_explicit(&pThData->fWorking, false, memory_order_release);
     }
     assert( 0 );
     return NULL;
@@ -154,7 +155,7 @@ void Ssw_SignalCorrespondenceArray( Vec_Ptr_t * vGias, Ssw_Pars_t * pPars )
     {
         ThData[i].CorPars  = *pCorPars;
         ThData[i].iThread  = i;
-        atomic_store_explicit(&ThData[i].fWorking, 0, memory_order_release);
+        atomic_store_explicit(&ThData[i].fWorking, false, memory_order_release);
         status = pthread_create( WorkerThread + i, NULL, Ssw_GiaWorkerThread, (void *)(ThData + i) );  assert( status == 0 );
     }
 
@@ -171,7 +172,7 @@ void Ssw_SignalCorrespondenceArray( Vec_Ptr_t * vGias, Ssw_Pars_t * pPars )
             if ( atomic_load_explicit(&ThData[i].fWorking, memory_order_acquire) )
                 continue;
             ThData[i].p = (Gia_Man_t*)Vec_PtrPop( vStack );
-            atomic_store_explicit(&ThData[i].fWorking, 1, memory_order_release);
+            atomic_store_explicit(&ThData[i].fWorking, true, memory_order_release);
             break;
         }
     }
@@ -188,7 +189,7 @@ void Ssw_SignalCorrespondenceArray( Vec_Ptr_t * vGias, Ssw_Pars_t * pPars )
     for ( i = 0; i < nProcs; i++ )
     {
         ThData[i].p = NULL;
-        atomic_store_explicit(&ThData[i].fWorking, 1, memory_order_release);
+        atomic_store_explicit(&ThData[i].fWorking, true, memory_order_release);
     }
 
     // Join threads