Changeset df6cc9d for libcfa/src/concurrency/io.cfa

Timestamp:

Oct 19, 2022, 4:43:26 PM (21 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

1a45263

Parents:

9cd5bd2 (diff), 135143b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into pthread-emulation

File:

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

libcfa/src/concurrency/io.cfa

@@ -201 +201 @@
                 __atomic_unlock(&ctx->cq.lock);
 
-                touch_tsc( cltr->sched.io.tscs, ctx->cq.id, ts_prev, ts_next );
+                touch_tsc( cltr->sched.io.tscs, ctx->cq.id, ts_prev, ts_next, false );
 
                 return true;
         }
 
-        bool __cfa_io_drain( processor * proc ) {
+        bool __cfa_io_drain( struct processor * proc ) {
                 bool local = false;
                 bool remote = false;
@@ -243 +243 @@
                                 /* paranoid */ verify( io.tscs[target].t.tv != ULLONG_MAX );
                                 HELP: if(target < ctxs_count) {
-                                        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].t.tv, io.tscs[target].t.ma);
+                                        const __readyQ_avg_t cutoff = calc_cutoff(ctsc, ctx->cq.id, ctxs_count, io.data, io.tscs, __shard_factor.io, false);
+                                        const __readyQ_avg_t age = moving_average(ctsc, io.tscs[target].t.tv, io.tscs[target].t.ma, false);
                                         __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;
@@ -273 +273 @@
         }
 
-        bool __cfa_io_flush( processor * proc ) {
+        bool __cfa_io_flush( struct processor * proc ) {
                 /* paranoid */ verify( ! __preemption_enabled() );
                 /* paranoid */ verify( proc );
@@ -353 +353 @@
 
                 disable_interrupts();
-                processor * proc = __cfaabi_tls.this_processor;
+                struct processor * proc = __cfaabi_tls.this_processor;
                 io_context$ * ctx = proc->io.ctx;
                 /* paranoid */ verify( __cfaabi_tls.this_processor );
@@ -433 +433 @@
                 disable_interrupts();
                 __STATS__( true, if(!lazy) io.submit.eagr += 1; )
-                processor * proc = __cfaabi_tls.this_processor;
+                struct processor * proc = __cfaabi_tls.this_processor;
                 io_context$ * ctx = proc->io.ctx;
                 /* paranoid */ verify( __cfaabi_tls.this_processor );
@@ -551 +551 @@
                 enqueue(this.pending, (__outstanding_io&)pa);
 
-                wait( pa.sem );
+                wait( pa.waitctx );
 
                 return pa.ctx;
@@ -578 +578 @@
                                 pa.ctx = ctx;
 
-                                post( pa.sem );
+                                post( pa.waitctx );
                         }
 
@@ -613 +613 @@
                 }
 
-                wait( ei.sem );
+                wait( ei.waitctx );
 
                 __cfadbg_print_safe(io, "Kernel I/O : %u submitted from arbiter\n", have);
@@ -631 +631 @@
                                         __submit_only(&ctx, ei.idxs, ei.have);
 
-                                        post( ei.sem );
+                                        post( ei.waitctx );
                                 }
 
@@ -641 +641 @@
 
         #if defined(CFA_WITH_IO_URING_IDLE)
-                bool __kernel_read(processor * proc, io_future_t & future, iovec & iov, int fd) {
+                bool __kernel_read(struct processor * proc, io_future_t & future, iovec & iov, int fd) {
                         io_context$ * ctx = proc->io.ctx;
                         /* paranoid */ verify( ! __preemption_enabled() );
@@ -692 +692 @@
                 }
 
-                void __cfa_io_idle( processor * proc ) {
+                void __cfa_io_idle( struct processor * proc ) {
                         iovec iov;
                         __atomic_acquire( &proc->io.ctx->cq.lock );