Ignore:
Timestamp:
Nov 17, 2017, 10:56:16 AM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
cdbfab0
Parents:
f5c3b6c (diff), b7f8cb4 (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 fix-bug-51

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/proposals/concurrency/figures/int_monitor.fig

    rf5c3b6c r0fe4e62  
    88-2
    991200 2
    10 5 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 600.000 2625.000 600 2325 300 2625 600 2925
    11 6 3225 4500 7425 4800
    12 1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3375 4650 80 80 3375 4650 3455 4730
    13 1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4725 4650 105 105 4725 4650 4830 4755
    14 1 3 0 1 -1 -1 0 0 4 0.000 1 0.0000 6225 4650 105 105 6225 4650 6330 4755
    15 4 0 -1 0 0 0 12 0.0000 2 135 1035 4950 4725 blocked task\001
    16 4 0 -1 0 0 0 12 0.0000 2 135 870 3525 4725 active task\001
    17 4 0 -1 0 0 0 12 0.0000 2 180 930 6450 4725 routine ptrs\001
     105 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 675.000 2700.000 675 2400 375 2700 675 3000
     116 4533 2866 4655 3129
     125 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 4657.017 2997.000 4655 2873 4533 2997 4655 3121
     132 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
     14         4655 2866 4655 3129
    1815-6
    19 6 8445 1695 8655 1905
    20 1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 8550 1800 105 105 8550 1800 8655 1905
    21 4 1 -1 0 0 0 10 0.0000 2 75 75 8550 1860 a\001
     166 4725 2866 4847 3129
     175 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 4849.017 2997.000 4847 2873 4725 2997 4847 3121
     182 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
     19         4847 2866 4847 3129
    2220-6
    23 6 8445 1395 8655 1605
    24 1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 8550 1500 105 105 8550 1500 8655 1605
    25 4 1 -1 0 0 0 10 0.0000 2 105 90 8550 1560 b\001
     216 4911 2866 5033 3129
     225 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 5035.017 2997.000 5033 2873 4911 2997 5033 3121
     232 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
     24         5033 2866 5033 3129
    2625-6
    27 6 3945 1695 4155 1905
    28 1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4050 1800 105 105 4050 1800 4155 1905
    29 4 1 -1 0 0 0 10 0.0000 2 75 75 4050 1860 a\001
     266 9027 2866 9149 3129
     275 1 0 1 0 7 50 -1 -1 0.000 0 0 0 0 9024.983 2997.000 9027 2873 9149 2997 9027 3121
     282 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
     29         9027 2866 9027 3129
    3030-6
    31 6 3945 1395 4155 1605
    32 1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4050 1500 105 105 4050 1500 4155 1605
    33 4 1 -1 0 0 0 10 0.0000 2 105 90 4050 1560 b\001
     316 9253 2866 9375 3129
     325 1 0 1 0 7 50 -1 -1 0.000 0 0 0 0 9250.983 2997.000 9253 2873 9375 2997 9253 3121
     332 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
     34         9253 2866 9253 3129
     35-6
     366 9478 2866 9600 3129
     375 1 0 1 0 7 50 -1 -1 0.000 0 0 0 0 9475.983 2997.000 9478 2873 9600 2997 9478 3121
     382 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
     39         9478 2866 9478 3129
    3440-6
    35411 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 7650 3675 80 80 7650 3675 7730 3755
    36421 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3150 3675 80 80 3150 3675 3230 3755
     431 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 4047 1793 125 125 4047 1793 3929 1752
     441 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 4050 1500 125 125 4050 1500 3932 1459
     451 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 8550 1500 125 125 8550 1500 8432 1459
     461 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 8550 1800 125 125 8550 1800 8432 1759
     471 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 1200 2850 125 125 1200 2850 1082 2809
     481 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 900 2850 125 125 900 2850 782 2809
     491 3 0 1 -1 -1 0 0 4 0.000 1 0.0000 6225 4650 105 105 6225 4650 6330 4755
     501 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3150 4650 80 80 3150 4650 3230 4730
     511 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4575 4650 105 105 4575 4650 4680 4755
    37522 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    3853         3900 1950 4200 2100
     
    6277         3000 4050 3300 4200
    63782 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    64          600 2925 1350 2925
     79         675 3000 1425 3000
    65802 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    66          600 2325 1350 2325
     81         675 2400 1425 2400
    67822 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    68          1350 2625 1425 2850
     83         1425 2700 1500 2925
    69842 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    70          1350 2325 1275 2550
     85         1425 2400 1350 2625
    71862 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    72          600 2625 1350 2625
    73 2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
    74          1350 2775 1275 2645 1125 2645 1050 2775 1125 2905 1275 2905
    75          1350 2775
    76 2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
    77          975 2775 900 2645 750 2645 675 2775 750 2905 900 2905
    78          975 2775
    79 2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
    80          4800 3000 4725 2870 4575 2870 4500 3000 4575 3130 4725 3130
    81          4800 3000
    82 2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
    83          5100 3000 5025 2870 4875 2870 4800 3000 4875 3130 5025 3130
    84          5100 3000
    85 2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
    86          9300 3000 9225 2870 9075 2870 9000 3000 9075 3130 9225 3130
    87          9300 3000
    88 2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
    89          9600 3000 9525 2870 9375 2870 9300 3000 9375 3130 9525 3130
    90          9600 3000
    91 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    92          675 2775 975 2775
    93 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    94          1050 2775 1350 2775
    95 2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
    96          4875 4950 4800 4820 4650 4820 4575 4950 4650 5080 4800 5080
    97          4875 4950
    98 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
    99          4575 4950 4875 4950
    100 2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
    101          3525 4970 3450 4840 3300 4840 3225 4970 3300 5100 3450 5100
    102          3525 4970
     87         675 2700 1425 2700
    103884 1 -1 0 0 0 12 0.0000 2 135 315 2850 4275 exit\001
    104894 1 -1 0 0 0 12 0.0000 2 135 315 7350 4275 exit\001
     
    1211064 1 -1 0 0 0 12 0.0000 2 135 495 4050 1275 queue\001
    1221074 1 -1 0 0 0 12 0.0000 2 165 420 4050 1050 entry\001
    123 4 0 0 50 -1 0 11 0.0000 2 120 705 450 2250 Condition\001
    124 4 0 0 50 -1 0 11 0.0000 2 165 630 3600 5025 signalled\001
    125 4 0 0 50 -1 0 11 0.0000 2 165 525 4950 5025 waiting\001
     1084 0 0 50 -1 0 11 0.0000 2 120 705 600 2325 Condition\001
     1094 0 -1 0 0 0 12 0.0000 2 180 930 6450 4725 routine ptrs\001
     1104 0 -1 0 0 0 12 0.0000 2 135 1050 3300 4725 active thread\001
     1114 0 -1 0 0 0 12 0.0000 2 135 1215 4725 4725 blocked thread\001
Note: See TracChangeset for help on using the changeset viewer.