Changeset 83a071f9 for src/libcfa/concurrency/kernel.c

Timestamp:

Aug 11, 2017, 10:10:26 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, resolv-new, with_gc

Children:

fd344aa

Parents:

8499c707

Message:

Fix concurrency library, tests, and keywords for references

File:

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

src/libcfa/concurrency/kernel.c

@@ -139 +139 @@
 }
 
-void ?{}(processor & this, cluster * cltr, processorCtx_t * runner) {
+void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) {
         this.cltr = cltr;
         (this.terminated){ 0 };
@@ -148 +148 @@
         this.kernel_thread = pthread_self();
 
-        this.runner = runner;
-        LIB_DEBUG_PRINT_SAFE("Kernel : constructing system processor context %p\n", runner);
-        (*runner){ &this };
+        this.runner = &runner;
+        LIB_DEBUG_PRINT_SAFE("Kernel : constructing system processor context %p\n", &runner);
+        runner{ &this };
 }
 
 LIB_DEBUG_DO( bool validate( alarm_list_t * this ); )
 
-void ?{}(system_proc_t & this, cluster * cltr, processorCtx_t * runner) {
+void ?{}(system_proc_t & this, cluster * cltr, processorCtx_t & runner) {
         (this.alarms){};
         (this.alarm_lock){};
@@ -187 +187 @@
 //=============================================================================================
 //Main of the processor contexts
-void main(processorCtx_t * runner) {
-        processor * this = runner->proc;
+void main(processorCtx_t & runner) {
+        processor * this = runner.proc;
 
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p starting\n", this);
@@ -233 +233 @@
 // from the processor coroutine to the target thread
 void runThread(processor * this, thread_desc * dst) {
-        coroutine_desc * proc_cor = get_coroutine(this->runner);
+        coroutine_desc * proc_cor = get_coroutine(*this->runner);
         coroutine_desc * thrd_cor = get_coroutine(dst);
 
@@ -315 +315 @@
         // appropriate stack.
         proc_cor_storage.__cor.state = Active;
-        main( &proc_cor_storage );
+        main( proc_cor_storage );
         proc_cor_storage.__cor.state = Halted;
 
@@ -455 +455 @@
         mainThread = (thread_desc *)&mainThreadStorage;
         current_stack_info_t info;
-        mainThread{ &info };
+        (*mainThread){ &info };
 
         LIB_DEBUG_PRINT_SAFE("Kernel : Main thread ready\n");
@@ -461 +461 @@
         // Initialize the system cluster
         systemCluster = (cluster *)&systemClusterStorage;
-        systemCluster{};
+        (*systemCluster){};
 
         LIB_DEBUG_PRINT_SAFE("Kernel : System cluster ready\n");
@@ -468 +468 @@
         // (the coroutine that contains the processing control flow)
         systemProcessor = (system_proc_t *)&systemProcessorStorage;
-        (*systemProcessor){ systemCluster, (processorCtx_t *)&systemProcessorCtxStorage };
+        (*systemProcessor){ systemCluster, *(processorCtx_t *)&systemProcessorCtxStorage };
 
         // Add the main thread to the ready queue
@@ -486 +486 @@
         // context. Hence, the main thread does not begin through CtxInvokeThread, like all other threads. The trick here is that
         // mainThread is on the ready queue when this call is made.
-        resume( systemProcessor->proc.runner );
+        resume( *systemProcessor->proc.runner );
 
 
@@ -514 +514 @@
         // Destroy the system processor and its context in reverse order of construction
         // These were manually constructed so we need manually destroy them
-        ^(systemProcessor->proc.runner){};
+        ^(*systemProcessor->proc.runner){};
         ^(systemProcessor){};