Changeset 4233338b for libcfa/src/concurrency/kernel

Timestamp:

Jan 10, 2022, 4:07:04 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

56d711f

Parents:

0ac728b (diff), 7d0ebd0 (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/startup.cfa (modified) (5 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -279 +279 @@
         // When its coroutine terminates, it return control to the mainThread
         // which is currently here
+        /* paranoid */ verify( !__atomic_load_n(&mainProcessor->do_terminate, __ATOMIC_ACQUIRE) );
         __atomic_store_n(&mainProcessor->do_terminate, true, __ATOMIC_RELEASE);
+        __wake_proc( mainProcessor );
         __kernel_last_resume( __cfaabi_tls.this_processor );
         mainThread->self_cor.state = Halted;
@@ -403 +405 @@
 
         __cfaabi_tls.this_thread->curr_cor = dst;
-        __stack_prepare( &dst->stack, 65000 );
+        __stack_prepare( &dst->stack, DEFAULT_STACK_SIZE );
         __cfactx_start(main, dst, this->runner, __cfactx_invoke_coroutine);
 
@@ -564 +566 @@
 extern size_t __page_size;
 void ^?{}(processor & this) with( this ){
-        if( ! __atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) ) {
-                __cfadbg_print_safe(runtime_core, "Kernel : core %p signaling termination\n", &this);
-
-                __atomic_store_n(&do_terminate, true, __ATOMIC_RELAXED);
+        /* paranoid */ verify( !__atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) );
+        __cfadbg_print_safe(runtime_core, "Kernel : core %p signaling termination\n", &this);
+
+        __atomic_store_n(&do_terminate, true, __ATOMIC_RELAXED);
+        __disable_interrupts_checked();
                 __wake_proc( &this );
-
-                wait( terminated );
-                /* paranoid */ verify( active_processor() != &this);
-        }
+        __enable_interrupts_checked();
+
+        wait( terminated );
+        /* paranoid */ verify( active_processor() != &this);
 
         __destroy_pthread( kernel_thread, this.stack, 0p );
@@ -721 +724 @@
         check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
-        size_t stacksize;
-        // default stack size, normally defined by shell limit
-        check( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
-        assert( stacksize >= PTHREAD_STACK_MIN );
+        size_t stacksize = DEFAULT_STACK_SIZE;
 
         void * stack;
@@ -749 +749 @@
         #endif
 
-
         check( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
-
         check( pthread_create( pthread, &attr, start, arg ), "pthread_create" );
         return stack;