fix thread-count race condition during memory-manager init

free-wheeling · May 2, 2020 · b5eb233 · b5eb233
1 parent 55424f8
commit b5eb233
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/fweelin_datatypes.h b/src/fweelin_datatypes.h
@@ -687,8 +687,12 @@ template <class T> class SRMWRingBuffer : public RTDataStruct_Updater {
 
   int WriteElement (const T &el) {
     if (num_writers != RT_RWThreads::num_rw_threads) {
-      printf("CORE: ERROR: SRMWRingBuffer thread count mismatch.\n");
-      exit(1);
+      pthread_mutex_lock(&RT_RWThreads::register_rtstruct_lock);
+      pthread_mutex_unlock(&RT_RWThreads::register_rtstruct_lock);
+      if (num_writers != RT_RWThreads::num_rw_threads) {
+        printf("CORE: ERROR: SRMWRingBuffer thread count mismatch.\n");
+        exit(1);
+      }
     }
 
     // Determine which write thread we are
@@ -709,8 +713,12 @@ template <class T> class SRMWRingBuffer : public RTDataStruct_Updater {
 
   const T ReadElement () {
     if (num_writers != RT_RWThreads::num_rw_threads) {
-      printf("CORE: ERROR: SRMWRingBuffer thread count mismatch.\n");
-      exit(1);
+      pthread_mutex_lock(&RT_RWThreads::register_rtstruct_lock);
+      pthread_mutex_unlock(&RT_RWThreads::register_rtstruct_lock);
+      if (num_writers != RT_RWThreads::num_rw_threads) {
+        printf("CORE: ERROR: SRMWRingBuffer thread count mismatch.\n");
+        exit(1);
+      }
     }
 
     // Check each ring buffer