Changeset bcd74f3 for libcfa/src/bits/locks.hfa

Timestamp:

May 8, 2020, 4:44:53 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5c9b20c

Parents:

e3bc51c (diff), 0e7e3c17 (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' into new-ast

File:

• libcfa/src/bits/locks.hfa (modified) (1 diff)

libcfa/src/bits/locks.hfa

@@ -112 +112 @@
         #endif
 
+        extern "C" {
+                char * strerror(int);
+        }
+        #define CHECKED(x) { int err = x; if( err != 0 ) abort("KERNEL ERROR: Operation \"" #x "\" return error %d - %s\n", err, strerror(err)); }
+
         struct __bin_sem_t {
-                bool                    signaled;
                 pthread_mutex_t         lock;
                 pthread_cond_t          cond;
+                int                     val;
         };
 
         static inline void ?{}(__bin_sem_t & this) with( this ) {
-                signaled = false;
-                pthread_mutex_init(&lock, NULL);
-                pthread_cond_init (&cond, NULL);
+                // Create the mutex with error checking
+                pthread_mutexattr_t mattr;
+                pthread_mutexattr_init( &mattr );
+                pthread_mutexattr_settype( &mattr, PTHREAD_MUTEX_ERRORCHECK_NP);
+                pthread_mutex_init(&lock, &mattr);
+
+                pthread_cond_init (&cond, 0p);
+                val = 0;
         }
 
         static inline void ^?{}(__bin_sem_t & this) with( this ) {
-                pthread_mutex_destroy(&lock);
-                pthread_cond_destroy (&cond);
+                CHECKED( pthread_mutex_destroy(&lock) );
+                CHECKED( pthread_cond_destroy (&cond) );
         }
 
         static inline void wait(__bin_sem_t & this) with( this ) {
                 verify(__cfaabi_dbg_in_kernel());
-                pthread_mutex_lock(&lock);
-                        if(!signaled) {   // this must be a loop, not if!
+                CHECKED( pthread_mutex_lock(&lock) );
+                        while(val < 1) {
                                 pthread_cond_wait(&cond, &lock);
                         }
-                        signaled = false;
-                pthread_mutex_unlock(&lock);
+                        val -= 1;
+                CHECKED( pthread_mutex_unlock(&lock) );
         }
 
         static inline bool post(__bin_sem_t & this) with( this ) {
-                pthread_mutex_lock(&lock);
-                        bool needs_signal = !signaled;
-                        signaled = true;
-                pthread_mutex_unlock(&lock);
+                bool needs_signal = false;
 
-                if (needs_signal) pthread_cond_signal(&cond);
+                CHECKED( pthread_mutex_lock(&lock) );
+                        if(val < 1) {
+                                val += 1;
+                                pthread_cond_signal(&cond);
+                                needs_signal = true;
+                        }
+                CHECKED( pthread_mutex_unlock(&lock) );
 
                 return needs_signal;
         }
+
+        #undef CHECKED
 #endif