Changes in libcfa/src/concurrency/kernel/startup.cfa [d874f59:7dd98b6]

File:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -100 +100 @@
 // Other Forward Declarations
 extern void __wake_proc(processor *);
+extern int cfa_main_returned;                                                   // from interpose.cfa
 
 //-----------------------------------------------------------------------------
@@ -200 +201 @@
         __cfadbg_print_safe(runtime_core, "Kernel : Main cluster ready\n");
 
+        // Construct the processor context of the main processor
+        void ?{}(processorCtx_t & this, processor * proc) {
+                (this.__cor){ "Processor" };
+                this.__cor.starter = 0p;
+                this.proc = proc;
+        }
+
+        void ?{}(processor & this) with( this ) {
+                ( this.terminated ){};
+                ( this.runner ){};
+                init( this, "Main Processor", *mainCluster, 0p );
+                kernel_thread = pthread_self();
+
+                runner{ &this };
+                __cfadbg_print_safe(runtime_core, "Kernel : constructed main processor context %p\n", &runner);
+        }
+
+        // Initialize the main processor and the main processor ctx
+        // (the coroutine that contains the processing control flow)
+        mainProcessor = (processor *)&storage_mainProcessor;
+        (*mainProcessor){};
+
+        register_tls( mainProcessor );
+
         // Start by initializing the main thread
         // SKULLDUGGERY: the mainThread steals the process main thread
@@ -210 +235 @@
         __cfadbg_print_safe(runtime_core, "Kernel : Main thread ready\n");
 
-
-
-        // Construct the processor context of the main processor
-        void ?{}(processorCtx_t & this, processor * proc) {
-                (this.__cor){ "Processor" };
-                this.__cor.starter = 0p;
-                this.proc = proc;
-        }
-
-        void ?{}(processor & this) with( this ) {
-                ( this.terminated ){};
-                ( this.runner ){};
-                init( this, "Main Processor", *mainCluster, 0p );
-                kernel_thread = pthread_self();
-
-                runner{ &this };
-                __cfadbg_print_safe(runtime_core, "Kernel : constructed main processor context %p\n", &runner);
-        }
-
-        // Initialize the main processor and the main processor ctx
-        // (the coroutine that contains the processing control flow)
-        mainProcessor = (processor *)&storage_mainProcessor;
-        (*mainProcessor){};
-
-        register_tls( mainProcessor );
-        mainThread->last_cpu = __kernel_getcpu();
-
         //initialize the global state variables
         __cfaabi_tls.this_processor = mainProcessor;
@@ -252 +250 @@
         // 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, UNPARK_LOCAL);
 
         // SKULLDUGGERY: Force a context switch to the main processor to set the main thread's context to the current UNIX
@@ -271 +269 @@
 
 static void __kernel_shutdown(void) {
+        if(!cfa_main_returned) return;
         /* paranoid */ verify( __preemption_enabled() );
         disable_interrupts();
@@ -486 +485 @@
         link.next = 0p;
         link.ts   = -1llu;
-        preferred = -1u;
+        preferred = ready_queue_new_preferred();
         last_proc = 0p;
         #if defined( __CFA_WITH_VERIFY__ )