author | wenzelm |
Thu, 18 Aug 2011 16:07:58 +0200 | |
changeset 44268 | f6a11c1da821 |
parent 44249 | 64620f1d6f87 |
child 44294 | a0ddd5760444 |
permissions | -rw-r--r-- |
28156 | 1 |
(* Title: Pure/Concurrent/future.ML |
2 |
Author: Makarius |
|
3 |
||
44268 | 4 |
Value-oriented parallelism via futures and promises. See also |
32246 | 5 |
http://www4.in.tum.de/~wenzelm/papers/parallel-isabelle.pdf |
37904 | 6 |
http://www4.in.tum.de/~wenzelm/papers/parallel-ml.pdf |
28201 | 7 |
|
8 |
Notes: |
|
9 |
||
10 |
* Futures are similar to delayed evaluation, i.e. delay/force is |
|
44268 | 11 |
generalized to fork/join. The idea is to model parallel |
12 |
value-oriented computations (not communicating processes). |
|
28201 | 13 |
|
14 |
* Forked futures are evaluated spontaneously by a farm of worker |
|
15 |
threads in the background; join resynchronizes the computation and |
|
16 |
delivers results (values or exceptions). |
|
17 |
||
18 |
* The pool of worker threads is limited, usually in correlation with |
|
19 |
the number of physical cores on the machine. Note that allocation |
|
44268 | 20 |
of runtime resources may be distorted either if workers yield CPU |
21 |
time (e.g. via system sleep or wait operations), or if non-worker |
|
28201 | 22 |
threads contend for significant runtime resources independently. |
44268 | 23 |
There is a limited number of replacement worker threads that get |
24 |
activated in certain explicit wait conditions. |
|
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
25 |
|
44268 | 26 |
* Future tasks are organized in groups, which are block-structured. |
27 |
When forking a new new task, the default is to open an individual |
|
28 |
subgroup, unless some common group is specified explicitly. |
|
29 |
Failure of one group member causes the immediate peers to be |
|
30 |
interrupted eventually (i.e. none by default). Interrupted tasks |
|
31 |
that lack regular result information, will pick up parallel |
|
32 |
exceptions from the cumulative group context (as Par_Exn). |
|
33 |
||
34 |
* Promised "passive" futures are fulfilled by external means. There |
|
35 |
is no associated evaluation task, but other futures can depend on |
|
36 |
them via regular join operations. |
|
28156 | 37 |
*) |
38 |
||
39 |
signature FUTURE = |
|
40 |
sig |
|
32814
81897d30b97f
added Task_Queue.depend (again) -- light-weight version for transitive graph;
wenzelm
parents:
32738
diff
changeset
|
41 |
val worker_task: unit -> Task_Queue.task option |
32102 | 42 |
val worker_group: unit -> Task_Queue.group option |
37865
3a6ec95a9f68
clarified/exported Future.worker_subgroup, which is already the default for Future.fork;
wenzelm
parents:
37854
diff
changeset
|
43 |
val worker_subgroup: unit -> Task_Queue.group |
28972 | 44 |
type 'a future |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
45 |
val task_of: 'a future -> Task_Queue.task |
28972 | 46 |
val peek: 'a future -> 'a Exn.result option |
47 |
val is_finished: 'a future -> bool |
|
44198 | 48 |
val get_finished: 'a future -> 'a |
44115 | 49 |
val interruptible_task: ('a -> 'b) -> 'a -> 'b |
44110 | 50 |
val cancel_group: Task_Queue.group -> unit |
51 |
val cancel: 'a future -> unit |
|
44113 | 52 |
type fork_params = |
53 |
{name: string, group: Task_Queue.group option, deps: Task_Queue.task list, |
|
54 |
pri: int, interrupts: bool} |
|
55 |
val forks: fork_params -> (unit -> 'a) list -> 'a future list |
|
29119 | 56 |
val fork_pri: int -> (unit -> 'a) -> 'a future |
32724 | 57 |
val fork: (unit -> 'a) -> 'a future |
28972 | 58 |
val join_results: 'a future list -> 'a Exn.result list |
59 |
val join_result: 'a future -> 'a Exn.result |
|
60 |
val join: 'a future -> 'a |
|
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
61 |
val value: 'a -> 'a future |
28972 | 62 |
val map: ('a -> 'b) -> 'a future -> 'b future |
44113 | 63 |
val cond_forks: fork_params -> (unit -> 'a) list -> 'a future list |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
64 |
val promise_group: Task_Queue.group -> 'a future |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
65 |
val promise: unit -> 'a future |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
66 |
val fulfill_result: 'a future -> 'a Exn.result -> unit |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
67 |
val fulfill: 'a future -> 'a -> unit |
28203 | 68 |
val shutdown: unit -> unit |
38236
d8c7be27e01d
explicitly distinguish Output.status (essential feedback) vs. Output.report (useful markup);
wenzelm
parents:
37904
diff
changeset
|
69 |
val status: (unit -> 'a) -> 'a |
28156 | 70 |
end; |
71 |
||
72 |
structure Future: FUTURE = |
|
73 |
struct |
|
74 |
||
28177
8c0335bc9336
inherit group from running thread, or create a new one -- make it harder to re-use canceled groups;
wenzelm
parents:
28170
diff
changeset
|
75 |
(** future values **) |
8c0335bc9336
inherit group from running thread, or create a new one -- make it harder to re-use canceled groups;
wenzelm
parents:
28170
diff
changeset
|
76 |
|
28167 | 77 |
(* identifiers *) |
78 |
||
32058 | 79 |
local |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
80 |
val tag = Universal.tag () : Task_Queue.task option Universal.tag; |
32058 | 81 |
in |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
82 |
fun worker_task () = the_default NONE (Thread.getLocal tag); |
44110 | 83 |
fun setmp_worker_task task f x = setmp_thread_data tag (worker_task ()) (SOME task) f x; |
28167 | 84 |
end; |
85 |
||
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
86 |
val worker_group = Option.map Task_Queue.group_of_task o worker_task; |
37865
3a6ec95a9f68
clarified/exported Future.worker_subgroup, which is already the default for Future.fork;
wenzelm
parents:
37854
diff
changeset
|
87 |
fun worker_subgroup () = Task_Queue.new_group (worker_group ()); |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
88 |
|
41679 | 89 |
fun worker_joining e = |
90 |
(case worker_task () of |
|
91 |
NONE => e () |
|
92 |
| SOME task => Task_Queue.joining task e); |
|
93 |
||
41680
a4c822915eaa
more informative task timing: some dependency tracking;
wenzelm
parents:
41679
diff
changeset
|
94 |
fun worker_waiting deps e = |
41670 | 95 |
(case worker_task () of |
96 |
NONE => e () |
|
41680
a4c822915eaa
more informative task timing: some dependency tracking;
wenzelm
parents:
41679
diff
changeset
|
97 |
| SOME task => Task_Queue.waiting task deps e); |
41670 | 98 |
|
28167 | 99 |
|
100 |
(* datatype future *) |
|
101 |
||
35016 | 102 |
type 'a result = 'a Exn.result Single_Assignment.var; |
103 |
||
28972 | 104 |
datatype 'a future = Future of |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
105 |
{promised: bool, |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
106 |
task: Task_Queue.task, |
35016 | 107 |
result: 'a result}; |
28167 | 108 |
|
109 |
fun task_of (Future {task, ...}) = task; |
|
32253 | 110 |
fun result_of (Future {result, ...}) = result; |
28167 | 111 |
|
35016 | 112 |
fun peek x = Single_Assignment.peek (result_of x); |
28558 | 113 |
fun is_finished x = is_some (peek x); |
28320 | 114 |
|
44198 | 115 |
fun get_finished x = |
116 |
(case peek x of |
|
117 |
SOME res => Exn.release res |
|
118 |
| NONE => raise Fail "Unfinished future evaluation"); |
|
119 |
||
28167 | 120 |
|
28177
8c0335bc9336
inherit group from running thread, or create a new one -- make it harder to re-use canceled groups;
wenzelm
parents:
28170
diff
changeset
|
121 |
|
8c0335bc9336
inherit group from running thread, or create a new one -- make it harder to re-use canceled groups;
wenzelm
parents:
28170
diff
changeset
|
122 |
(** scheduling **) |
8c0335bc9336
inherit group from running thread, or create a new one -- make it harder to re-use canceled groups;
wenzelm
parents:
28170
diff
changeset
|
123 |
|
8c0335bc9336
inherit group from running thread, or create a new one -- make it harder to re-use canceled groups;
wenzelm
parents:
28170
diff
changeset
|
124 |
(* synchronization *) |
28156 | 125 |
|
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
126 |
val scheduler_event = ConditionVar.conditionVar (); |
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
127 |
val work_available = ConditionVar.conditionVar (); |
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
128 |
val work_finished = ConditionVar.conditionVar (); |
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
129 |
|
28156 | 130 |
local |
131 |
val lock = Mutex.mutex (); |
|
132 |
in |
|
133 |
||
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
37182
diff
changeset
|
134 |
fun SYNCHRONIZED name = Simple_Thread.synchronized name lock; |
28156 | 135 |
|
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
136 |
fun wait cond = (*requires SYNCHRONIZED*) |
32295
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
wenzelm
parents:
32293
diff
changeset
|
137 |
Multithreading.sync_wait NONE NONE cond lock; |
28206
bcd48c6897d4
eliminated requests, use global state variables uniformly;
wenzelm
parents:
28203
diff
changeset
|
138 |
|
32295
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
wenzelm
parents:
32293
diff
changeset
|
139 |
fun wait_timeout timeout cond = (*requires SYNCHRONIZED*) |
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
wenzelm
parents:
32293
diff
changeset
|
140 |
Multithreading.sync_wait NONE (SOME (Time.+ (Time.now (), timeout))) cond lock; |
28166
43087721a66e
moved task, thread_data, group, queue to task_queue.ML;
wenzelm
parents:
28163
diff
changeset
|
141 |
|
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
142 |
fun signal cond = (*requires SYNCHRONIZED*) |
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
143 |
ConditionVar.signal cond; |
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
144 |
|
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
145 |
fun broadcast cond = (*requires SYNCHRONIZED*) |
28166
43087721a66e
moved task, thread_data, group, queue to task_queue.ML;
wenzelm
parents:
28163
diff
changeset
|
146 |
ConditionVar.broadcast cond; |
28156 | 147 |
|
32248
0241916a5f06
more precise treatment of scheduler_event: continous pulse (50ms) instead of flooding, which was burning many CPU cycles in spare threads;
wenzelm
parents:
32247
diff
changeset
|
148 |
fun broadcast_work () = (*requires SYNCHRONIZED*) |
0241916a5f06
more precise treatment of scheduler_event: continous pulse (50ms) instead of flooding, which was burning many CPU cycles in spare threads;
wenzelm
parents:
32247
diff
changeset
|
149 |
(ConditionVar.broadcast work_available; |
32225
d5d6f47fb018
cancel: improved reactivity due to more careful broadcasting;
wenzelm
parents:
32224
diff
changeset
|
150 |
ConditionVar.broadcast work_finished); |
d5d6f47fb018
cancel: improved reactivity due to more careful broadcasting;
wenzelm
parents:
32224
diff
changeset
|
151 |
|
28156 | 152 |
end; |
153 |
||
154 |
||
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
155 |
(* global state *) |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
156 |
|
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
157 |
val queue = Unsynchronized.ref Task_Queue.empty; |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
158 |
val next = Unsynchronized.ref 0; |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
159 |
val scheduler = Unsynchronized.ref (NONE: Thread.thread option); |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
160 |
val canceled = Unsynchronized.ref ([]: Task_Queue.group list); |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
161 |
val do_shutdown = Unsynchronized.ref false; |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
162 |
val max_workers = Unsynchronized.ref 0; |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
163 |
val max_active = Unsynchronized.ref 0; |
33411
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
164 |
val worker_trend = Unsynchronized.ref 0; |
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
165 |
|
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
166 |
datatype worker_state = Working | Waiting | Sleeping; |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
167 |
val workers = Unsynchronized.ref ([]: (Thread.thread * worker_state Unsynchronized.ref) list); |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
168 |
|
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
169 |
fun count_workers state = (*requires SYNCHRONIZED*) |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
170 |
fold (fn (_, state_ref) => fn i => if ! state_ref = state then i + 1 else i) (! workers) 0; |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
171 |
|
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
172 |
|
44110 | 173 |
(* cancellation primitives *) |
32099 | 174 |
|
44110 | 175 |
fun interruptible_task f x = |
176 |
if Multithreading.available then |
|
177 |
Multithreading.with_attributes |
|
178 |
(if is_some (worker_task ()) |
|
179 |
then Multithreading.private_interrupts |
|
180 |
else Multithreading.public_interrupts) |
|
181 |
(fn _ => f x) |
|
182 |
else interruptible f x; |
|
28156 | 183 |
|
34279
02936e77a07c
tasks of canceled groups are considered "ready" -- enables to purge the queue from tasks depending on unfinished promises (also improves general reactivity);
wenzelm
parents:
34277
diff
changeset
|
184 |
fun cancel_now group = (*requires SYNCHRONIZED*) |
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
185 |
Task_Queue.cancel (! queue) group; |
34279
02936e77a07c
tasks of canceled groups are considered "ready" -- enables to purge the queue from tasks depending on unfinished promises (also improves general reactivity);
wenzelm
parents:
34277
diff
changeset
|
186 |
|
02936e77a07c
tasks of canceled groups are considered "ready" -- enables to purge the queue from tasks depending on unfinished promises (also improves general reactivity);
wenzelm
parents:
34277
diff
changeset
|
187 |
fun cancel_later group = (*requires SYNCHRONIZED*) |
32738 | 188 |
(Unsynchronized.change canceled (insert Task_Queue.eq_group group); |
189 |
broadcast scheduler_event); |
|
29341
6bb007a0f9f2
more reactive scheduler: reduced loop timeout, propagate broadcast interrupt via TaskQueue.cancel_all;
wenzelm
parents:
29119
diff
changeset
|
190 |
|
44110 | 191 |
|
192 |
(* worker threads *) |
|
193 |
||
194 |
fun worker_exec (task, jobs) = |
|
28167 | 195 |
let |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
196 |
val group = Task_Queue.group_of_task task; |
32102 | 197 |
val valid = not (Task_Queue.is_canceled group); |
41670 | 198 |
val ok = |
199 |
Task_Queue.running task (fn () => |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
200 |
setmp_worker_task task (fn () => |
41670 | 201 |
fold (fn job => fn ok => job valid andalso ok) jobs true) ()); |
41776 | 202 |
val _ = Multithreading.tracing 2 (fn () => |
41670 | 203 |
let |
43951 | 204 |
val s = Task_Queue.str_of_task_groups task; |
41670 | 205 |
fun micros time = string_of_int (Time.toNanoseconds time div 1000); |
41680
a4c822915eaa
more informative task timing: some dependency tracking;
wenzelm
parents:
41679
diff
changeset
|
206 |
val (run, wait, deps) = Task_Queue.timing_of_task task; |
a4c822915eaa
more informative task timing: some dependency tracking;
wenzelm
parents:
41679
diff
changeset
|
207 |
in "TASK " ^ s ^ " " ^ micros run ^ " " ^ micros wait ^ " (" ^ commas deps ^ ")" end); |
32246 | 208 |
val _ = SYNCHRONIZED "finish" (fn () => |
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
209 |
let |
32738 | 210 |
val maximal = Unsynchronized.change_result queue (Task_Queue.finish task); |
44111
2d16c693d536
synchronized cancel and flushing of Multithreading.interrupted state, to ensure that interrupts stay within task boundaries;
wenzelm
parents:
44110
diff
changeset
|
211 |
val _ = Exn.capture Multithreading.interrupted (); |
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
212 |
val _ = |
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
213 |
if ok then () |
34279
02936e77a07c
tasks of canceled groups are considered "ready" -- enables to purge the queue from tasks depending on unfinished promises (also improves general reactivity);
wenzelm
parents:
34277
diff
changeset
|
214 |
else if cancel_now group then () |
02936e77a07c
tasks of canceled groups are considered "ready" -- enables to purge the queue from tasks depending on unfinished promises (also improves general reactivity);
wenzelm
parents:
34277
diff
changeset
|
215 |
else cancel_later group; |
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
216 |
val _ = broadcast work_finished; |
33413
cb409680dda8
avoid broadcast work_available, use daisy-chained signal instead;
wenzelm
parents:
33411
diff
changeset
|
217 |
val _ = if maximal then () else signal work_available; |
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
218 |
in () end); |
28167 | 219 |
in () end; |
220 |
||
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
221 |
fun worker_wait active cond = (*requires SYNCHRONIZED*) |
33406
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
wenzelm
parents:
33061
diff
changeset
|
222 |
let |
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
223 |
val state = |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
224 |
(case AList.lookup Thread.equal (! workers) (Thread.self ()) of |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
225 |
SOME state => state |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
226 |
| NONE => raise Fail "Unregistered worker thread"); |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
227 |
val _ = state := (if active then Waiting else Sleeping); |
33406
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
wenzelm
parents:
33061
diff
changeset
|
228 |
val _ = wait cond; |
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
229 |
val _ = state := Working; |
33406
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
wenzelm
parents:
33061
diff
changeset
|
230 |
in () end; |
28162 | 231 |
|
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
232 |
fun worker_next () = (*requires SYNCHRONIZED*) |
33406
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
wenzelm
parents:
33061
diff
changeset
|
233 |
if length (! workers) > ! max_workers then |
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
wenzelm
parents:
33061
diff
changeset
|
234 |
(Unsynchronized.change workers (AList.delete Thread.equal (Thread.self ())); |
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
235 |
signal work_available; |
28167 | 236 |
NONE) |
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
237 |
else if count_workers Working > ! max_active then |
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
238 |
(worker_wait false work_available; worker_next ()) |
28166
43087721a66e
moved task, thread_data, group, queue to task_queue.ML;
wenzelm
parents:
28163
diff
changeset
|
239 |
else |
32738 | 240 |
(case Unsynchronized.change_result queue (Task_Queue.dequeue (Thread.self ())) of |
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
241 |
NONE => (worker_wait false work_available; worker_next ()) |
33413
cb409680dda8
avoid broadcast work_available, use daisy-chained signal instead;
wenzelm
parents:
33411
diff
changeset
|
242 |
| some => (signal work_available; some)); |
28156 | 243 |
|
28167 | 244 |
fun worker_loop name = |
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
245 |
(case SYNCHRONIZED name (fn () => worker_next ()) of |
29119 | 246 |
NONE => () |
44110 | 247 |
| SOME work => (Exn.capture Multithreading.interrupted (); worker_exec work; worker_loop name)); |
28156 | 248 |
|
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
249 |
fun worker_start name = (*requires SYNCHRONIZED*) |
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
37182
diff
changeset
|
250 |
Unsynchronized.change workers (cons (Simple_Thread.fork false (fn () => worker_loop name), |
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
251 |
Unsynchronized.ref Working)); |
28156 | 252 |
|
253 |
||
254 |
(* scheduler *) |
|
255 |
||
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
256 |
val status_ticks = Unsynchronized.ref 0; |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
257 |
|
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
258 |
val last_round = Unsynchronized.ref Time.zeroTime; |
40301 | 259 |
val next_round = seconds 0.05; |
32226 | 260 |
|
28206
bcd48c6897d4
eliminated requests, use global state variables uniformly;
wenzelm
parents:
28203
diff
changeset
|
261 |
fun scheduler_next () = (*requires SYNCHRONIZED*) |
28156 | 262 |
let |
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
263 |
val now = Time.now (); |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
264 |
val tick = Time.<= (Time.+ (! last_round, next_round), now); |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
265 |
val _ = if tick then last_round := now else (); |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
266 |
|
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
267 |
|
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
268 |
(* queue and worker status *) |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
269 |
|
32226 | 270 |
val _ = |
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
271 |
if tick then Unsynchronized.change status_ticks (fn i => (i + 1) mod 10) else (); |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
272 |
val _ = |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
273 |
if tick andalso ! status_ticks = 0 then |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
274 |
Multithreading.tracing 1 (fn () => |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
275 |
let |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
276 |
val {ready, pending, running, passive} = Task_Queue.status (! queue); |
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
277 |
val total = length (! workers); |
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
278 |
val active = count_workers Working; |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
279 |
val waiting = count_workers Waiting; |
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
280 |
in |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
281 |
"SCHEDULE " ^ Time.toString now ^ ": " ^ |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
282 |
string_of_int ready ^ " ready, " ^ |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
283 |
string_of_int pending ^ " pending, " ^ |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
284 |
string_of_int running ^ " running, " ^ |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
285 |
string_of_int passive ^ " passive; " ^ |
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
286 |
string_of_int total ^ " workers, " ^ |
33410
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
287 |
string_of_int active ^ " active, " ^ |
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
wenzelm
parents:
33409
diff
changeset
|
288 |
string_of_int waiting ^ " waiting " |
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
289 |
end) |
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
290 |
else (); |
32053 | 291 |
|
28191 | 292 |
val _ = |
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
293 |
if forall (Thread.isActive o #1) (! workers) then () |
32095 | 294 |
else |
33409 | 295 |
let |
37682 | 296 |
val (alive, dead) = List.partition (Thread.isActive o #1) (! workers); |
33409 | 297 |
val _ = workers := alive; |
298 |
in |
|
299 |
Multithreading.tracing 0 (fn () => |
|
300 |
"SCHEDULE: disposed " ^ string_of_int (length dead) ^ " dead worker threads") |
|
301 |
end; |
|
28191 | 302 |
|
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
303 |
|
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
304 |
(* worker pool adjustments *) |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
305 |
|
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
306 |
val max_active0 = ! max_active; |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
307 |
val max_workers0 = ! max_workers; |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
308 |
|
28206
bcd48c6897d4
eliminated requests, use global state variables uniformly;
wenzelm
parents:
28203
diff
changeset
|
309 |
val m = if ! do_shutdown then 0 else Multithreading.max_threads_value (); |
33406
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
wenzelm
parents:
33061
diff
changeset
|
310 |
val _ = max_active := m; |
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
wenzelm
parents:
33061
diff
changeset
|
311 |
|
33411
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
312 |
val mm = |
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
313 |
if ! do_shutdown then 0 |
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
314 |
else if m = 9999 then 1 |
33413
cb409680dda8
avoid broadcast work_available, use daisy-chained signal instead;
wenzelm
parents:
33411
diff
changeset
|
315 |
else Int.min (Int.max (count_workers Working + 2 * count_workers Waiting, m), 4 * m); |
33411
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
316 |
val _ = |
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
317 |
if tick andalso mm > ! max_workers then |
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
318 |
Unsynchronized.change worker_trend (fn w => if w < 0 then 0 else w + 1) |
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
319 |
else if tick andalso mm < ! max_workers then |
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
320 |
Unsynchronized.change worker_trend (fn w => if w > 0 then 0 else w - 1) |
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
321 |
else (); |
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
322 |
val _ = |
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
323 |
if mm = 0 orelse ! worker_trend > 50 orelse ! worker_trend < ~50 then |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
324 |
max_workers := mm |
44173
aaaa13e297dc
immediate fork of initial workers -- avoid 5 ticks (250ms) for adaptive scheme (a07558eb5029);
wenzelm
parents:
44115
diff
changeset
|
325 |
else if ! worker_trend > 5 andalso ! max_workers < 2 * m orelse ! max_workers = 0 then |
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
326 |
max_workers := Int.min (mm, 2 * m) |
33411
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
wenzelm
parents:
33410
diff
changeset
|
327 |
else (); |
33406
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
wenzelm
parents:
33061
diff
changeset
|
328 |
|
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
329 |
val missing = ! max_workers - length (! workers); |
28203 | 330 |
val _ = |
33407
1427333220bc
worker_next: ensure that work_available is passed on before sleeping (was occasionally lost when worker configuration changed, causing scheduler deadlock);
wenzelm
parents:
33406
diff
changeset
|
331 |
if missing > 0 then |
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
332 |
funpow missing (fn () => |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
333 |
ignore (worker_start ("worker " ^ string_of_int (Unsynchronized.inc next)))) () |
28203 | 334 |
else (); |
28206
bcd48c6897d4
eliminated requests, use global state variables uniformly;
wenzelm
parents:
28203
diff
changeset
|
335 |
|
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
336 |
val _ = |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
337 |
if ! max_active = max_active0 andalso ! max_workers = max_workers0 then () |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
338 |
else signal work_available; |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
339 |
|
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
340 |
|
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
341 |
(* canceled groups *) |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
342 |
|
32225
d5d6f47fb018
cancel: improved reactivity due to more careful broadcasting;
wenzelm
parents:
32224
diff
changeset
|
343 |
val _ = |
d5d6f47fb018
cancel: improved reactivity due to more careful broadcasting;
wenzelm
parents:
32224
diff
changeset
|
344 |
if null (! canceled) then () |
32293 | 345 |
else |
346 |
(Multithreading.tracing 1 (fn () => |
|
347 |
string_of_int (length (! canceled)) ^ " canceled groups"); |
|
34279
02936e77a07c
tasks of canceled groups are considered "ready" -- enables to purge the queue from tasks depending on unfinished promises (also improves general reactivity);
wenzelm
parents:
34277
diff
changeset
|
348 |
Unsynchronized.change canceled (filter_out cancel_now); |
32293 | 349 |
broadcast_work ()); |
28206
bcd48c6897d4
eliminated requests, use global state variables uniformly;
wenzelm
parents:
28203
diff
changeset
|
350 |
|
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
351 |
|
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
352 |
(* delay loop *) |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
353 |
|
32295
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
wenzelm
parents:
32293
diff
changeset
|
354 |
val _ = Exn.release (wait_timeout next_round scheduler_event); |
28167 | 355 |
|
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
356 |
|
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
357 |
(* shutdown *) |
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
358 |
|
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
359 |
val _ = if Task_Queue.all_passive (! queue) then do_shutdown := true else (); |
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
360 |
val continue = not (! do_shutdown andalso null (! workers)); |
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
361 |
val _ = if continue then () else scheduler := NONE; |
33415
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
wenzelm
parents:
33413
diff
changeset
|
362 |
|
32219
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
wenzelm
parents:
32186
diff
changeset
|
363 |
val _ = broadcast scheduler_event; |
32295
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
wenzelm
parents:
32293
diff
changeset
|
364 |
in continue end |
39232
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
365 |
handle exn => |
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
366 |
if Exn.is_interrupt exn then |
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
367 |
(Multithreading.tracing 1 (fn () => "Interrupt"); |
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
368 |
List.app cancel_later (Task_Queue.cancel_all (! queue)); |
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
369 |
broadcast_work (); true) |
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
370 |
else reraise exn; |
32295
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
wenzelm
parents:
32293
diff
changeset
|
371 |
|
28206
bcd48c6897d4
eliminated requests, use global state variables uniformly;
wenzelm
parents:
28203
diff
changeset
|
372 |
fun scheduler_loop () = |
44173
aaaa13e297dc
immediate fork of initial workers -- avoid 5 ticks (250ms) for adaptive scheme (a07558eb5029);
wenzelm
parents:
44115
diff
changeset
|
373 |
(while |
33416
13d00799fe49
scheduler: clarified interrupt attributes and handling;
wenzelm
parents:
33415
diff
changeset
|
374 |
Multithreading.with_attributes |
13d00799fe49
scheduler: clarified interrupt attributes and handling;
wenzelm
parents:
33415
diff
changeset
|
375 |
(Multithreading.sync_interrupts Multithreading.public_interrupts) |
13d00799fe49
scheduler: clarified interrupt attributes and handling;
wenzelm
parents:
33415
diff
changeset
|
376 |
(fn _ => SYNCHRONIZED "scheduler" (fn () => scheduler_next ())) |
44173
aaaa13e297dc
immediate fork of initial workers -- avoid 5 ticks (250ms) for adaptive scheme (a07558eb5029);
wenzelm
parents:
44115
diff
changeset
|
377 |
do (); last_round := Time.zeroTime); |
28156 | 378 |
|
28203 | 379 |
fun scheduler_active () = (*requires SYNCHRONIZED*) |
380 |
(case ! scheduler of NONE => false | SOME thread => Thread.isActive thread); |
|
381 |
||
32228
7622c03141b0
scheduler: shutdown spontaneously (after some delay) if queue is empty;
wenzelm
parents:
32227
diff
changeset
|
382 |
fun scheduler_check () = (*requires SYNCHRONIZED*) |
7622c03141b0
scheduler: shutdown spontaneously (after some delay) if queue is empty;
wenzelm
parents:
32227
diff
changeset
|
383 |
(do_shutdown := false; |
32248
0241916a5f06
more precise treatment of scheduler_event: continous pulse (50ms) instead of flooding, which was burning many CPU cycles in spare threads;
wenzelm
parents:
32247
diff
changeset
|
384 |
if scheduler_active () then () |
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
37182
diff
changeset
|
385 |
else scheduler := SOME (Simple_Thread.fork false scheduler_loop)); |
28156 | 386 |
|
387 |
||
29366 | 388 |
|
389 |
(** futures **) |
|
28156 | 390 |
|
44110 | 391 |
(* cancellation *) |
392 |
||
393 |
(*cancel: present and future group members will be interrupted eventually*) |
|
394 |
fun cancel_group group = SYNCHRONIZED "cancel" (fn () => |
|
395 |
(if cancel_now group then () else cancel_later group; |
|
396 |
signal work_available; scheduler_check ())); |
|
397 |
||
398 |
fun cancel x = cancel_group (Task_Queue.group_of_task (task_of x)); |
|
399 |
||
400 |
||
401 |
(* future jobs *) |
|
402 |
||
44249
64620f1d6f87
identify parallel exceptions where they emerge first -- to achieve unique results within evaluation graph;
wenzelm
parents:
44247
diff
changeset
|
403 |
fun assign_result group result raw_res = |
44110 | 404 |
let |
44249
64620f1d6f87
identify parallel exceptions where they emerge first -- to achieve unique results within evaluation graph;
wenzelm
parents:
44247
diff
changeset
|
405 |
val res = |
64620f1d6f87
identify parallel exceptions where they emerge first -- to achieve unique results within evaluation graph;
wenzelm
parents:
44247
diff
changeset
|
406 |
(case raw_res of |
64620f1d6f87
identify parallel exceptions where they emerge first -- to achieve unique results within evaluation graph;
wenzelm
parents:
44247
diff
changeset
|
407 |
Exn.Exn exn => Exn.Exn (#2 (Par_Exn.serial exn)) |
64620f1d6f87
identify parallel exceptions where they emerge first -- to achieve unique results within evaluation graph;
wenzelm
parents:
44247
diff
changeset
|
408 |
| _ => raw_res); |
44110 | 409 |
val _ = Single_Assignment.assign result res |
410 |
handle exn as Fail _ => |
|
411 |
(case Single_Assignment.peek result of |
|
412 |
SOME (Exn.Exn e) => reraise (if Exn.is_interrupt e then e else exn) |
|
413 |
| _ => reraise exn); |
|
414 |
val ok = |
|
415 |
(case the (Single_Assignment.peek result) of |
|
44111
2d16c693d536
synchronized cancel and flushing of Multithreading.interrupted state, to ensure that interrupts stay within task boundaries;
wenzelm
parents:
44110
diff
changeset
|
416 |
Exn.Exn exn => |
2d16c693d536
synchronized cancel and flushing of Multithreading.interrupted state, to ensure that interrupts stay within task boundaries;
wenzelm
parents:
44110
diff
changeset
|
417 |
(SYNCHRONIZED "cancel" (fn () => Task_Queue.cancel_group group exn); false) |
44110 | 418 |
| Exn.Res _ => true); |
419 |
in ok end; |
|
420 |
||
44113 | 421 |
fun future_job group interrupts (e: unit -> 'a) = |
44110 | 422 |
let |
423 |
val result = Single_Assignment.var "future" : 'a result; |
|
424 |
val pos = Position.thread_data (); |
|
425 |
fun job ok = |
|
426 |
let |
|
427 |
val res = |
|
428 |
if ok then |
|
429 |
Exn.capture (fn () => |
|
44113 | 430 |
Multithreading.with_attributes |
431 |
(if interrupts |
|
432 |
then Multithreading.private_interrupts else Multithreading.no_interrupts) |
|
44110 | 433 |
(fn _ => Position.setmp_thread_data pos e ()) before |
434 |
Multithreading.interrupted ()) () |
|
435 |
else Exn.interrupt_exn; |
|
436 |
in assign_result group result res end; |
|
437 |
in (result, job) end; |
|
438 |
||
439 |
||
29366 | 440 |
(* fork *) |
441 |
||
44113 | 442 |
type fork_params = |
443 |
{name: string, group: Task_Queue.group option, deps: Task_Queue.task list, |
|
444 |
pri: int, interrupts: bool}; |
|
445 |
||
446 |
fun forks ({name, group, deps, pri, interrupts}: fork_params) es = |
|
41674 | 447 |
if null es then [] |
448 |
else |
|
449 |
let |
|
450 |
val grp = |
|
451 |
(case group of |
|
452 |
NONE => worker_subgroup () |
|
453 |
| SOME grp => grp); |
|
41708 | 454 |
fun enqueue e queue = |
41674 | 455 |
let |
44113 | 456 |
val (result, job) = future_job grp interrupts e; |
41708 | 457 |
val (task, queue') = Task_Queue.enqueue name grp deps pri job queue; |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
458 |
val future = Future {promised = false, task = task, result = result}; |
41708 | 459 |
in (future, queue') end; |
41674 | 460 |
in |
461 |
SYNCHRONIZED "enqueue" (fn () => |
|
462 |
let |
|
41708 | 463 |
val (futures, queue') = fold_map enqueue es (! queue); |
464 |
val _ = queue := queue'; |
|
465 |
val minimal = forall (not o Task_Queue.known_task queue') deps; |
|
41674 | 466 |
val _ = if minimal then signal work_available else (); |
467 |
val _ = scheduler_check (); |
|
468 |
in futures end) |
|
469 |
end; |
|
28162 | 470 |
|
44113 | 471 |
fun fork_pri pri e = |
472 |
singleton (forks {name = "", group = NONE, deps = [], pri = pri, interrupts = true}) e; |
|
473 |
||
41672
2f70b1ddd09f
more direct Future.bulk, which potentially reduces overhead for Par_List;
wenzelm
parents:
41670
diff
changeset
|
474 |
fun fork e = fork_pri 0 e; |
28186 | 475 |
|
476 |
||
29366 | 477 |
(* join *) |
478 |
||
29551
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
wenzelm
parents:
29431
diff
changeset
|
479 |
local |
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
wenzelm
parents:
29431
diff
changeset
|
480 |
|
32099 | 481 |
fun get_result x = |
482 |
(case peek x of |
|
37852
a902f158b4fc
eliminated old-style sys_error/SYS_ERROR in favour of exception Fail -- after careful checking that there is no overlap with existing handling of that;
wenzelm
parents:
37690
diff
changeset
|
483 |
NONE => Exn.Exn (Fail "Unfinished future") |
39232
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
484 |
| SOME res => |
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
485 |
if Exn.is_interrupt_exn res then |
44247 | 486 |
(case Task_Queue.group_status (Task_Queue.group_of_task (task_of x)) of |
487 |
NONE => res |
|
488 |
| SOME exn => Exn.Exn exn) |
|
39232
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents:
38236
diff
changeset
|
489 |
else res); |
28186 | 490 |
|
32095 | 491 |
fun join_next deps = (*requires SYNCHRONIZED*) |
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41683
diff
changeset
|
492 |
if null deps then NONE |
32224 | 493 |
else |
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
494 |
(case Unsynchronized.change_result queue (Task_Queue.dequeue_deps (Thread.self ()) deps) of |
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41683
diff
changeset
|
495 |
(NONE, []) => NONE |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41683
diff
changeset
|
496 |
| (NONE, deps') => |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41683
diff
changeset
|
497 |
(worker_waiting deps' (fn () => worker_wait true work_finished); join_next deps') |
32224 | 498 |
| (SOME work, deps') => SOME (work, deps')); |
32095 | 499 |
|
32814
81897d30b97f
added Task_Queue.depend (again) -- light-weight version for transitive graph;
wenzelm
parents:
32738
diff
changeset
|
500 |
fun execute_work NONE = () |
44110 | 501 |
| execute_work (SOME (work, deps')) = |
502 |
(worker_joining (fn () => worker_exec work); join_work deps') |
|
32814
81897d30b97f
added Task_Queue.depend (again) -- light-weight version for transitive graph;
wenzelm
parents:
32738
diff
changeset
|
503 |
and join_work deps = |
43538
de5c79682b56
more robust join_results: join_work needs to be uninterruptible, otherwise the task being dequeued by join_next might be never executed/finished!
wenzelm
parents:
42128
diff
changeset
|
504 |
Multithreading.with_attributes Multithreading.no_interrupts |
de5c79682b56
more robust join_results: join_work needs to be uninterruptible, otherwise the task being dequeued by join_next might be never executed/finished!
wenzelm
parents:
42128
diff
changeset
|
505 |
(fn _ => execute_work (SYNCHRONIZED "join" (fn () => join_next deps))); |
32814
81897d30b97f
added Task_Queue.depend (again) -- light-weight version for transitive graph;
wenzelm
parents:
32738
diff
changeset
|
506 |
|
29551
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
wenzelm
parents:
29431
diff
changeset
|
507 |
in |
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
wenzelm
parents:
29431
diff
changeset
|
508 |
|
29366 | 509 |
fun join_results xs = |
41679 | 510 |
let |
511 |
val _ = |
|
512 |
if forall is_finished xs then () |
|
513 |
else if Multithreading.self_critical () then |
|
514 |
error "Cannot join future values within critical section" |
|
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41683
diff
changeset
|
515 |
else if is_some (worker_task ()) then join_work (map task_of xs) |
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
516 |
else List.app (ignore o Single_Assignment.await o result_of) xs; |
41679 | 517 |
in map get_result xs end; |
28186 | 518 |
|
29551
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
wenzelm
parents:
29431
diff
changeset
|
519 |
end; |
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
wenzelm
parents:
29431
diff
changeset
|
520 |
|
28647
8068cdc84e7e
join_results: allow CRITICAL join of finished futures;
wenzelm
parents:
28645
diff
changeset
|
521 |
fun join_result x = singleton join_results x; |
8068cdc84e7e
join_results: allow CRITICAL join of finished futures;
wenzelm
parents:
28645
diff
changeset
|
522 |
fun join x = Exn.release (join_result x); |
28156 | 523 |
|
29366 | 524 |
|
44110 | 525 |
(* fast-path versions -- bypassing task queue *) |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
526 |
|
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
527 |
fun value (x: 'a) = |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
528 |
let |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
529 |
val task = Task_Queue.dummy_task (); |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
530 |
val group = Task_Queue.group_of_task task; |
35016 | 531 |
val result = Single_Assignment.var "value" : 'a result; |
43761
e72ba84ae58f
tuned signature -- corresponding to Scala version;
wenzelm
parents:
43665
diff
changeset
|
532 |
val _ = assign_result group result (Exn.Res x); |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
533 |
in Future {promised = false, task = task, result = result} end; |
29366 | 534 |
|
29384
a3c7e9ae9b71
more robust propagation of errors through bulk jobs;
wenzelm
parents:
29366
diff
changeset
|
535 |
fun map_future f x = |
29366 | 536 |
let |
29384
a3c7e9ae9b71
more robust propagation of errors through bulk jobs;
wenzelm
parents:
29366
diff
changeset
|
537 |
val task = task_of x; |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
538 |
val group = Task_Queue.new_group (SOME (Task_Queue.group_of_task task)); |
44113 | 539 |
val (result, job) = future_job group true (fn () => f (join x)); |
29384
a3c7e9ae9b71
more robust propagation of errors through bulk jobs;
wenzelm
parents:
29366
diff
changeset
|
540 |
|
32246 | 541 |
val extended = SYNCHRONIZED "extend" (fn () => |
29366 | 542 |
(case Task_Queue.extend task job (! queue) of |
543 |
SOME queue' => (queue := queue'; true) |
|
544 |
| NONE => false)); |
|
545 |
in |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
546 |
if extended then Future {promised = false, task = task, result = result} |
41672
2f70b1ddd09f
more direct Future.bulk, which potentially reduces overhead for Par_List;
wenzelm
parents:
41670
diff
changeset
|
547 |
else |
41673 | 548 |
singleton |
44113 | 549 |
(forks {name = "Future.map", group = SOME group, deps = [task], |
550 |
pri = Task_Queue.pri_of_task task, interrupts = true}) |
|
41672
2f70b1ddd09f
more direct Future.bulk, which potentially reduces overhead for Par_List;
wenzelm
parents:
41670
diff
changeset
|
551 |
(fn () => f (join x)) |
29366 | 552 |
end; |
28979
3ce619d8d432
fork/map: no inheritance of group (structure is nested, not parallel);
wenzelm
parents:
28972
diff
changeset
|
553 |
|
42128 | 554 |
fun cond_forks args es = |
555 |
if Multithreading.enabled () then forks args es |
|
556 |
else map (fn e => value (e ())) es; |
|
557 |
||
28191 | 558 |
|
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
559 |
(* promised futures -- fulfilled by external means *) |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
560 |
|
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
561 |
fun promise_group group : 'a future = |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
562 |
let |
35016 | 563 |
val result = Single_Assignment.var "promise" : 'a result; |
39243
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
564 |
fun abort () = assign_result group result Exn.interrupt_exn |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
565 |
handle Fail _ => true |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
566 |
| exn => |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
567 |
if Exn.is_interrupt exn then raise Fail "Concurrent attempt to fulfill promise" |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
568 |
else reraise exn; |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37852
diff
changeset
|
569 |
val task = SYNCHRONIZED "enqueue_passive" (fn () => |
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37852
diff
changeset
|
570 |
Unsynchronized.change_result queue (Task_Queue.enqueue_passive group abort)); |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
571 |
in Future {promised = true, task = task, result = result} end; |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
572 |
|
37865
3a6ec95a9f68
clarified/exported Future.worker_subgroup, which is already the default for Future.fork;
wenzelm
parents:
37854
diff
changeset
|
573 |
fun promise () = promise_group (worker_subgroup ()); |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
574 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
575 |
fun fulfill_result (Future {promised, task, result}) res = |
39243
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
576 |
if not promised then raise Fail "Not a promised future" |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
577 |
else |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
578 |
let |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41681
diff
changeset
|
579 |
val group = Task_Queue.group_of_task task; |
39243
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
580 |
fun job ok = assign_result group result (if ok then res else Exn.interrupt_exn); |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
581 |
val _ = |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
582 |
Multithreading.with_attributes Multithreading.no_interrupts (fn _ => |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
583 |
let |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
584 |
val still_passive = |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
585 |
SYNCHRONIZED "fulfill_result" (fn () => |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
586 |
Unsynchronized.change_result queue |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
587 |
(Task_Queue.dequeue_passive (Thread.self ()) task)); |
44110 | 588 |
in if still_passive then worker_exec (task, [job]) else () end); |
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
589 |
val _ = |
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41683
diff
changeset
|
590 |
if is_some (Single_Assignment.peek result) then () |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41683
diff
changeset
|
591 |
else worker_waiting [task] (fn () => ignore (Single_Assignment.await result)); |
39243
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
592 |
in () end; |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
593 |
|
43761
e72ba84ae58f
tuned signature -- corresponding to Scala version;
wenzelm
parents:
43665
diff
changeset
|
594 |
fun fulfill x res = fulfill_result x (Exn.Res res); |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
595 |
|
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
33416
diff
changeset
|
596 |
|
32228
7622c03141b0
scheduler: shutdown spontaneously (after some delay) if queue is empty;
wenzelm
parents:
32227
diff
changeset
|
597 |
(* shutdown *) |
29366 | 598 |
|
28203 | 599 |
fun shutdown () = |
28276 | 600 |
if Multithreading.available then |
601 |
SYNCHRONIZED "shutdown" (fn () => |
|
32228
7622c03141b0
scheduler: shutdown spontaneously (after some delay) if queue is empty;
wenzelm
parents:
32227
diff
changeset
|
602 |
while scheduler_active () do |
34279
02936e77a07c
tasks of canceled groups are considered "ready" -- enables to purge the queue from tasks depending on unfinished promises (also improves general reactivity);
wenzelm
parents:
34277
diff
changeset
|
603 |
(wait scheduler_event; broadcast_work ())) |
28276 | 604 |
else (); |
28203 | 605 |
|
29366 | 606 |
|
38236
d8c7be27e01d
explicitly distinguish Output.status (essential feedback) vs. Output.report (useful markup);
wenzelm
parents:
37904
diff
changeset
|
607 |
(* status markup *) |
37690
b16231572c61
general Future.report -- also for Toplevel.async_state;
wenzelm
parents:
37682
diff
changeset
|
608 |
|
38236
d8c7be27e01d
explicitly distinguish Output.status (essential feedback) vs. Output.report (useful markup);
wenzelm
parents:
37904
diff
changeset
|
609 |
fun status e = |
37690
b16231572c61
general Future.report -- also for Toplevel.async_state;
wenzelm
parents:
37682
diff
changeset
|
610 |
let |
40448 | 611 |
val task_props = |
612 |
(case worker_task () of |
|
613 |
NONE => I |
|
614 |
| SOME task => Markup.properties [(Markup.taskN, Task_Queue.str_of_task task)]); |
|
43665 | 615 |
val _ = Output.status (Markup.markup_only (task_props Markup.forked)); |
37690
b16231572c61
general Future.report -- also for Toplevel.async_state;
wenzelm
parents:
37682
diff
changeset
|
616 |
val x = e (); (*sic -- report "joined" only for success*) |
43665 | 617 |
val _ = Output.status (Markup.markup_only (task_props Markup.joined)); |
37690
b16231572c61
general Future.report -- also for Toplevel.async_state;
wenzelm
parents:
37682
diff
changeset
|
618 |
in x end; |
b16231572c61
general Future.report -- also for Toplevel.async_state;
wenzelm
parents:
37682
diff
changeset
|
619 |
|
b16231572c61
general Future.report -- also for Toplevel.async_state;
wenzelm
parents:
37682
diff
changeset
|
620 |
|
29366 | 621 |
(*final declarations of this structure!*) |
622 |
val map = map_future; |
|
623 |
||
28156 | 624 |
end; |
28972 | 625 |
|
626 |
type 'a future = 'a Future.future; |
|
627 |