Changeset d4da1535 for libcfa/src/concurrency

Timestamp:

Mar 29, 2022, 4:41:30 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

4598e03

Parents:

edf247b (diff), 6e47b49 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (4 diffs)
• kernel.cfa (modified) (1 diff)
• kernel.hfa (modified) (1 diff)
• kernel/startup.cfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -635 +635 @@
 
                         // We can proceed to the fast path
-                        if( !__alloc(ctx, &idx, 1) ) return false;
+                        if( !__alloc(ctx, &idx, 1) ) {
+                                /* paranoid */ verify( false ); // for now check if this happens, next time just abort the sleep.
+                                return false;
+                        }
 
                         // Allocation was successful
@@ -665 +668 @@
 
                         /* paranoid */ verify( sqe->user_data == (uintptr_t)&future );
-                        __submit( ctx, &idx, 1, true );
+                        __submit_only( ctx, &idx, 1 );
 
                         /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
@@ -676 +679 @@
                         iovec iov;
                         __atomic_acquire( &proc->io.ctx->cq.lock );
+
+                        __attribute__((used)) volatile bool was_reset = false;
 
                         with( proc->idle_wctx) {
@@ -687 +692 @@
                                         iov.iov_len  = sizeof(eventfd_t);
                                         __kernel_read(proc, *ftr, iov, evfd );
+                                        ftr->result = 0xDEADDEAD;
+                                        *((eventfd_t *)rdbuf) = 0xDEADDEADDEADDEAD;
+                                        was_reset = true;
                                 }
                         }
 
-                        __ioarbiter_flush( *proc->io.ctx );
-                        ioring_syscsll( *proc->io.ctx, 1, IORING_ENTER_GETEVENTS);
+                        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);
+                        }
 
                         ready_schedule_lock();
                         __cfa_do_drain( proc->io.ctx, proc->cltr );
                         ready_schedule_unlock();
+
+                        asm volatile ("" :: "m" (was_reset));
                 }
         #endif

libcfa/src/concurrency/kernel.cfa

@@ -682 +682 @@
         this->idle_wctx.sem = 1;
 
+        this->idle_wctx.wake_time = rdtscl();
+
         eventfd_t val;
         val = 1;

libcfa/src/concurrency/kernel.hfa

@@ -74 +74 @@
         // unused if not using io_uring for idle sleep
         io_future_t * ftr;
+
+        volatile unsigned long long wake_time;
+        volatile unsigned long long sleep_time;
 };
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -558 +558 @@
 
         idle_wctx.sem = 0;
+        idle_wctx.wake_time = 0;
 
         // I'm assuming these two are reserved for standard input and output