Changeset 12c1eef for libcfa/src/concurrency/kernel.cfa

Timestamp:

Jan 19, 2022, 2:36:56 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

97c215f

Parents:

5235d49 (diff), 6a33e40 (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

File:

• libcfa/src/concurrency/kernel.cfa (modified) (4 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -142 +142 @@
 extern void __disable_interrupts_hard();
 extern void __enable_interrupts_hard();
-
-static inline void __disable_interrupts_checked() {
-        /* paranoid */ verify( __preemption_enabled() );
-        disable_interrupts();
-        /* paranoid */ verify( ! __preemption_enabled() );
-}
-
-static inline void __enable_interrupts_checked( bool poll = true ) {
-        /* paranoid */ verify( ! __preemption_enabled() );
-        enable_interrupts( poll );
-        /* paranoid */ verify( __preemption_enabled() );
-}
 
 
@@ -566 +554 @@
         /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
 
-        const bool local = thrd->state != Start;
         if (thrd->preempted == __NO_PREEMPTION) thrd->state = Ready;
 
@@ -749 +736 @@
 
         // Check if there is a sleeping processor
-        int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
+        // int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
+        int fd = 0;
+        if( __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST) != 0 ) {
+                fd = __atomic_exchange_n(&this->procs.fd, 0, __ATOMIC_RELAXED);
+        }
 
         // If no one is sleeping, we are done
@@ -776 +767 @@
 // Unconditionnaly wake a thread
 void __wake_proc(processor * this) {
+        /* paranoid */ verify( ! __preemption_enabled() );
+
         __cfadbg_print_safe(runtime_core, "Kernel : waking Processor %p\n", this);
 
-        __disable_interrupts_checked();
-                /* paranoid */ verify( ! __preemption_enabled() );
-                eventfd_t val;
-                val = 1;
-                eventfd_write( this->idle_fd, val );
-        __enable_interrupts_checked();
+        eventfd_t val;
+        val = 1;
+        eventfd_write( this->idle_fd, val );
+
+        /* paranoid */ verify( ! __preemption_enabled() );
 }