Changeset cfff639 for libcfa/src/concurrency/kernel

Timestamp:

Apr 24, 2021, 7:45:02 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

fb0be05

Parents:

89eff25 (diff), 254ad1b (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/kernel

Files:

• fwd.hfa (modified) (2 diffs)
• startup.cfa (modified) (6 diffs)

libcfa/src/concurrency/kernel/fwd.hfa

@@ -108 +108 @@
 
         extern void disable_interrupts();
-        extern void enable_interrupts_noPoll();
-        extern void enable_interrupts( __cfaabi_dbg_ctx_param );
+        extern void enable_interrupts( bool poll = false );
 
         extern "Cforall" {
@@ -403 +402 @@
                                         __VA_ARGS__ \
                                 } \
-                                if( !(in_kernel) ) enable_interrupts( __cfaabi_dbg_ctx ); \
+                                if( !(in_kernel) ) enable_interrupts(); \
                         }
                 #else

libcfa/src/concurrency/kernel/startup.cfa

@@ -225 +225 @@
         // Add the main thread to the ready queue
         // once resume is called on mainProcessor->runner the mainThread needs to be scheduled like any normal thread
-        __schedule_thread(mainThread);
+        schedule_thread$(mainThread);
 
         // SKULLDUGGERY: Force a context switch to the main processor to set the main thread's context to the current UNIX
@@ -238 +238 @@
 
         /* paranoid */ verify( ! __preemption_enabled() );
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts();
         /* paranoid */ verify( __preemption_enabled() );
 
@@ -532 +532 @@
         disable_interrupts();
                 init( this, name, _cltr, initT );
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts();
 
         __cfadbg_print_safe(runtime_core, "Kernel : Starting core %p\n", &this);
@@ -559 +559 @@
         disable_interrupts();
                 deinit( this );
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts();
 }
 
@@ -597 +597 @@
         // Unlock the RWlock
         ready_mutate_unlock( last_size );
-        enable_interrupts_noPoll(); // Don't poll, could be in main cluster
+        enable_interrupts( false ); // Don't poll, could be in main cluster
 }
 
@@ -612 +612 @@
         // Unlock the RWlock
         ready_mutate_unlock( last_size );
-        enable_interrupts_noPoll(); // Don't poll, could be in main cluster
+        enable_interrupts( false ); // Don't poll, could be in main cluster
 
         #if !defined(__CFA_NO_STATISTICS__)