Changeset 4069faad for libcfa/src/concurrency/io.cfa

Timestamp:

May 1, 2020, 12:37: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:

d45ed83

Parents:

9987d79

Message:

Fix error in benchmark where the wrong fd was used.
Changed behcnmark to use seperate cluster for I/O.
Changed some debug prints to use new versions with groups.
Fixed halting race condition leading to deadlock.

File:

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

libcfa/src/concurrency/io.cfa

@@ -14 +14 @@
 //
 
+// #define __CFA_DEBUG_PRINT_IO__
+
 #include "kernel.hfa"
 
@@ -210 +212 @@
         void __kernel_io_finish_start( cluster & this ) {
                 #if defined(__CFA_IO_POLLING_USER__)
-                        (this.io.poller.fast){ this };
+                        __cfadbg_print_safe(io, "Kernel I/O : Creating fast poller for cluter %p\n", &this);
+                        (this.io.poller.fast){ "Fast IO Poller", this };
                         __thrd_start( this.io.poller.fast, main );
                 #endif
 
                 // Create the poller thread
+                __cfadbg_print_safe(io, "Kernel I/O : Creating slow poller for cluter %p\n", &this);
                 this.io.poller.slow.stack = __create_pthread( &this.io.poller.slow.kthrd, __io_poller_slow, &this );
         }
 
         void __kernel_io_prepare_stop( cluster & this ) {
+                __cfadbg_print_safe(io, "Kernel I/O : Stopping pollers for cluster\n", &this);
                 // Notify the poller thread of the shutdown
                 __atomic_store_n(&this.io.done, true, __ATOMIC_SEQ_CST);
@@ -233 +238 @@
                 free( this.io.poller.slow.stack );
 
+                __cfadbg_print_safe(io, "Kernel I/O : Slow poller stopped for cluster\n", &this);
+
                 #if defined(__CFA_IO_POLLING_USER__)
                         // unpark the fast io_poller
@@ -238 +245 @@
 
                         ^(this.io.poller.fast){};
+
+                        __cfadbg_print_safe(io, "Kernel I/O : Fast poller stopped for cluster\n", &this);
                 #endif
         }
@@ -324 +333 @@
 
                         struct io_user_data * data = (struct io_user_data *)cqe.user_data;
-                        // __cfaabi_bits_print_safe( STDERR_FILENO, "Performed reading io cqe %p, result %d for %p\n", data, cqe.res, data->thrd );
+                        __cfadbg_print_safe( io, "Kernel I/O : Performed reading io cqe %p, result %d for %p\n", data, cqe.res, data->thrd );
 
                         data->result = cqe.res;
@@ -369 +378 @@
                                 int count = __drain_io( ring, &mask, 1, true );
                                 if(count > 0) {
+                                        __cfadbg_print_safe(io, "Kernel I/O : Moving to ring %p to fast poller\n", &ring);
                                         __unpark( &ring.poller.fast.thrd __cfaabi_dbg_ctx2 );
                                         wait( ring.poller.sem );
@@ -398 +408 @@
                                 else {
                                         // We didn't get anything baton pass to the slow poller
+                                        __cfadbg_print_safe(io, "Kernel I/O : Moving to ring %p to slow poller\n", &this.ring);
                                         post( this.ring->poller.sem );
                                         park( __cfaabi_dbg_ctx );
@@ -464 +475 @@
                 // Submit however, many entries need to be submitted
                 int ret = syscall( __NR_io_uring_enter, ring.fd, 1, 0, 0, 0p, 0);
-                // __cfaabi_bits_print_safe( STDERR_FILENO, "Performed io_submit, returned %d\n", ret );
                 if( ret < 0 ) {
                         switch((int)errno) {
@@ -481 +491 @@
                 // Make sure that idx was submitted
                 // Be careful to not get false positive if we cycled the entire list or that someone else submitted for us
+                __cfadbg_print_safe( io, "Kernel I/O : Performed io_submit for %p, returned %d\n", active_thread(), ret );
         }