Ignore:
Timestamp:
Feb 12, 2018, 3:49:04 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/kernel.c

    r1dcd52a3 r7a052e34  
    1010// Created On       : Tue Jan 17 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Feb  6 21:51:26 2018
    13 // Update Count     : 4
     12// Last Modified On : Thu Feb  8 23:52:19 2018
     13// Update Count     : 5
    1414//
    1515
    1616//C Includes
    1717#include <stddef.h>
    18 #define ftype `ftype`
    1918extern "C" {
    2019#include <stdio.h>
     
    2423#include <unistd.h>
    2524}
    26 #undef ftype
    2725
    2826//CFA Includes
     
    144142}
    145143
    146 void ?{}(processor & this, cluster * cltr) {
     144void ?{}(processor & this, cluster * cltr) with( this ) {
    147145        this.cltr = cltr;
    148         this.terminated{ 0 };
    149         this.do_terminate = false;
    150         this.preemption_alarm = NULL;
    151         this.pending_preemption = false;
     146        terminated{ 0 };
     147        do_terminate = false;
     148        preemption_alarm = NULL;
     149        pending_preemption = false;
    152150
    153151        start( &this );
    154152}
    155153
    156 void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) {
     154void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) with( this ) {
    157155        this.cltr = cltr;
    158         this.terminated{ 0 };
    159         this.do_terminate = false;
    160         this.preemption_alarm = NULL;
    161         this.pending_preemption = false;
    162         this.kernel_thread = pthread_self();
     156        terminated{ 0 };
     157        do_terminate = false;
     158        preemption_alarm = NULL;
     159        pending_preemption = false;
     160        kernel_thread = pthread_self();
    163161
    164162        this.runner = &runner;
Note: See TracChangeset for help on using the changeset viewer.