Changeset 09800e9 for src/libcfa/concurrency/kernel.c

Timestamp:

May 29, 2018, 4:17:30 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

6c7099a

Parents:

8ebbfc4

Message:

First draft at locks in Cforall

File:

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

src/libcfa/concurrency/kernel.c

@@ -49 +49 @@
 thread_desc * mainThread;
 
-struct { __dllist_t(cluster    ) list; __spinlock_t lock; } global_clusters;
+struct { __dllist_t(cluster) list; __spinlock_t lock; } global_clusters;
 
 //-----------------------------------------------------------------------------
@@ -257 +257 @@
 // its final actions must be executed from the kernel
 void finishRunning(processor * this) with( this->finish ) {
-        if( action_code == Release ) {
-                verify( ! kernelTLS.preemption_state.enabled );
+        verify( ! kernelTLS.preemption_state.enabled );
+        choose( action_code ) {
+        case No_Action:
+                break;
+        case Release:
                 unlock( *lock );
-        }
-        else if( action_code == Schedule ) {
+        case Schedule:
                 ScheduleThread( thrd );
-        }
-        else if( action_code == Release_Schedule ) {
-                verify( ! kernelTLS.preemption_state.enabled );
+        case Release_Schedule:
                 unlock( *lock );
                 ScheduleThread( thrd );
-        }
-        else if( action_code == Release_Multi ) {
-                verify( ! kernelTLS.preemption_state.enabled );
+        case Release_Multi:
                 for(int i = 0; i < lock_count; i++) {
                         unlock( *locks[i] );
                 }
-        }
-        else if( action_code == Release_Multi_Schedule ) {
+        case Release_Multi_Schedule:
                 for(int i = 0; i < lock_count; i++) {
                         unlock( *locks[i] );
@@ -282 +279 @@
                         ScheduleThread( thrds[i] );
                 }
-        }
-        else {
-                assert(action_code == No_Action);
+        case Callback:
+                callback();
+        default:
+                abort("KERNEL ERROR: Unexpected action to run after thread");
         }
 }
@@ -497 +495 @@
 }
 
+void BlockInternal(__finish_callback_fptr_t callback) {
+        disable_interrupts();
+        with( *kernelTLS.this_processor ) {
+                finish.action_code = Callback;
+                finish.callback    = callback;
+        }
+
+        verify( ! kernelTLS.preemption_state.enabled );
+        returnToKernel();
+        verify( ! kernelTLS.preemption_state.enabled );
+
+        enable_interrupts( __cfaabi_dbg_ctx );
+}
+
 // KERNEL ONLY
 void LeaveThread(__spinlock_t * lock, thread_desc * thrd) {