Changeset 7b28e4a for src/libcfa/bits/locks.h

Timestamp:

Jun 8, 2018, 1:40:52 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

332d3c2, 9c32e21

Parents:

90cedbdd (diff), beefc34c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

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