Changes in libcfa/src/concurrency/kernel/startup.cfa [145dcd5:1757f98]

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (8 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -34 +34 @@
 #include "kernel_private.hfa"
 #include "startup.hfa"          // STARTUP_PRIORITY_XXX
-#include "limits.hfa"
 #include "math.hfa"
 
@@ -280 +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;
@@ -406 +403 @@
 
         __cfaabi_tls.this_thread->curr_cor = dst;
-        __stack_prepare( &dst->stack, DEFAULT_STACK_SIZE );
+        __stack_prepare( &dst->stack, 65000 );
         __cfactx_start(main, dst, this->runner, __cfactx_invoke_coroutine);
 
@@ -514 +511 @@
         this.rdq.its = 0;
         this.rdq.itr = 0;
-        this.rdq.id  = MAX;
-        this.rdq.target = MAX;
-        this.rdq.last = MAX;
-        this.rdq.cpu = 0;
-        // this.rdq.cutoff = 0ull;
+        this.rdq.id  = -1u;
+        this.rdq.target = -1u;
+        this.rdq.last = -1u;
+        this.rdq.cutoff = 0ull;
         do_terminate = false;
         preemption_alarm = 0p;
@@ -568 +564 @@
 extern size_t __page_size;
 void ^?{}(processor & this) with( this ){
-        /* 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();
+        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);
                 __wake_proc( &this );
-        __enable_interrupts_checked();
-
-        wait( terminated );
-        /* paranoid */ verify( active_processor() != &this);
+
+                wait( terminated );
+                /* paranoid */ verify( active_processor() != &this);
+        }
 
         __destroy_pthread( kernel_thread, this.stack, 0p );
@@ -687 +682 @@
         [this->unique_id, last_size] = ready_mutate_register();
 
-                this->rdq.cpu = __kernel_getcpu();
-
                 this->cltr->procs.total += 1u;
                 insert_last(this->cltr->procs.actives, *this);
@@ -728 +721 @@
         check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
-        size_t stacksize = DEFAULT_STACK_SIZE;
+        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 );
 
         void * stack;
@@ -753 +749 @@
         #endif
 
+
         check( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
+
         check( pthread_create( pthread, &attr, start, arg ), "pthread_create" );
         return stack;