Changeset cc56283 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Jan 10, 2022, 4:14:23 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

4177592f, 770d9ab

Parents:

04a8a54 (diff), 56d711f (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) (2 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() );
-}
 
 
@@ -776 +764 @@
 // 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() );
 }