Changeset 6502a2b

Timestamp:

May 4, 2020, 12:54:56 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:

3c039b0

Parents:

c5c743e

Message:

Tentative fix to the deadlock in cluster shutdown

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (3 diffs)
• kernel.hfa (modified) (1 diff)
• kernel_private.hfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -89 +89 @@
                 void ?{}( __io_poller_fast & this, struct cluster & cltr ) {
                         this.ring = &cltr.io;
+                        this.waiting = true;
                         (this.thrd){ "Fast I/O Poller", cltr };
                 }
@@ -242 +243 @@
 
                 #if defined(__CFA_IO_POLLING_USER__)
+                        verify( this.io.poller.fast.waiting );
+                        verify( this.io.poller.fast.thrd.state == Blocked );
+
+                        this.io.poller.fast.thrd.curr_cluster = mainCluster;
+
                         // unpark the fast io_poller
                         unpark( &this.io.poller.fast.thrd __cfaabi_dbg_ctx2 );
@@ -409 +415 @@
                         while(!__atomic_load_n(&this.ring->done, __ATOMIC_SEQ_CST)) {
                                 // Drain the io
-                                if(0 > __drain_io( *this.ring, 0p, 0, false )) {
+                                this.waiting = false;
+                                int ret = __drain_io( *this.ring, 0p, 0, false );
+                                this.waiting = true;
+                                if(0 > ret) {
                                         // If we got something, just yield and check again
                                         yield();

libcfa/src/concurrency/kernel.hfa

@@ -191 +191 @@
         struct __io_poller_fast {
                 struct io_ring * ring;
+                bool waiting;
                 $thread thrd;
         };

libcfa/src/concurrency/kernel_private.hfa

@@ -59 +59 @@
 extern volatile thread_local __cfa_kernel_preemption_state_t preemption_state __attribute__ ((tls_model ( "initial-exec" )));
 
+extern cluster * mainCluster;
+
 //-----------------------------------------------------------------------------
 // Threads