Ignore:
Timestamp:
Jan 23, 2019, 4:52:16 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
a200795
Parents:
9b086ca (diff), 1d832f4 (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' into cleanup-dtors

File:
1 moved

Legend:

Unmodified
Added
Removed

  • tests/concurrent/examples/datingService.cfa

    r9b086ca rcde3891  
    88// Created On       : Mon Oct 30 12:56:20 2017
    99// Last Modified By : Peter A. Buhr
    10 // Last Modified On : Sun May 27 09:05:18 2018
    11 // Update Count     : 26
     10// Last Modified On : Tue Dec 11 21:55:34 2018
     11// Update Count     : 28
    1212//
    1313
    … …  
    3333                signal_block( Boys[ccode] );                                    // restart boy to set phone number
    3434        } // if
     35        sout | "Girl:" | PhoneNo | "is dating Boy at" | BoyPhoneNo | "with ccode" | ccode;
    3536        return BoyPhoneNo;
    3637} // DatingService girl
    … …  
    4445                signal_block( Girls[ccode] );                                   // restart girl to set phone number
    4546        } // if
     47        sout | " Boy:" | PhoneNo | "is dating Girl" | GirlPhoneNo | "with ccode" | ccode;
    4648        return GirlPhoneNo;
    4749} // DatingService boy
    … …  
    5860        yield( random( 100 ) );                                                         // don't all start at the same time
    5961        unsigned int partner = girl( TheExchange, id, ccode );
    60         sout | "Girl:" | id | "is dating Boy at" | partner | "with ccode" | ccode | endl;
    6162        girlck[id] = partner;
    6263} // Girl main
    … …  
    6970
    7071thread Boy {
    71         DatingService &TheExchange;
     72        DatingService & TheExchange;
    7273        unsigned int id, ccode;
    7374}; // Boy
    … …  
    7677        yield( random( 100 ) );                                                         // don't all start at the same time
    7778        unsigned int partner = boy( TheExchange, id, ccode );
    78         sout | " Boy:" | id | "is dating Girl" | partner | "with ccode" | ccode | endl;
    7979        boyck[id] = partner;
    8080} // Boy main
Note: See TracChangeset for help on using the changeset viewer.