Changeset 010636f

Timestamp:

Mar 29, 2022, 3:19:53 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

dfd3410

Parents:

72ba508

Message:

Tentative fix for termination deadlock.
Other minor improvements and checks.

File:

• libcfa/src/concurrency/io.cfa (modified) (3 diffs)

libcfa/src/concurrency/io.cfa

@@ -635 +635 @@
 
                         // We can proceed to the fast path
-                        if( !__alloc(ctx, &idx, 1) ) return false;
+                        if( !__alloc(ctx, &idx, 1) ) {
+                                /* paranoid */ verify( false ); // for now check if this happens, next time just abort the sleep.
+                                return false;
+                        }
 
                         // Allocation was successful
@@ -665 +668 @@
 
                         /* paranoid */ verify( sqe->user_data == (uintptr_t)&future );
-                        __submit( ctx, &idx, 1, true );
+                        __submit_only( ctx, &idx, 1 );
 
                         /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
@@ -690 +693 @@
                         }
 
-                        __ioarbiter_flush( *proc->io.ctx );
-                        ioring_syscsll( *proc->io.ctx, 1, IORING_ENTER_GETEVENTS);
+                        if( !__atomic_load_n( &proc->do_terminate, __ATOMIC_SEQ_CST ) ) {
+                                __ioarbiter_flush( *proc->io.ctx );
+                                ioring_syscsll( *proc->io.ctx, 1, IORING_ENTER_GETEVENTS);
+                        }
 
                         ready_schedule_lock();