Changeset 7a052e34 for src/libcfa/concurrency/kernel.c

Timestamp:

Feb 12, 2018, 3:49:04 PM (6 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:

54c9000

Parents:

1dcd52a3 (diff), ff2d1139 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/concurrency/kernel.c (modified) (3 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) {
+void ?{}(processor & this, cluster * cltr) with( this ) {
         this.cltr = cltr;
-        this.terminated{ 0 };
-        this.do_terminate = false;
-        this.preemption_alarm = NULL;
-        this.pending_preemption = false;
+        terminated{ 0 };
+        do_terminate = false;
+        preemption_alarm = NULL;
+        pending_preemption = false;
 
         start( &this );
 }
 
-void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) {
+void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) with( this ) {
         this.cltr = cltr;
-        this.terminated{ 0 };
-        this.do_terminate = false;
-        this.preemption_alarm = NULL;
-        this.pending_preemption = false;
-        this.kernel_thread = pthread_self();
+        terminated{ 0 };
+        do_terminate = false;
+        preemption_alarm = NULL;
+        pending_preemption = false;
+        kernel_thread = pthread_self();
 
         this.runner = &runner;