Changes in src/libcfa/concurrency/kernel.c [c40e7c5:381fdee]

File:

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

src/libcfa/concurrency/kernel.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  6 21:51:26 2018
-// Update Count     : 4
+// Last Modified On : Thu Feb  8 23:52:19 2018
+// Update Count     : 5
 //
 
 //C Includes
 #include <stddef.h>
-#define ftype `ftype`
 extern "C" {
 #include <stdio.h>
@@ -24 +23 @@
 #include <unistd.h>
 }
-#undef ftype
 
 //CFA Includes
@@ -144 +142 @@
 }
 
-void ?{}(processor & this, cluster * cltr) with( this ) {
+void ?{}(processor & this, cluster * cltr) {
         this.cltr = cltr;
-        terminated{ 0 };
-        do_terminate = false;
-        preemption_alarm = NULL;
-        pending_preemption = false;
+        this.terminated{ 0 };
+        this.do_terminate = false;
+        this.preemption_alarm = NULL;
+        this.pending_preemption = false;
 
         start( &this );
 }
 
-void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) with( this ) {
+void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) {
         this.cltr = cltr;
-        terminated{ 0 };
-        do_terminate = false;
-        preemption_alarm = NULL;
-        pending_preemption = false;
-        kernel_thread = pthread_self();
+        this.terminated{ 0 };
+        this.do_terminate = false;
+        this.preemption_alarm = NULL;
+        this.pending_preemption = false;
+        this.kernel_thread = pthread_self();
 
         this.runner = &runner;
@@ -170 +168 @@
         if( ! do_terminate ) {
                 __cfaabi_dbg_print_safe("Kernel : core %p signaling termination\n", &this);
-                terminate(&this);
+                do_terminate = true;
                 P( terminated );
                 pthread_join( kernel_thread, NULL );