Changeset 87e0b015

Timestamp:

May 6, 2020, 2:25:16 PM (5 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:

5dadc9b7, be91ab4

Parents:

cb870e0 (diff), 171ca0d (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• bits/locks.hfa (modified) (4 diffs)
• concurrency/io.cfa (modified) (2 diffs)
• concurrency/kernel.cfa (modified) (2 diffs)

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: %s\n", strerror(err)); }
+
         struct __bin_sem_t {
                 pthread_mutex_t         lock;
@@ -119 +124 @@
 
         static inline void ?{}(__bin_sem_t & this) with( this ) {
-                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);
+                CHECKED( pthread_mutex_lock(&lock) );
                         while(val < 1) {
                                 pthread_cond_wait(&cond, &lock);
                         }
                         val -= 1;
-                pthread_mutex_unlock(&lock);
+                CHECKED( pthread_mutex_unlock(&lock) );
         }
 
@@ -142 +152 @@
                 bool needs_signal = false;
 
-                pthread_mutex_lock(&lock);
+                CHECKED( pthread_mutex_lock(&lock) );
                         if(val < 1) {
                                 val += 1;
@@ -148 +158 @@
                                 needs_signal = true;
                         }
-                pthread_mutex_unlock(&lock);
+                CHECKED( pthread_mutex_unlock(&lock) );
 
                 return needs_signal;
         }
+
+        #undef CHECKED
 #endif

libcfa/src/concurrency/io.cfa

@@ -1007 +1007 @@
 bool has_user_level_blocking( fptr_t func ) {
         #if defined(HAVE_LINUX_IO_URING_H)
-                if( /*func == (fptr_t)preadv2 || */
-                        func == (fptr_t)cfa_preadv2 )
-                        #define _CFA_IO_FEATURE_IORING_OP_READV ,
-                        return IS_DEFINED(IORING_OP_READV);
-
                 #if defined(HAVE_PREADV2)
+                        if( /*func == (fptr_t)preadv2 || */
+                                func == (fptr_t)cfa_preadv2 )
+                                #define _CFA_IO_FEATURE_IORING_OP_READV ,
+                                return IS_DEFINED(IORING_OP_READV);
+                #endif
+
+                #if defined(HAVE_PWRITEV2)
                         if( /*func == (fptr_t)pwritev2 || */
                                 func == (fptr_t)cfa_pwritev2 )
@@ -1019 +1021 @@
                 #endif
 
-                #if defined(HAVE_PWRITEV2)
-                        if( /*func == (fptr_t)fsync || */
-                                func == (fptr_t)cfa_fsync )
-                                #define _CFA_IO_FEATURE_IORING_OP_FSYNC ,
-                                return IS_DEFINED(IORING_OP_FSYNC);
-                #endif
+                if( /*func == (fptr_t)fsync || */
+                        func == (fptr_t)cfa_fsync )
+                        #define _CFA_IO_FEATURE_IORING_OP_FSYNC ,
+                        return IS_DEFINED(IORING_OP_FSYNC);
 
                 if( /*func == (fptr_t)ync_file_range || */

libcfa/src/concurrency/kernel.cfa

@@ -250 +250 @@
         }
 
-        pthread_join( kernel_thread, 0p );
+        int err = pthread_join( kernel_thread, 0p );
+        if( err != 0 ) abort("KERNEL ERROR: joining processor %p caused error %s\n", &this, strerror(err));
+
         free( this.stack );
 }
@@ -824 +826 @@
         // Destroy the main processor and its context in reverse order of construction
         // These were manually constructed so we need manually destroy them
+        void ^?{}(processor & this) with( this ){
+                /* paranoid */ verify( this.do_terminate == true );
+        }
+
         ^(*mainProcessor){};