Ignore:
Timestamp:
Jun 21, 2023, 2:38:55 AM (3 years ago)
Author:
JiadaL <j82liang@…>
Branches:
master, stuck-waitfor-destruct
Children:
92355883
Parents:
0b0a285 (diff), 2de175ce (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:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/theses/colby_parsons_MMAth/benchmarks/actors/cfa/repeat.cfa

    r0b0a285 rc84dd61  
    4646
    4747Client * cl;
    48 allocation receive( Server & this, IntMsg & msg ) { msg.val = 7; *cl << msg; return Nodelete; }
    49 allocation receive( Server & this, CharMsg & msg ) { msg.val = 'x'; *cl << msg; return Nodelete; }
     48allocation receive( Server & this, IntMsg & msg ) { msg.val = 7; *cl | msg; return Nodelete; }
     49allocation receive( Server & this, CharMsg & msg ) { msg.val = 'x'; *cl | msg; return Nodelete; }
    5050allocation receive( Server & this, StateMsg & msg ) { return Finished; }
    5151
    5252void terminateServers( Client & this ) with(this) {
    5353    for ( i; Messages ) {
    54         servers[i] << stateMsg;
     54        servers[i] | stateMsg;
    5555    } // for
    5656}
     
    6060    if ( times == Times ) { terminateServers( this ); return Finished; }
    6161    results = 0;
    62     this << stateMsg;
     62    this | stateMsg;
    6363    return Nodelete;
    6464}
     
    7474allocation receive( Client & this, StateMsg & msg ) with(this) {
    7575    for ( i; Messages ) {
    76         servers[i] << intmsg[i];
    77         servers[i] << charmsg[i];
     76        servers[i] | intmsg[i];
     77        servers[i] | charmsg[i];
    7878    }
    7979    return Nodelete;
     
    124124    Client client;
    125125    cl = &client;
    126     client << stateMsg;
     126    client | stateMsg;
    127127
    128128    stop_actor_system();
Note: See TracChangeset for help on using the changeset viewer.