Changeset c59a346 for libcfa/src/concurrency

Timestamp:

Apr 29, 2020, 3:49:30 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:

f6660520

Parents:

44aad8f

Message:

Minor fixes to I/O

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (4 diffs)
• preemption.cfa (modified) (4 diffs)

libcfa/src/concurrency/io.cfa

@@ -75 +75 @@
        #endif
 
-
 //=============================================================================================
 // I/O Startup / Shutdown logic
@@ -150 +149 @@
                 sq.array   = (         uint32_t *)(((intptr_t)sq.ring_ptr) + params.sq_off.array);
                 sq.alloc = *sq.tail;
+                sq.ready = *sq.tail;
 
                 // completion queue
@@ -190 +190 @@
         void __kernel_io_shutdown( cluster & this ) {
                 // Stop the IO Poller
+                #if __CFA_IO_POLLING__ == __CFA_IO_POLLING_NAIVE__
                 // Notify the poller thread of the shutdown
                 __atomic_store_n(&this.io.done, true, __ATOMIC_SEQ_CST);
@@ -245 +246 @@
         // Process a single completion message from the io_uring
         // This is NOT thread-safe
-        int __drain_io( struct io_ring & ring, sigset_t & mask, int waitcnt ) {
+        static int __drain_io( struct io_ring & ring, sigset_t & mask, int waitcnt ) {
                 int ret = syscall( __NR_io_uring_enter, ring.fd, 0, waitcnt, IORING_ENTER_GETEVENTS, &mask, _NSIG / 8);
                 if( ret < 0 ) {

libcfa/src/concurrency/preemption.cfa

@@ -43 +43 @@
 // FwdDeclarations : Signal handlers
 static void sigHandler_ctxSwitch( __CFA_SIGPARMS__ );
+static void sigHandler_alarm    ( __CFA_SIGPARMS__ );
 static void sigHandler_segv     ( __CFA_SIGPARMS__ );
 static void sigHandler_ill      ( __CFA_SIGPARMS__ );
@@ -256 +257 @@
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
-            abort( "internal error, pthread_sigmask" );
+                abort( "internal error, pthread_sigmask" );
         }
 }
@@ -303 +304 @@
         // Setup proper signal handlers
         __cfaabi_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO | SA_RESTART ); // __cfactx_switch handler
+        __cfaabi_sigaction( SIGALRM, sigHandler_alarm    , SA_SIGINFO | SA_RESTART ); // debug handler
 
         signal_block( SIGALRM );
@@ -394 +396 @@
 
         force_yield( __ALARM_PREEMPTION ); // Do the actual __cfactx_switch
+}
+
+static void sigHandler_alarm( __CFA_SIGPARMS__ ) {
+        abort("SIGALRM should never reach the signal handler");
 }