Index: doc/papers/concurrency/figures/ext_monitor.fig
===================================================================
--- doc/papers/concurrency/figures/ext_monitor.fig	(revision 604e76dc97ade3d13004047eb233d487f70f6289)
+++ doc/papers/concurrency/figures/ext_monitor.fig	(revision 184557ed94d1cdbdc6fd685e497e5375f8968a96)
@@ -8,89 +8,89 @@
 -2
 1200 2
-5 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 3150.000 3450.000 3150 3150 2850 3450 3150 3750
-5 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 3150.000 4350.000 3150 4050 2850 4350 3150 4650
-6 5850 1950 6150 2250
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 2100 105 105 6000 2100 6105 2205
-4 1 -1 0 0 0 10 0.0000 2 105 90 6000 2160 d\001
+5 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1575.000 3450.000 1575 3150 1275 3450 1575 3750
+5 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1575.000 4350.000 1575 4050 1275 4350 1575 4650
+6 4275 1950 4575 2250
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4425 2100 105 105 4425 2100 4530 2205
+4 1 -1 0 0 0 10 0.0000 2 105 90 4425 2160 d\001
 -6
-6 5100 2100 5400 2400
-1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 5250 2250 105 105 5250 2250 5355 2250
-4 1 -1 0 0 0 10 0.0000 2 105 120 5250 2295 X\001
+6 4275 1650 4575 1950
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4425 1800 105 105 4425 1800 4530 1905
+4 1 -1 0 0 0 10 0.0000 2 105 90 4425 1860 b\001
 -6
-6 5100 1800 5400 2100
-1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 5250 1950 105 105 5250 1950 5355 1950
-4 1 -1 0 0 0 10 0.0000 2 105 120 5250 2010 Y\001
+6 1495 5445 5700 5655
+1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 1575 5550 80 80 1575 5550 1655 5630
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 2925 5550 105 105 2925 5550 3030 5655
+1 3 0 1 -1 -1 0 0 4 0.000 1 0.0000 4425 5550 105 105 4425 5550 4530 5655
+4 0 -1 0 0 0 12 0.0000 2 135 1035 3150 5625 blocked task\001
+4 0 -1 0 0 0 12 0.0000 2 135 870 1725 5625 active task\001
+4 0 -1 0 0 0 12 0.0000 2 135 1050 4650 5625 routine mask\001
 -6
-6 5850 1650 6150 1950
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 1800 105 105 6000 1800 6105 1905
-4 1 -1 0 0 0 10 0.0000 2 105 90 6000 1860 b\001
+6 3525 1800 3825 2400
+1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 3675 1950 105 105 3675 1950 3780 1950
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3525 1800 3825 1800 3825 2400 3525 2400 3525 1800
+4 1 4 0 0 0 10 0.0000 2 105 120 3675 2010 Y\001
 -6
-6 3070 5445 7275 5655
-1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3150 5550 80 80 3150 5550 3230 5630
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4500 5550 105 105 4500 5550 4605 5655
-1 3 0 1 -1 -1 0 0 4 0.000 1 0.0000 6000 5550 105 105 6000 5550 6105 5655
-4 0 -1 0 0 0 12 0.0000 2 135 1035 4725 5625 blocked task\001
-4 0 -1 0 0 0 12 0.0000 2 135 870 3300 5625 active task\001
-4 0 -1 0 0 0 12 0.0000 2 135 1050 6225 5625 routine mask\001
+6 3525 2100 3825 2400
+1 3 0 1 -1 -1 1 0 4 0.000 1 0.0000 3675 2250 105 105 3675 2250 3780 2250
+4 1 4 0 0 0 10 0.0000 2 105 120 3675 2295 X\001
 -6
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 3300 3600 105 105 3300 3600 3405 3705
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 3600 3600 105 105 3600 3600 3705 3705
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6600 3900 105 105 6600 3900 6705 4005
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6900 3900 105 105 6900 3900 7005 4005
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 2700 105 105 6000 2700 6105 2805
-1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 6000 2400 105 105 6000 2400 6105 2505
-1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 5100 4575 80 80 5100 4575 5180 4655
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 1725 3600 105 105 1725 3600 1830 3705
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 2025 3600 105 105 2025 3600 2130 3705
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 5025 3900 105 105 5025 3900 5130 4005
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 5325 3900 105 105 5325 3900 5430 4005
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4425 2700 105 105 4425 2700 4530 2805
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4425 2400 105 105 4425 2400 4530 2505
+1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3525 4575 80 80 3525 4575 3605 4655
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 4050 2925 5475 2925 5475 3225 4050 3225 4050 2925
+	 2475 2925 3900 2925 3900 3225 2475 3225 2475 2925
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
-	 3150 3750 3750 3750 3750 4050 3150 4050
+	 1575 3750 2175 3750 2175 4050 1575 4050
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 3
-	 3150 3450 3750 3450 3900 3675
+	 1575 3450 2175 3450 2325 3675
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
-	 3750 3150 3600 3375
+	 2175 3150 2025 3375
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 3
-	 3150 4350 3750 4350 3900 4575
+	 1575 4350 2175 4350 2325 4575
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
-	 3750 4050 3600 4275
+	 2175 4050 2025 4275
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
-	 3150 4650 3750 4650 3750 4950 4950 4950
+	 1575 4650 2175 4650 2175 4950 3375 4950
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
-	 6450 3750 6300 3975
+	 4875 3750 4725 3975
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 2
-	 4950 4950 5175 5100
+	 3375 4950 3600 5100
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 9
-	 5250 4950 6450 4950 6450 4050 7050 4050 7050 3750 6450 3750
-	 6450 2850 6150 2850 6150 1650
+	 3675 4950 4875 4950 4875 4050 5475 4050 5475 3750 4875 3750
+	 4875 2850 4575 2850 4575 1650
 2 2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
-	 5850 4200 5850 3300 4350 3300 4350 4200 5850 4200
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 1 2
+	 4275 4200 4275 3300 2775 3300 2775 4200 4275 4200
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 1.00 60.00 120.00
-	7 1 1.00 60.00 120.00
-	 5250 3150 5250 2400
+	 3675 3075 3675 2400
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4125 2850 4575 3000
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 3150 3150 3750 3150 3750 2850 5700 2850 5700 1650
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-	 5700 2850 6150 3000
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
-	 5100 1800 5400 1800 5400 2400 5100 2400 5100 1800
-4 1 -1 0 0 0 10 0.0000 2 75 75 6000 2745 a\001
-4 1 -1 0 0 0 10 0.0000 2 75 75 6000 2445 c\001
-4 1 -1 0 0 0 12 0.0000 2 135 315 5100 5325 exit\001
-4 1 -1 0 0 0 12 0.0000 2 135 135 3300 3075 A\001
-4 1 -1 0 0 0 12 0.0000 2 135 795 3300 4875 condition\001
-4 1 -1 0 0 0 12 0.0000 2 135 135 3300 5100 B\001
-4 0 -1 0 0 0 12 0.0000 2 135 420 6600 3675 stack\001
-4 0 -1 0 0 0 12 0.0000 2 180 750 6600 3225 acceptor/\001
-4 0 -1 0 0 0 12 0.0000 2 180 750 6600 3450 signalled\001
-4 1 -1 0 0 0 12 0.0000 2 135 795 3300 2850 condition\001
-4 1 -1 0 0 0 12 0.0000 2 165 420 6000 1350 entry\001
-4 1 -1 0 0 0 12 0.0000 2 135 495 6000 1575 queue\001
-4 0 -1 0 0 0 12 0.0000 2 135 525 6300 2400 arrival\001
-4 0 -1 0 0 0 12 0.0000 2 135 630 6300 2175 order of\001
-4 1 -1 0 0 0 12 0.0000 2 135 525 5100 3675 shared\001
-4 1 -1 0 0 0 12 0.0000 2 135 735 5100 3975 variables\001
-4 0 0 50 -1 0 11 0.0000 2 165 855 4275 3150 Acceptables\001
-4 0 0 50 -1 0 11 0.0000 2 120 165 5775 2700 W\001
-4 0 0 50 -1 0 11 0.0000 2 120 135 5775 2400 X\001
-4 0 0 50 -1 0 11 0.0000 2 120 105 5775 2100 Z\001
-4 0 0 50 -1 0 11 0.0000 2 120 135 5775 1800 Y\001
+	 1575 3150 2175 3150 2175 2850 4125 2850 4125 1650
+4 1 -1 0 0 0 10 0.0000 2 75 75 4425 2745 a\001
+4 1 -1 0 0 0 10 0.0000 2 75 75 4425 2445 c\001
+4 1 -1 0 0 0 12 0.0000 2 135 315 3525 5325 exit\001
+4 1 -1 0 0 0 12 0.0000 2 135 135 1725 3075 A\001
+4 1 -1 0 0 0 12 0.0000 2 135 795 1725 4875 condition\001
+4 1 -1 0 0 0 12 0.0000 2 135 135 1725 5100 B\001
+4 0 -1 0 0 0 12 0.0000 2 135 420 5025 3675 stack\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 5025 3225 acceptor/\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 5025 3450 signalled\001
+4 1 -1 0 0 0 12 0.0000 2 135 795 1725 2850 condition\001
+4 1 -1 0 0 0 12 0.0000 2 165 420 4425 1350 entry\001
+4 1 -1 0 0 0 12 0.0000 2 135 495 4425 1575 queue\001
+4 0 -1 0 0 0 12 0.0000 2 135 525 4725 2400 arrival\001
+4 0 -1 0 0 0 12 0.0000 2 135 630 4725 2175 order of\001
+4 1 -1 0 0 0 12 0.0000 2 135 525 3525 3675 shared\001
+4 1 -1 0 0 0 12 0.0000 2 135 735 3525 3975 variables\001
+4 0 4 50 -1 0 11 0.0000 2 120 135 4150 1875 Y\001
+4 0 4 50 -1 0 11 0.0000 2 120 105 4150 2175 Z\001
+4 0 4 50 -1 0 11 0.0000 2 120 135 4150 2475 X\001
+4 0 4 50 -1 0 11 0.0000 2 120 165 4150 2775 W\001
+4 0 -1 0 0 3 12 0.0000 2 150 540 5025 4275 urgent\001
+4 1 0 50 -1 0 11 0.0000 2 165 600 3150 3150 accepted\001
Index: doc/papers/concurrency/figures/monitor.fig
===================================================================
--- doc/papers/concurrency/figures/monitor.fig	(revision 604e76dc97ade3d13004047eb233d487f70f6289)
+++ doc/papers/concurrency/figures/monitor.fig	(revision 184557ed94d1cdbdc6fd685e497e5375f8968a96)
@@ -72,6 +72,4 @@
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
 	 3600 1500 3600 2100 4200 2100 4200 900
-2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
-	 2700 1500 2700 2100 3300 2100 3300 1500
 2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 9
 	 3600 4200 4800 4200 4800 3300 5400 3300 5400 3000 4800 3000
@@ -79,4 +77,6 @@
 2 2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
 	 4200 3450 4200 2550 2700 2550 2700 3450 4200 3450
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 4
+	 2700 1500 2700 2100 3300 2100 3300 1500
 4 1 -1 0 0 0 10 0.0000 2 75 75 4350 1995 a\001
 4 1 -1 0 0 0 10 0.0000 2 75 75 4350 1695 c\001
@@ -89,6 +89,6 @@
 4 0 -1 0 0 0 12 0.0000 2 180 750 4950 2700 signalled\001
 4 1 -1 0 0 0 12 0.0000 2 135 795 1650 2100 condition\001
-4 1 -1 0 0 0 12 0.0000 2 135 135 2550 1425 X\001
-4 1 -1 0 0 0 12 0.0000 2 135 135 3450 1425 Y\001
+4 1 4 0 0 0 12 0.0000 2 135 135 2550 1425 X\001
+4 1 4 0 0 0 12 0.0000 2 135 135 3450 1425 Y\001
 4 1 -1 0 0 0 12 0.0000 2 165 420 4350 600 entry\001
 4 1 -1 0 0 0 12 0.0000 2 135 495 4350 825 queue\001
@@ -100,2 +100,3 @@
 4 1 -1 0 0 0 10 0.0000 2 75 75 3450 1995 c\001
 4 1 -1 0 0 0 12 0.0000 2 135 570 3000 1200 queues\001
+4 0 -1 0 0 3 12 0.0000 2 150 540 4950 3525 urgent\001
