Changeset ca37445 for src/tests


Ignore:
Timestamp:
Apr 10, 2018, 3:31:07 PM (7 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, with_gc
Children:
33f5b57
Parents:
9d1e3f7 (diff), 8ad6533 (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

Location:
src/tests
Files:
3 added
13 edited

Legend:

Unmodified
Added
Removed

  • src/tests/concurrent/examples/datingService.c

    r9d1e3f7 rca37445  
    88// Created On       : Mon Oct 30 12:56:20 2017
    99// Last Modified By : Peter A. Buhr
    10 // Last Modified On : Tue Jan  2 12:19:01 2018
    11 // Update Count     : 22
     10// Last Modified On : Wed Mar 14 22:48:40 2018
     11// Update Count     : 23
    1212//
    1313
    … …  
    8888int main() {
    8989        DatingService TheExchange;
    90         Girl *girls[NoOfPairs];
    91         Boy  *boys[NoOfPairs];
     90        Girl * girls[NoOfPairs];
     91        Boy  * boys[NoOfPairs];
    9292
    9393        srandom( /*getpid()*/ 103 );

  • src/tests/concurrent/preempt.c

    r9d1e3f7 rca37445  
    33
    44#ifndef PREEMPTION_RATE
    5 #define PREEMPTION_RATE 10_000ul
     5#define PREEMPTION_RATE 10`ms
    66#endif
    77
    8 unsigned int default_preemption() {
     8Duration default_preemption() {
    99        return PREEMPTION_RATE;
    1010}

  • src/tests/concurrent/signal/barge.c

    r9d1e3f7 rca37445  
    1616
    1717#ifndef PREEMPTION_RATE
    18 #define PREEMPTION_RATE 10_000ul
     18#define PREEMPTION_RATE 10`ms
    1919#endif
    2020
    21 unsigned int default_preemption() {
     21Duration default_preemption() {
    2222        return 0;
    2323}

  • src/tests/concurrent/signal/block.c

    r9d1e3f7 rca37445  
    2222
    2323#ifndef PREEMPTION_RATE
    24 #define PREEMPTION_RATE 10_000ul
     24#define PREEMPTION_RATE 10`ms
    2525#endif
    2626
    27 unsigned int default_preemption() {
     27Duration default_preemption() {
    2828        return PREEMPTION_RATE;
    2929}
    … …  
    5151//------------------------------------------------------------------------------
    5252void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned i ) {
    53         wait( cond, (uintptr_t)this_thread );
     53    wait( cond, (uintptr_t)active_thread() );
    5454
    5555        yield( random( 10 ) );
    … …  
    6060        }
    6161
    62         a.last_thread = b.last_thread = this_thread;
     62        a.last_thread = b.last_thread = active_thread();
    6363
    6464        yield( random( 10 ) );
    … …  
    7676        yield( random( 10 ) );
    7777
    78         [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = this_thread;
     78        [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = active_thread();
    7979
    8080        if( !is_empty( cond ) ) {
    … …  
    106106//------------------------------------------------------------------------------
    107107void barge_op( global_data_t & mutex a ) {
    108         a.last_thread = this_thread;
     108        a.last_thread = active_thread();
    109109}
    110110

  • src/tests/concurrent/signal/disjoint.c

    r9d1e3f7 rca37445  
    1313
    1414#ifndef PREEMPTION_RATE
    15 #define PREEMPTION_RATE 10_000ul
     15#define PREEMPTION_RATE 10`ms
    1616#endif
    1717
    18 unsigned int default_preemption() {
     18Duration default_preemption() {
    1919        return PREEMPTION_RATE;
    2020}

  • src/tests/concurrent/signal/wait.c

    r9d1e3f7 rca37445  
    2020
    2121#ifndef PREEMPTION_RATE
    22 #define PREEMPTION_RATE 10_000ul
     22#define PREEMPTION_RATE 10`ms
    2323#endif
    2424
    25 unsigned int default_preemption() {
     25Duration default_preemption() {
    2626        return PREEMPTION_RATE;
    2727}

  • src/tests/concurrent/waitfor/simple.c

    r9d1e3f7 rca37445  
    1010
    1111#ifndef PREEMPTION_RATE
    12 #define PREEMPTION_RATE 10_000ul
     12#define PREEMPTION_RATE 10`ms
    1313#endif
    1414
    15 unsigned int default_preemption() {
     15Duration default_preemption() {
    1616        return PREEMPTION_RATE;
    1717}

  • src/tests/preempt_longrun/create.c

    r9d1e3f7 rca37445  
    55
    66#ifndef PREEMPTION_RATE
    7 #define PREEMPTION_RATE 10_000ul
     7#define PREEMPTION_RATE 10`ms
    88#endif
    99
    10 unsigned int default_preemption() {
     10Duration default_preemption() {
    1111        return PREEMPTION_RATE;
    1212}

  • src/tests/preempt_longrun/enter.c

    r9d1e3f7 rca37445  
    66
    77#ifndef PREEMPTION_RATE
    8 #define PREEMPTION_RATE 10_000ul
     8#define PREEMPTION_RATE 10`ms
    99#endif
    1010
    11 unsigned int default_preemption() {
     11Duration default_preemption() {
    1212        return PREEMPTION_RATE;
    1313}

  • src/tests/preempt_longrun/enter3.c

    r9d1e3f7 rca37445  
    66
    77#ifndef PREEMPTION_RATE
    8 #define PREEMPTION_RATE 10_000ul
     8#define PREEMPTION_RATE 10`ms
    99#endif
    1010
    11 unsigned int default_preemption() {
     11Duration default_preemption() {
    1212        return PREEMPTION_RATE;
    1313}

  • src/tests/preempt_longrun/processor.c

    r9d1e3f7 rca37445  
    55
    66#ifndef PREEMPTION_RATE
    7 #define PREEMPTION_RATE 10_000ul
     7#define PREEMPTION_RATE 10`ms
    88#endif
    99
    10 unsigned int default_preemption() {
     10Duration default_preemption() {
    1111        return PREEMPTION_RATE;
    1212}

  • src/tests/preempt_longrun/stack.c

    r9d1e3f7 rca37445  
    55
    66#ifndef PREEMPTION_RATE
    7 #define PREEMPTION_RATE 10_000ul
     7#define PREEMPTION_RATE 10`ms
    88#endif
    99
    10 unsigned int default_preemption() {
     10Duration default_preemption() {
    1111        return PREEMPTION_RATE;
    1212}

  • src/tests/preempt_longrun/yield.c

    r9d1e3f7 rca37445  
    99
    1010#ifndef PREEMPTION_RATE
    11 #define PREEMPTION_RATE 10_000ul
     11#define PREEMPTION_RATE 10`ms
    1212#endif
    1313
    14 unsigned int default_preemption() {
     14Duration default_preemption() {
    1515        return PREEMPTION_RATE;
    1616}
Note: See TracChangeset for help on using the changeset viewer.