Changeset 059ad16

Timestamp:

Nov 19, 2021, 3:53:47 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

7ef162b2

Parents:

cd4c605

Message:

Flush now supports blocking until at least one I/O op terminates.

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (5 diffs)
• io/setup.cfa (modified) (1 diff)
• kernel.cfa (modified) (5 diffs)
• kernel_private.hfa (modified) (2 diffs)

libcfa/src/concurrency/io.cfa

@@ -133 +133 @@
         }
 
-        void __cfa_io_flush( processor * proc ) {
+        bool __cfa_io_flush( processor * proc, bool wait ) {
                 /* paranoid */ verify( ! __preemption_enabled() );
                 /* paranoid */ verify( proc );
@@ -141 +141 @@
                 $io_context & ctx = *proc->io.ctx;
 
-                // for(i; 2) {
-                //      unsigned idx = proc->rdq.id + i;
-                //      cltr->ready_queue.lanes.tscs[idx].tv = -1ull;
-                // }
-
                 __ioarbiter_flush( ctx );
 
                 __STATS__( true, io.calls.flush++; )
-                int ret = syscall( __NR_io_uring_enter, ctx.fd, ctx.sq.to_submit, 0, 0, (sigset_t *)0p, _NSIG / 8);
+                int ret = syscall( __NR_io_uring_enter, ctx.fd, ctx.sq.to_submit, wait ? 1 : 0, 0, (sigset_t *)0p, _NSIG / 8);
                 if( ret < 0 ) {
                         switch((int)errno) {
@@ -157 +152 @@
                                 // Update statistics
                                 __STATS__( false, io.calls.errors.busy ++; )
-                                // for(i; 2) {
-                                //      unsigned idx = proc->rdq.id + i;
-                                //      cltr->ready_queue.lanes.tscs[idx].tv = rdtscl();
-                                // }
-                                return;
+                                return false;
                         default:
                                 abort( "KERNEL ERROR: IO_URING SYSCALL - (%d) %s\n", (int)errno, strerror(errno) );
@@ -183 +174 @@
                 ctx.proc->io.pending = false;
 
-                __cfa_io_drain( proc );
-                // for(i; 2) {
-                //      unsigned idx = proc->rdq.id + i;
-                //      cltr->ready_queue.lanes.tscs[idx].tv = rdtscl();
-                // }
+                return __cfa_io_drain( proc );
         }
 
@@ -315 +302 @@
                 if(sq.to_submit > 30 || !lazy) {
                         ready_schedule_lock();
-                        __cfa_io_flush( ctx->proc );
+                        __cfa_io_flush( ctx->proc, false );
                         ready_schedule_unlock();
                 }

libcfa/src/concurrency/io/setup.cfa

@@ -32 +32 @@
 
         void __cfa_io_start( processor * proc ) {}
-        void __cfa_io_flush( processor * proc ) {}
+        bool __cfa_io_flush( processor * proc, bool ) {}
         void __cfa_io_stop ( processor * proc ) {}
 

libcfa/src/concurrency/kernel.cfa

@@ -130 +130 @@
 extern void __cfa_io_start( processor * );
 extern bool __cfa_io_drain( processor * );
-extern void __cfa_io_flush( processor * );
+extern bool __cfa_io_flush( processor *, bool wait );
 extern void __cfa_io_stop ( processor * );
 static inline bool __maybe_io_drain( processor * );
@@ -197 +197 @@
                         if( !readyThread ) {
                                 ready_schedule_lock();
-                                __cfa_io_flush( this );
+                                __cfa_io_flush( this, false );
                                 ready_schedule_unlock();
 
@@ -251 +251 @@
                         if(this->io.pending && !this->io.dirty) {
                                 ready_schedule_lock();
-                                __cfa_io_flush( this );
+                                __cfa_io_flush( this, false );
                                 ready_schedule_unlock();
                         }
@@ -268 +268 @@
 
                                 // If we can't find a thread, might as well flush any outstanding I/O
-                                if(this->io.pending) { __cfa_io_flush( this ); }
+                                if(this->io.pending) { __cfa_io_flush( this, false ); }
 
                                 // Spin a little on I/O, just in case
@@ -363 +363 @@
 
                         if(this->io.pending && !this->io.dirty) {
-                                __cfa_io_flush( this );
+                                __cfa_io_flush( this, false );
                         }
 

libcfa/src/concurrency/kernel_private.hfa

@@ -39 +39 @@
 }
 
+// #define IO_URING_IDLE
+
 //-----------------------------------------------------------------------------
 // Scheduler
@@ -149 +151 @@
         __atomic_store_n(ll, (bool)false, __ATOMIC_RELEASE);
 }
-
-
-
-
 
 //-----------------------------------------------------------------------