Changes in libcfa/src/concurrency/io.cfa [262fafd9:edf247b]

File:

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

libcfa/src/concurrency/io.cfa

@@ -230 +230 @@
                                         const unsigned long long cutoff = calc_cutoff(ctsc, ctx->cq.id, ctxs_count, io.data, io.tscs, __shard_factor.io);
                                         const unsigned long long age = moving_average(ctsc, io.tscs[target].tv, io.tscs[target].ma);
-                                        __cfadbg_print_safe(io, "Kernel I/O: Help attempt on %u from %u, age %'llu vs cutoff %'llu, %s\n", target, this, age, cutoff, age > cutoff ? "yes" : "no");
+                                        __cfadbg_print_safe(io, "Kernel I/O: Help attempt on %u from %u, age %'llu vs cutoff %'llu, %s\n", target, ctx->cq.id, age, cutoff, age > cutoff ? "yes" : "no");
                                         if(age <= cutoff) break HELP;
 
@@ -635 +635 @@
 
                         // We can proceed to the fast path
-                        if( !__alloc(ctx, &idx, 1) ) {
-                                /* paranoid */ verify( false ); // for now check if this happens, next time just abort the sleep.
-                                return false;
-                        }
+                        if( !__alloc(ctx, &idx, 1) ) return false;
 
                         // Allocation was successful
@@ -668 +665 @@
 
                         /* paranoid */ verify( sqe->user_data == (uintptr_t)&future );
-                        __submit_only( ctx, &idx, 1 );
+                        __submit( ctx, &idx, 1, true );
 
                         /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
@@ -679 +676 @@
                         iovec iov;
                         __atomic_acquire( &proc->io.ctx->cq.lock );
-
-                        __attribute__((used)) volatile bool was_reset = false;
 
                         with( proc->idle_wctx) {
@@ -692 +687 @@
                                         iov.iov_len  = sizeof(eventfd_t);
                                         __kernel_read(proc, *ftr, iov, evfd );
-                                        ftr->result = 0xDEADDEAD;
-                                        *((eventfd_t *)rdbuf) = 0xDEADDEADDEADDEAD;
-                                        was_reset = true;
                                 }
                         }
 
-                        if( !__atomic_load_n( &proc->do_terminate, __ATOMIC_SEQ_CST ) ) {
-                                __ioarbiter_flush( *proc->io.ctx );
-                                proc->idle_wctx.sleep_time = rdtscl();
-                                ioring_syscsll( *proc->io.ctx, 1, IORING_ENTER_GETEVENTS);
-                        }
+                        __ioarbiter_flush( *proc->io.ctx );
+                        ioring_syscsll( *proc->io.ctx, 1, IORING_ENTER_GETEVENTS);
 
                         ready_schedule_lock();
                         __cfa_do_drain( proc->io.ctx, proc->cltr );
                         ready_schedule_unlock();
-
-                        asm volatile ("" :: "m" (was_reset));
                 }
         #endif