Changeset aeb31b1 for libcfa/src

Timestamp:

Dec 3, 2020, 3:33:18 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

9082e0f1, cad1df1

Parents:

a78c3ff (diff), 0f88a225 (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:

• concurrency/io.cfa (modified) (3 diffs)
• concurrency/io/call.cfa.in (modified) (1 diff)
• concurrency/kernel.cfa (modified) (1 diff)
• concurrency/kernel/fwd.hfa (modified) (1 diff)
• concurrency/thread.cfa (modified) (1 diff)
• interpose.cfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -160 +160 @@
         static inline void process(struct io_uring_cqe & cqe ) {
                 struct io_future_t * future = (struct io_future_t *)(uintptr_t)cqe.user_data;
-                __cfadbg_print_safe( io, "Kernel I/O : Syscall completed : cqe %p, result %d for %p\n", future, cqe.res, data->thrd );
+                __cfadbg_print_safe( io, "Kernel I/O : Syscall completed : cqe %p, result %d for %p\n", &cqe, cqe.res, future );
 
                 fulfil( *future, cqe.res );
@@ -298 +298 @@
                 __u32 mask = *ring.submit_q.mask;
 
-                disable_interrupts();
-                        __u32 off = __tls_rand();
-                enable_interrupts( __cfaabi_dbg_ctx );
+                __u32 off = thread_rand();
 
                 // Loop around looking for an available spot
@@ -344 +342 @@
                 __u32 ready_mask = ring.submit_q.ready_cnt - 1;
 
-                disable_interrupts();
-                        __u32 off = __tls_rand();
-                enable_interrupts( __cfaabi_dbg_ctx );
+                __u32 off = thread_rand();
 
                 __u32 picked;

libcfa/src/concurrency/io/call.cfa.in

@@ -84 +84 @@
 
                 /* paranoid */ verifyf( cltr->io.ctxs, "default io contexts for cluster %p are missing\\n", cltr);
-                return &cltr->io.ctxs[ __tls_rand() % cltr->io.cnt ];
+                return &cltr->io.ctxs[ thread_rand() % cltr->io.cnt ];
         }
 #endif

libcfa/src/concurrency/kernel.cfa

@@ -619 +619 @@
         lock( kernel_abort_lock __cfaabi_dbg_ctx2 );
 
+        // disable interrupts, it no longer makes sense to try to interrupt this processor
+        disable_interrupts();
+
         // first task to abort ?
         if ( kernel_abort_called ) {                    // not first task to abort ?

libcfa/src/concurrency/kernel/fwd.hfa

@@ -132 +132 @@
                 }
 
+                extern uint64_t thread_rand();
+
                 //-----------------------------------------------------------------------
                 // Statics call at the end of each thread to register statistics

libcfa/src/concurrency/thread.cfa

@@ -162 +162 @@
 }
 
+uint64_t thread_rand() {
+        disable_interrupts();
+        uint64_t ret = __tls_rand();
+        enable_interrupts( __cfaabi_dbg_ctx );
+        return ret;
+}
+
 // Local Variables: //
 // mode: c //

libcfa/src/interpose.cfa

@@ -220 +220 @@
 }
 
+static volatile int __abort_stage = 0;
+
 // Cannot forward va_list.
 void __abort( bool signalAbort, const char fmt[], va_list args ) {
-        void * kernel_data = kernel_abort();                            // must be done here to lock down kernel
-        int len;
-
-        signal( SIGABRT, SIG_DFL );                                                     // prevent final "real" abort from recursing to handler
-
-        len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld) ", (long int)getpid() ); // use UNIX pid (versus getPid)
-        __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
-
-        assert( fmt );
-        len = vsnprintf( abort_text, abort_text_size, fmt, args );
-        __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
-
-        if ( fmt[strlen( fmt ) - 1] != '\n' ) {                         // add optional newline if missing at the end of the format text
-                __cfaabi_bits_write( STDERR_FILENO, "\n", 1 );
-        } // if
-        kernel_abort_msg( kernel_data, abort_text, abort_text_size );
-
-        __cfaabi_backtrace( signalAbort ? 4 : 2 );
-
-        __cabi_libc.abort();                                                            // print stack trace in handler
+        int stage = __atomic_add_fetch( &__abort_stage, 1, __ATOMIC_SEQ_CST );
+
+        // First stage: stop the cforall kernel and print
+        if(stage == 1) {
+                // increment stage
+                stage = __atomic_add_fetch( &__abort_stage, 1, __ATOMIC_SEQ_CST );
+
+                // must be done here to lock down kernel
+                void * kernel_data = kernel_abort();
+                int len;
+
+                signal( SIGABRT, SIG_DFL );                                                     // prevent final "real" abort from recursing to handler
+
+                len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld) ", (long int)getpid() ); // use UNIX pid (versus getPid)
+                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
+
+                assert( fmt );
+                len = vsnprintf( abort_text, abort_text_size, fmt, args );
+                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
+
+                // add optional newline if missing at the end of the format text
+                if ( fmt[strlen( fmt ) - 1] != '\n' ) {
+                        __cfaabi_bits_write( STDERR_FILENO, "\n", 1 );
+                } // if
+                kernel_abort_msg( kernel_data, abort_text, abort_text_size );
+        }
+
+        // Second stage: print the backtrace
+        if(stage == 2) {
+                // increment stage
+                stage = __atomic_add_fetch( &__abort_stage, 1, __ATOMIC_SEQ_CST );
+
+                // print stack trace in handler
+                __cfaabi_backtrace( signalAbort ? 4 : 2 );
+        }
+
+        do {
+                // Finally call abort
+                __cabi_libc.abort();
+
+                // Loop so that we never return
+        } while(true);
 }