Ignore:
Timestamp:
Jan 30, 2020, 10:59:21 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
c334ecd
Parents:
8a13c47 (diff), 8633485b (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

  • benchmark/Makefile.am

    r8a13c47 r6f302cd  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Thu Jan 23 12:42:58 2020
    14 ## Update Count     : 253
     13## Last Modified On : Sat Jan 25 09:20:44 2020
     14## Update Count     : 255
    1515###############################################################################
    1616
    … …  
    8989ctxswitch_rust_thread_DURATION = $(ctxswitch_pthread_DURATION)
    9090ctxswitch_cfa_generator_DURATION = 5000000000
    91 ctxswitch_nodejs_await_DURATION = 1000000 # otherwise out of memory
     91ctxswitch_nodejs_await_DURATION = 5000000
    9292ctxswitch_DURATION = 100000000
    9393
Note: See TracChangeset for help on using the changeset viewer.