Changeset 2daea42


Ignore:
Timestamp:
Dec 22, 2020, 3:17:19 PM (4 years ago)
Author:
Fangren Yu <f37yu@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
bd144fd
Parents:
302ef2a (diff), c2409fd (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

Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • longrun_tests/Makefile.am

    r302ef2a r2daea42  
    4444        -DTEST_$(shell cat .type | tr a-z A-Z)
    4545
    46 TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
     46TESTS = block coroutine create disjoint enter enter3 locks processor stack wait yield
    4747
    4848# .INTERMEDIATE: $(TESTS)
  • tests/unified_locking/.expect/locks.txt

    r302ef2a r2daea42  
    1919Start Test 10: locked condition variable wait/notify with front()
    2020Done Test 10
    21 Start Test 11: unlocked condition variable delay wait
    22 Iteration: 0
    23 Iteration: 1000
    24 Iteration: 2000
    25 Iteration: 3000
    26 Iteration: 4000
    27 Iteration: 5000
    28 Iteration: 6000
    29 Iteration: 7000
    30 Iteration: 8000
    31 Iteration: 9000
    32 Done Test 11
    33 Start Test 12: locked condition variable delay wait with unlocked signal
    34 Iteration: 0
    35 Iteration: 1000
    36 Iteration: 2000
    37 Iteration: 3000
    38 Iteration: 4000
    39 Iteration: 5000
    40 Iteration: 6000
    41 Iteration: 7000
    42 Iteration: 8000
    43 Iteration: 9000
    44 Done Test 12
    45 Start Test 13: locked condition variable delay wait with locked signal
    46 Iteration: 0
    47 Iteration: 1000
    48 Iteration: 2000
    49 Iteration: 3000
    50 Iteration: 4000
    51 Iteration: 5000
    52 Iteration: 6000
    53 Iteration: 7000
    54 Iteration: 8000
    55 Iteration: 9000
    56 Done Test 13
  • tests/unified_locking/locks.cfa

    r302ef2a r2daea42  
    219219int main() {
    220220        processor p[2];
    221         wait( c_s, 1`ns );
    222221        printf("Start Test 1: multi acquisition lock and condition variable single wait/notify\n");
    223222        {
     
    281280        printf("Done Test 10\n");
    282281
    283         printf("Start Test 11: unlocked condition variable delay wait\n");
    284         {
    285                 T_C_NLWD t1;
    286                 T_C_WDS t2;
    287         }
    288         printf("Done Test 11\n");
    289 
    290         printf("Start Test 12: locked condition variable delay wait with unlocked signal\n");
    291         {
    292                 T_C_LWD t1;
    293                 T_C_WDS t2;
    294         }
    295         printf("Done Test 12\n");
    296 
    297         printf("Start Test 13: locked condition variable delay wait with locked signal\n");
    298         {
    299                 T_C_LWD t1;
    300                 T_C_LWDS t2;
    301         }
    302         printf("Done Test 13\n");
    303 }
     282        // removed to limit test duration. Full test is in long run tests
     283        // printf("Start Test 11: unlocked condition variable delay wait\n");
     284        // {
     285        //      T_C_NLWD t1;
     286        //      T_C_WDS t2;
     287        // }
     288        // printf("Done Test 11\n");
     289
     290        // printf("Start Test 12: locked condition variable delay wait with unlocked signal\n");
     291        // {
     292        //      T_C_LWD t1;
     293        //      T_C_WDS t2;
     294        // }
     295        // printf("Done Test 12\n");
     296
     297        // printf("Start Test 13: locked condition variable delay wait with locked signal\n");
     298        // {
     299        //      T_C_LWD t1;
     300        //      T_C_LWDS t2;
     301        // }
     302        // printf("Done Test 13\n");
     303}
Note: See TracChangeset for help on using the changeset viewer.