Changeset aec68b6 for libcfa/src/concurrency/kernel

Timestamp:

Apr 25, 2021, 10:11:27 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

24711a3, 5456537

Parents:

9b71679 (diff), c323837 (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) (6 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" {
@@ -220 +219 @@
                         // Mark as fulfilled, wake thread if needed
                         // return true if a thread was unparked
-                        bool post(oneshot & this) {
+                        $thread * post(oneshot & this, bool do_unpark = true) {
                                 struct $thread * got = __atomic_exchange_n( &this.ptr, 1p, __ATOMIC_SEQ_CST);
-                                if( got == 0p ) return false;
-                                unpark( got );
-                                return true;
+                                if( got == 0p ) return 0p;
+                                if(do_unpark) unpark( got );
+                                return got;
                         }
                 }
@@ -336 +335 @@
                         // from the server side, mark the future as fulfilled
                         // delete it if needed
-                        bool fulfil( future_t & this ) {
+                        $thread * fulfil( future_t & this, bool do_unpark = true  ) {
                                 for() {
                                         struct oneshot * expected = this.ptr;
@@ -344 +343 @@
                                                 #pragma GCC diagnostic ignored "-Wfree-nonheap-object"
                                         #endif
-                                                if( expected == 3p ) { free( &this ); return false; }
+                                                if( expected == 3p ) { free( &this ); return 0p; }
                                         #if defined(__GNUC__) && __GNUC__ >= 7
                                                 #pragma GCC diagnostic pop
@@ -356 +355 @@
                                         struct oneshot * want = expected == 0p ? 1p : 2p;
                                         if(__atomic_compare_exchange_n(&this.ptr, &expected, want, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
-                                                if( expected == 0p ) { /* paranoid */ verify( this.ptr == 1p); return false; }
-                                                bool ret = post( *expected );
+                                                if( expected == 0p ) { /* paranoid */ verify( this.ptr == 1p); return 0p; }
+                                                $thread * ret = post( *expected, do_unpark );
                                                 __atomic_store_n( &this.ptr, 1p, __ATOMIC_SEQ_CST);
                                                 return ret;
@@ -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() );
 
@@ -530 +530 @@
         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);
@@ -557 +557 @@
         disable_interrupts();
                 deinit( this );
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts();
 }
 
@@ -595 +595 @@
         // 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
 }
 
@@ -610 +610 @@
         // 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__)