Changeset badd22f for libcfa/src/concurrency

Timestamp:

Aug 13, 2020, 9:09:32 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

4c925cd, 6553828

Parents:

67bfc50 (diff), 62502cc4 (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 into master

Location:

libcfa/src/concurrency

Files:

• invoke.h (modified) (3 diffs)
• kernel/startup.cfa (modified) (2 diffs)
• ready_queue.cfa (modified) (3 diffs)

libcfa/src/concurrency/invoke.h

@@ -26 +26 @@
 #ifndef _INVOKE_H_
 #define _INVOKE_H_
+
+        struct __cfaehm_try_resume_node;
+        struct __cfaehm_base_exception_t;
+        struct exception_context_t {
+                struct __cfaehm_try_resume_node * top_resume;
+                struct __cfaehm_base_exception_t * current_exception;
+        };
 
         struct __stack_context_t {
@@ -51 +58 @@
                 // base of stack
                 void * base;
+
+                // Information for exception handling.
+                struct exception_context_t exception_context;
         };
 
@@ -84 +94 @@
         };
 
-        static inline struct __stack_t * __get_stack( struct $coroutine * cor ) { return (struct __stack_t*)(((uintptr_t)cor->stack.storage) & ((uintptr_t)-2)); }
+        static inline struct __stack_t * __get_stack( struct $coroutine * cor ) {
+                return (struct __stack_t*)(((uintptr_t)cor->stack.storage) & ((uintptr_t)-2));
+        }
 
         // struct which calls the monitor is accepting

libcfa/src/concurrency/kernel/startup.cfa

@@ -516 +516 @@
         ( this.terminated ){ 0 };
         ( this.runner ){};
-        init( this, name, _cltr );
+
+        disable_interrupts();
+                init( this, name, _cltr );
+        enable_interrupts( __cfaabi_dbg_ctx );
 
         __cfadbg_print_safe(runtime_core, "Kernel : Starting core %p\n", &this);
@@ -540 +543 @@
         free( this.stack );
 
-        deinit( this );
+        disable_interrupts();
+                deinit( this );
+        enable_interrupts( __cfaabi_dbg_ctx );
 }
 

libcfa/src/concurrency/ready_queue.cfa

@@ -150 +150 @@
 //  queues or removing them.
 uint_fast32_t ready_mutate_lock( void ) with(*__scheduler_lock) {
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+
         // Step 1 : lock global lock
         // It is needed to avoid processors that register mid Critical-Section
@@ -164 +166 @@
         }
 
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
         return s;
 }
 
 void ready_mutate_unlock( uint_fast32_t last_s ) with(*__scheduler_lock) {
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+
         // Step 1 : release local locks
         // This must be done while the global lock is held to avoid
@@ -182 +187 @@
         /*paranoid*/ assert(true == lock);
         __atomic_store_n(&lock, (bool)false, __ATOMIC_RELEASE);
+
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
 }