Changeset 85b1deb for src/libcfa/bits/locks.h

Timestamp:

Jun 7, 2018, 6:10:10 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

7bdcac1, beefc34c

Parents:

08b5a7e

Message:

Fix processor halting

File:

• src/libcfa/bits/locks.h (modified) (3 diffs)

src/libcfa/bits/locks.h

@@ -126 +126 @@
 
         struct __bin_sem_t {
-                int_fast8_t     counter;
-                pthread_mutex_t lock;
-                pthread_cond_t  cond;
+                bool                    signaled;
+                pthread_mutex_t         lock;
+                pthread_cond_t          cond;
         };
 
         static inline void ?{}(__bin_sem_t & this) with( this ) {
-                counter = 0;
+                signaled = false;
                 pthread_mutex_init(&lock, NULL);
                 pthread_cond_init (&cond, NULL);
@@ -145 +145 @@
                 verify(__cfaabi_dbg_in_kernel());
                 pthread_mutex_lock(&lock);
-                if(counter != 0) {   // this must be a loop, not if!
-                        pthread_cond_wait(&cond, &lock);
-                }
-                counter = 1;
+                        if(!signaled) {   // this must be a loop, not if!
+                                pthread_cond_wait(&cond, &lock);
+                        }
+                        signaled = false;
                 pthread_mutex_unlock(&lock);
         }
@@ -154 +154 @@
         static inline void post(__bin_sem_t & this) with( this ) {
                 verify(__cfaabi_dbg_in_kernel());
+
                 pthread_mutex_lock(&lock);
-                bool needs_signal = counter == 0;
-                counter = 1;
+                        bool needs_signal = !signaled;
+                        signaled = true;
                 pthread_mutex_unlock(&lock);
-                if (!needs_signal)
+
+                if (needs_signal)
                         pthread_cond_signal(&cond);
-                }
+        }
 #endif