| author | wenzelm | 
| Tue, 28 Aug 2012 20:16:11 +0200 | |
| changeset 48989 | 06c0e350782c | 
| parent 48879 | cb5cdbb645cd | 
| child 50118 | 89a14e495526 | 
| permissions | -rw-r--r-- | 
| 23961 | 1  | 
(* Title: Pure/ML-Systems/multithreading_polyml.ML  | 
2  | 
Author: Makarius  | 
|
3  | 
||
| 47979 | 4  | 
Multithreading in Poly/ML 5.3.0 or later (cf. polyml/basis/Thread.sml).  | 
| 23961 | 5  | 
*)  | 
6  | 
||
| 25704 | 7  | 
signature MULTITHREADING_POLYML =  | 
8  | 
sig  | 
|
| 
26083
 
abb3f8dd66dc
removed managed_process (cf. General/shell_process.ML);
 
wenzelm 
parents: 
26074 
diff
changeset
 | 
9  | 
  val interruptible: ('a -> 'b) -> 'a -> 'b
 | 
| 
 
abb3f8dd66dc
removed managed_process (cf. General/shell_process.ML);
 
wenzelm 
parents: 
26074 
diff
changeset
 | 
10  | 
  val uninterruptible: ((('c -> 'd) -> 'c -> 'd) -> 'a -> 'b) -> 'a -> 'b
 | 
| 25704 | 11  | 
end;  | 
12  | 
||
13  | 
signature BASIC_MULTITHREADING =  | 
|
14  | 
sig  | 
|
15  | 
include BASIC_MULTITHREADING  | 
|
16  | 
include MULTITHREADING_POLYML  | 
|
17  | 
end;  | 
|
18  | 
||
| 24208 | 19  | 
signature MULTITHREADING =  | 
20  | 
sig  | 
|
21  | 
include MULTITHREADING  | 
|
| 25704 | 22  | 
include MULTITHREADING_POLYML  | 
| 24208 | 23  | 
end;  | 
24  | 
||
| 23961 | 25  | 
structure Multithreading: MULTITHREADING =  | 
26  | 
struct  | 
|
27  | 
||
| 32185 | 28  | 
(* options *)  | 
| 32184 | 29  | 
|
| 23981 | 30  | 
val available = true;  | 
| 
25775
 
90525e67ede7
added Multithreading.max_threads_value, which maps a value of 0 to number of CPUs;
 
wenzelm 
parents: 
25735 
diff
changeset
 | 
31  | 
|
| 48879 | 32  | 
val max_threads = ref 1;  | 
| 23973 | 33  | 
|
| 
25775
 
90525e67ede7
added Multithreading.max_threads_value, which maps a value of 0 to number of CPUs;
 
wenzelm 
parents: 
25735 
diff
changeset
 | 
34  | 
fun max_threads_value () =  | 
| 
31630
 
2f8ed0dca3bd
back to default -M max, with more robust interpretation of corresponding max_threads value;
 
wenzelm 
parents: 
31311 
diff
changeset
 | 
35  | 
let val m = ! max_threads in  | 
| 
 
2f8ed0dca3bd
back to default -M max, with more robust interpretation of corresponding max_threads value;
 
wenzelm 
parents: 
31311 
diff
changeset
 | 
36  | 
if m > 0 then m  | 
| 
33180
 
e1b0280f0299
implicit default is 4 cores -- more cost-effective;
 
wenzelm 
parents: 
32738 
diff
changeset
 | 
37  | 
else Int.min (Int.max (Thread.numProcessors (), 1), 4)  | 
| 
31630
 
2f8ed0dca3bd
back to default -M max, with more robust interpretation of corresponding max_threads value;
 
wenzelm 
parents: 
31311 
diff
changeset
 | 
38  | 
end;  | 
| 
25775
 
90525e67ede7
added Multithreading.max_threads_value, which maps a value of 0 to number of CPUs;
 
wenzelm 
parents: 
25735 
diff
changeset
 | 
39  | 
|
| 28555 | 40  | 
fun enabled () = max_threads_value () > 1;  | 
41  | 
||
| 23973 | 42  | 
|
| 24208 | 43  | 
(* thread attributes *)  | 
44  | 
||
| 28161 | 45  | 
val no_interrupts =  | 
46  | 
[Thread.EnableBroadcastInterrupt false, Thread.InterruptState Thread.InterruptDefer];  | 
|
47  | 
||
| 
41713
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
48  | 
val test_interrupts =  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
49  | 
[Thread.EnableBroadcastInterrupt false, Thread.InterruptState Thread.InterruptSynch];  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
50  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
51  | 
val public_interrupts =  | 
| 28161 | 52  | 
[Thread.EnableBroadcastInterrupt true, Thread.InterruptState Thread.InterruptAsynchOnce];  | 
53  | 
||
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
54  | 
val private_interrupts =  | 
| 
30612
 
cb6421b6a18f
future_job: do not inherit attributes, but enforce restricted interrupts -- attempt to prevent interrupt race conditions;
 
wenzelm 
parents: 
30602 
diff
changeset
 | 
55  | 
[Thread.EnableBroadcastInterrupt false, Thread.InterruptState Thread.InterruptAsynchOnce];  | 
| 
 
cb6421b6a18f
future_job: do not inherit attributes, but enforce restricted interrupts -- attempt to prevent interrupt race conditions;
 
wenzelm 
parents: 
30602 
diff
changeset
 | 
56  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
57  | 
val sync_interrupts = map  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
58  | 
(fn x as Thread.InterruptState Thread.InterruptDefer => x  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
59  | 
| Thread.InterruptState _ => Thread.InterruptState Thread.InterruptSynch  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
60  | 
| x => x);  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
61  | 
|
| 
28466
 
6e35fbfc32b8
with_attributes: enforces InterruptAsynch => InterruptAsynchOnce to avoid race condition;
 
wenzelm 
parents: 
28465 
diff
changeset
 | 
62  | 
val safe_interrupts = map  | 
| 
 
6e35fbfc32b8
with_attributes: enforces InterruptAsynch => InterruptAsynchOnce to avoid race condition;
 
wenzelm 
parents: 
28465 
diff
changeset
 | 
63  | 
(fn Thread.InterruptState Thread.InterruptAsynch =>  | 
| 
 
6e35fbfc32b8
with_attributes: enforces InterruptAsynch => InterruptAsynchOnce to avoid race condition;
 
wenzelm 
parents: 
28465 
diff
changeset
 | 
64  | 
Thread.InterruptState Thread.InterruptAsynchOnce  | 
| 
 
6e35fbfc32b8
with_attributes: enforces InterruptAsynch => InterruptAsynchOnce to avoid race condition;
 
wenzelm 
parents: 
28465 
diff
changeset
 | 
65  | 
| x => x);  | 
| 
 
6e35fbfc32b8
with_attributes: enforces InterruptAsynch => InterruptAsynchOnce to avoid race condition;
 
wenzelm 
parents: 
28465 
diff
changeset
 | 
66  | 
|
| 
41713
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
67  | 
fun interrupted () =  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
68  | 
let  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
69  | 
val orig_atts = safe_interrupts (Thread.getAttributes ());  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
70  | 
val _ = Thread.setAttributes test_interrupts;  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
71  | 
val test = Exn.capture Thread.testInterrupt ();  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
72  | 
val _ = Thread.setAttributes orig_atts;  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
73  | 
in Exn.release test end;  | 
| 
 
a21084741b37
added Multithreading.interrupted (cf. java.lang.Thread.interrupted);
 
wenzelm 
parents: 
41710 
diff
changeset
 | 
74  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
75  | 
fun with_attributes new_atts e =  | 
| 24208 | 76  | 
let  | 
| 
29550
 
67ec51c032cb
with_attributes: make double sure that unsafe attributes are avoided;
 
wenzelm 
parents: 
28555 
diff
changeset
 | 
77  | 
val orig_atts = safe_interrupts (Thread.getAttributes ());  | 
| 
30602
 
1bd90b76477a
with_attributes: canonical capture/release scheme (potentially iron out race condition);
 
wenzelm 
parents: 
29564 
diff
changeset
 | 
78  | 
val result = Exn.capture (fn () =>  | 
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
79  | 
(Thread.setAttributes (safe_interrupts new_atts); e orig_atts)) ();  | 
| 
30602
 
1bd90b76477a
with_attributes: canonical capture/release scheme (potentially iron out race condition);
 
wenzelm 
parents: 
29564 
diff
changeset
 | 
80  | 
val _ = Thread.setAttributes orig_atts;  | 
| 
28466
 
6e35fbfc32b8
with_attributes: enforces InterruptAsynch => InterruptAsynchOnce to avoid race condition;
 
wenzelm 
parents: 
28465 
diff
changeset
 | 
81  | 
in Exn.release result end;  | 
| 24208 | 82  | 
|
| 
32286
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
83  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
84  | 
(* portable wrappers *)  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
85  | 
|
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
86  | 
fun interruptible f x = with_attributes public_interrupts (fn _ => f x);  | 
| 
32286
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
87  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
88  | 
fun uninterruptible f x =  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
89  | 
with_attributes no_interrupts (fn atts =>  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
90  | 
f (fn g => fn y => with_attributes atts (fn _ => g y)) x);  | 
| 24668 | 91  | 
|
| 
24688
 
a5754ca5c510
replaced interrupt_timeout by TimeLimit.timeLimit (available on SML/NJ and Poly/ML 5.1);
 
wenzelm 
parents: 
24672 
diff
changeset
 | 
92  | 
|
| 
32286
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
93  | 
(* synchronous wait *)  | 
| 
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
94  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
95  | 
fun sync_wait opt_atts time cond lock =  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
96  | 
with_attributes  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
97  | 
(sync_interrupts (case opt_atts of SOME atts => atts | NONE => Thread.getAttributes ()))  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
98  | 
(fn _ =>  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
99  | 
(case time of  | 
| 
43761
 
e72ba84ae58f
tuned signature -- corresponding to Scala version;
 
wenzelm 
parents: 
41713 
diff
changeset
 | 
100  | 
SOME t => Exn.Res (ConditionVar.waitUntil (cond, lock, t))  | 
| 
 
e72ba84ae58f
tuned signature -- corresponding to Scala version;
 
wenzelm 
parents: 
41713 
diff
changeset
 | 
101  | 
| NONE => (ConditionVar.wait (cond, lock); Exn.Res true))  | 
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
102  | 
handle exn => Exn.Exn exn);  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
103  | 
|
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
104  | 
|
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
105  | 
(* tracing *)  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
106  | 
|
| 
39616
 
8052101883c3
renamed setmp_noncritical to Unsynchronized.setmp to emphasize its meaning;
 
wenzelm 
parents: 
39583 
diff
changeset
 | 
107  | 
val trace = ref 0;  | 
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
108  | 
|
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
109  | 
fun tracing level msg =  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
110  | 
if level > ! trace then ()  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
111  | 
else uninterruptible (fn _ => fn () =>  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
112  | 
    (TextIO.output (TextIO.stdErr, (">>> " ^ msg () ^ "\n")); TextIO.flushOut TextIO.stdErr)
 | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
113  | 
handle _ (*sic*) => ()) ();  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
114  | 
|
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
115  | 
fun tracing_time detailed time =  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
116  | 
tracing  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
117  | 
(if not detailed then 5  | 
| 40301 | 118  | 
else if Time.>= (time, seconds 1.0) then 1  | 
119  | 
else if Time.>= (time, seconds 0.1) then 2  | 
|
120  | 
else if Time.>= (time, seconds 0.01) then 3  | 
|
121  | 
else if Time.>= (time, seconds 0.001) then 4 else 5);  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
122  | 
|
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
123  | 
fun real_time f x =  | 
| 
32286
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
124  | 
let  | 
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
125  | 
val timer = Timer.startRealTimer ();  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
126  | 
val () = f x;  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
127  | 
val time = Timer.checkRealTimer timer;  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32286 
diff
changeset
 | 
128  | 
in time end;  | 
| 
32286
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
129  | 
|
| 
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
130  | 
|
| 23961 | 131  | 
(* critical section -- may be nested within the same thread *)  | 
132  | 
||
133  | 
local  | 
|
134  | 
||
| 24063 | 135  | 
val critical_lock = Mutex.mutex ();  | 
| 
39616
 
8052101883c3
renamed setmp_noncritical to Unsynchronized.setmp to emphasize its meaning;
 
wenzelm 
parents: 
39583 
diff
changeset
 | 
136  | 
val critical_thread = ref (NONE: Thread.thread option);  | 
| 
 
8052101883c3
renamed setmp_noncritical to Unsynchronized.setmp to emphasize its meaning;
 
wenzelm 
parents: 
39583 
diff
changeset
 | 
137  | 
val critical_name = ref "";  | 
| 24063 | 138  | 
|
| 
40748
 
591b6778d076
removed bash from ML system bootstrap, and past the Secure ML barrier;
 
wenzelm 
parents: 
40301 
diff
changeset
 | 
139  | 
fun show "" = "" | show name = " " ^ name;  | 
| 
 
591b6778d076
removed bash from ML system bootstrap, and past the Secure ML barrier;
 
wenzelm 
parents: 
40301 
diff
changeset
 | 
140  | 
fun show' "" = "" | show' name = " [" ^ name ^ "]";  | 
| 
 
591b6778d076
removed bash from ML system bootstrap, and past the Secure ML barrier;
 
wenzelm 
parents: 
40301 
diff
changeset
 | 
141  | 
|
| 23961 | 142  | 
in  | 
143  | 
||
144  | 
fun self_critical () =  | 
|
145  | 
(case ! critical_thread of  | 
|
146  | 
NONE => false  | 
|
| 28150 | 147  | 
| SOME t => Thread.equal (t, Thread.self ()));  | 
| 23961 | 148  | 
|
| 23991 | 149  | 
fun NAMED_CRITICAL name e =  | 
| 23961 | 150  | 
if self_critical () then e ()  | 
151  | 
else  | 
|
| 32184 | 152  | 
Exn.release (uninterruptible (fn restore_attributes => fn () =>  | 
| 24208 | 153  | 
let  | 
154  | 
val name' = ! critical_name;  | 
|
155  | 
val _ =  | 
|
156  | 
if Mutex.trylock critical_lock then ()  | 
|
157  | 
else  | 
|
158  | 
let  | 
|
| 32184 | 159  | 
val _ = tracing 5 (fn () => "CRITICAL" ^ show name ^ show' name' ^ ": waiting");  | 
| 32185 | 160  | 
val time = real_time Mutex.lock critical_lock;  | 
| 32186 | 161  | 
val _ = tracing_time true time (fn () =>  | 
| 24208 | 162  | 
"CRITICAL" ^ show name ^ show' name' ^ ": passed after " ^ Time.toString time);  | 
163  | 
in () end;  | 
|
164  | 
val _ = critical_thread := SOME (Thread.self ());  | 
|
165  | 
val _ = critical_name := name;  | 
|
| 
26083
 
abb3f8dd66dc
removed managed_process (cf. General/shell_process.ML);
 
wenzelm 
parents: 
26074 
diff
changeset
 | 
166  | 
val result = Exn.capture (restore_attributes e) ();  | 
| 24208 | 167  | 
val _ = critical_name := "";  | 
168  | 
val _ = critical_thread := NONE;  | 
|
169  | 
val _ = Mutex.unlock critical_lock;  | 
|
| 32184 | 170  | 
in result end) ());  | 
| 23961 | 171  | 
|
| 23991 | 172  | 
fun CRITICAL e = NAMED_CRITICAL "" e;  | 
| 23981 | 173  | 
|
| 23961 | 174  | 
end;  | 
175  | 
||
| 23973 | 176  | 
|
| 25704 | 177  | 
(* serial numbers *)  | 
178  | 
||
179  | 
local  | 
|
180  | 
||
181  | 
val serial_lock = Mutex.mutex ();  | 
|
| 
39616
 
8052101883c3
renamed setmp_noncritical to Unsynchronized.setmp to emphasize its meaning;
 
wenzelm 
parents: 
39583 
diff
changeset
 | 
182  | 
val serial_count = ref 0;  | 
| 25704 | 183  | 
|
184  | 
in  | 
|
185  | 
||
186  | 
val serial = uninterruptible (fn _ => fn () =>  | 
|
187  | 
let  | 
|
188  | 
val _ = Mutex.lock serial_lock;  | 
|
| 
28124
 
10a1f1f4c6ae
moved Multithreading.task/schedule to Concurrent/schedule.ML;
 
wenzelm 
parents: 
26504 
diff
changeset
 | 
189  | 
val _ = serial_count := ! serial_count + 1;  | 
| 
 
10a1f1f4c6ae
moved Multithreading.task/schedule to Concurrent/schedule.ML;
 
wenzelm 
parents: 
26504 
diff
changeset
 | 
190  | 
val res = ! serial_count;  | 
| 25704 | 191  | 
val _ = Mutex.unlock serial_lock;  | 
192  | 
in res end);  | 
|
193  | 
||
| 23961 | 194  | 
end;  | 
195  | 
||
| 25704 | 196  | 
end;  | 
| 
24688
 
a5754ca5c510
replaced interrupt_timeout by TimeLimit.timeLimit (available on SML/NJ and Poly/ML 5.1);
 
wenzelm 
parents: 
24672 
diff
changeset
 | 
197  | 
|
| 
32286
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
198  | 
structure Basic_Multithreading: BASIC_MULTITHREADING = Multithreading;  | 
| 
 
1fb5db48002d
added Multithreading.sync_wait, which turns enabled interrupts to sync ones, to ensure that wait will reaquire its lock when interrupted;
 
wenzelm 
parents: 
32230 
diff
changeset
 | 
199  | 
open Basic_Multithreading;  |