Ignore:
Timestamp:
Oct 26, 2016, 5:49:40 PM (8 years ago)
Author:
Peter A. Buhr <pabuhr@…>
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, resolv-new, with_gc
Children:
03d416f, 25f49f4, 47a8d17
Parents:
1b29996 (diff), fe7b281 (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 plg2:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/proposals/concurrency/ext_monitor.fig

    r1b29996 r6d7c3df  
    88-2
    991200 2
    10 6 1275 1200 1575 1500
    11 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 1425 1350 105 105 1425 1350 1530 1350
    12 4 1 -1 0 0 0 10 0.0000 2 105 90 1425 1410 b\001
    13 -6
    14 6 1275 1500 1575 1800
    15 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 1425 1650 105 105 1425 1650 1530 1650
    16 4 1 -1 0 0 0 10 0.0000 2 75 75 1425 1695 a\001
    17 -6
    18 6 2175 1500 2475 1800
    19 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 2325 1650 105 105 2325 1650 2430 1650
    20 4 1 -1 0 0 0 10 0.0000 2 75 75 2325 1695 c\001
    21 -6
    22 6 2175 1200 2475 1500
    23 1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 2325 1350 105 105 2325 1350 2430 1350
    24 4 1 -1 0 0 0 10 0.0000 2 105 90 2325 1410 d\001
    25 -6
    26 6 2775 1200 7350 5700
    27105 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 3150.000 3450.000 3150 3150 2850 3450 3150 3750
    28115 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 3150.000 4350.000 3150 4050 2850 4350 3150 4650
    … …  
    35184 1 -1 0 0 0 10 0.0000 2 105 90 6000 1860 b\001
    3619-6
    37 6 3000 5400 6975 5700
     206 5100 1800 5400 2100
     211 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 5250 1950 105 105 5250 1950 5355 1950
     224 1 -1 0 0 0 10 0.0000 2 105 120 5250 2010 Y\001
     23-6
     246 5100 2100 5400 2400
     251 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 5250 2250 105 105 5250 2250 5355 2250
     264 1 -1 0 0 0 10 0.0000 2 105 120 5250 2295 X\001
     27-6
     286 3000 5400 7200 5700
    38291 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3150 5550 80 80 3150 5550 3230 5630
    39301 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4500 5550 105 105 4500 5550 4605 5655
    40311 3 0 1 -1 -1 0 0 4 0.000 1 0.0000 6000 5550 105 105 6000 5550 6105 5655
    41 4 0 -1 0 0 0 12 0.0000 2 180 765 6225 5625 duplicate\001
    42324 0 -1 0 0 0 12 0.0000 2 135 1035 4725 5625 blocked task\001
    43334 0 -1 0 0 0 12 0.0000 2 135 870 3300 5625 active task\001
     344 0 -1 0 0 0 12 0.0000 2 180 930 6225 5625 routine ptrs\001
    4435-6
    45361 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 3300 3600 105 105 3300 3600 3405 3705
    … …  
    50411 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 2400 105 105 6000 2400 6105 2505
    51421 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 5100 4575 80 80 5100 4575 5180 4655
     432 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
     44         4050 2925 5475 2925 5475 3225 4050 3225 4050 2925
    52452 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
    5346         5850 2850 6075 3000
    … …  
    77702 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
    7871         3150 3150 3750 3150 3750 2850 5325 2850
     722 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 1 2
     73        1 1 1.00 60.00 120.00
     74        7 1 1.00 60.00 120.00
     75         5250 3150 5250 2400
     762 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
     77         5100 1800 5400 1800 5400 2400 5100 2400 5100 1800
    79784 1 -1 0 0 0 10 0.0000 2 75 75 6000 2745 a\001
    80794 1 -1 0 0 0 10 0.0000 2 75 75 6000 2445 c\001
    … …  
    93924 1 -1 0 0 0 12 0.0000 2 135 525 5100 3675 shared\001
    94934 1 -1 0 0 0 12 0.0000 2 135 735 5100 3975 variables\001
    95 -6
    96 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
    97          1275 1800 1500 1950
    98 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
    99          2175 1800 2400 1950
    100 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
    101          1575 1200 1575 1800 2175 1800 2175 1200
    102 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4
    103          1275 1200 1275 2100 2475 2100 2475 1200
    104 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
    105          4050 2925 5475 2925 5475 3225 4050 3225 4050 2925
    106 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    107         1 1 1.00 60.00 120.00
    108          1875 2400 1875 2175
    109 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 1 2
    110         7 1 1.00 60.00 120.00
    111          5250 3075 5250 2400
    112 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    113          5250 2400 1875 2400
    114 4 1 -1 0 0 0 12 0.0000 2 135 135 2325 1125 Y\001
    115 4 1 -1 0 0 0 12 0.0000 2 120 510 1875 675 mutex\001
    116 4 1 -1 0 0 0 12 0.0000 2 135 570 1875 900 queues\001
    117 4 1 -1 0 0 0 12 0.0000 2 135 135 1425 1125 X\001
    118 4 0 0 50 -1 0 11 0.0000 2 150 795 4275 3150 Queues Ptr\001
     944 0 0 50 -1 0 11 0.0000 2 165 855 4275 3150 Acceptables\001
Note: See TracChangeset for help on using the changeset viewer.