| author | wenzelm | 
| Mon, 20 Jan 2014 19:47:31 +0100 | |
| changeset 55104 | 8284c0d5bf52 | 
| parent 54671 | d64a4ef26edb | 
| child 56333 | 38f1422ef473 | 
| 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.  | 
|
| 49908 | 29  | 
Failure of one group member causes peer and subgroup members to be  | 
30  | 
interrupted eventually. Interrupted tasks that lack regular  | 
|
31  | 
result information, will pick up parallel exceptions from the  | 
|
32  | 
cumulative group context (as Par_Exn).  | 
|
| 44268 | 33  | 
|
| 
44299
 
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
 
wenzelm 
parents: 
44298 
diff
changeset
 | 
34  | 
* Future task groups may be canceled: present and future group  | 
| 
 
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
 
wenzelm 
parents: 
44298 
diff
changeset
 | 
35  | 
members will be interrupted eventually.  | 
| 
 
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
 
wenzelm 
parents: 
44298 
diff
changeset
 | 
36  | 
|
| 44268 | 37  | 
* Promised "passive" futures are fulfilled by external means. There  | 
38  | 
is no associated evaluation task, but other futures can depend on  | 
|
39  | 
them via regular join operations.  | 
|
| 28156 | 40  | 
*)  | 
41  | 
||
42  | 
signature FUTURE =  | 
|
43  | 
sig  | 
|
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
44  | 
type task = Task_Queue.task  | 
| 
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
45  | 
type group = Task_Queue.group  | 
| 
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
46  | 
val new_group: group option -> group  | 
| 
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
47  | 
val worker_task: unit -> task option  | 
| 
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
48  | 
val worker_group: unit -> group option  | 
| 52603 | 49  | 
val the_worker_group: unit -> group  | 
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
50  | 
val worker_subgroup: unit -> group  | 
| 28972 | 51  | 
type 'a future  | 
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
52  | 
val task_of: 'a future -> task  | 
| 28972 | 53  | 
val peek: 'a future -> 'a Exn.result option  | 
54  | 
val is_finished: 'a future -> bool  | 
|
| 50280 | 55  | 
val ML_statistics: bool Unsynchronized.ref  | 
| 44301 | 56  | 
  val interruptible_task: ('a -> 'b) -> 'a -> 'b
 | 
| 
47404
 
e6e5750f1311
simplified Future.cancel/cancel_group (again) -- running threads only;
 
wenzelm 
parents: 
45666 
diff
changeset
 | 
57  | 
val cancel_group: group -> unit  | 
| 
 
e6e5750f1311
simplified Future.cancel/cancel_group (again) -- running threads only;
 
wenzelm 
parents: 
45666 
diff
changeset
 | 
58  | 
val cancel: 'a future -> unit  | 
| 
50914
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
59  | 
val error_msg: Position.T -> (serial * string) * string option -> unit  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
60  | 
val identify_result: Position.T -> 'a Exn.result -> 'a Exn.result  | 
| 44427 | 61  | 
  type params = {name: string, group: group option, deps: task list, pri: int, interrupts: bool}
 | 
62  | 
val default_params: params  | 
|
63  | 
val forks: params -> (unit -> 'a) list -> 'a future list  | 
|
| 32724 | 64  | 
val fork: (unit -> 'a) -> 'a future  | 
| 28972 | 65  | 
val join_results: 'a future list -> 'a Exn.result list  | 
66  | 
val join_result: 'a future -> 'a Exn.result  | 
|
| 44330 | 67  | 
val joins: 'a future list -> 'a list  | 
| 28972 | 68  | 
val join: 'a future -> 'a  | 
| 54369 | 69  | 
val join_tasks: task list -> unit  | 
| 
54649
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
70  | 
  val task_context: string -> group -> ('a -> 'b) -> 'a -> 'b
 | 
| 
44294
 
a0ddd5760444
clarified Future.cond_forks: more uniform handling of exceptional situations;
 
wenzelm 
parents: 
44268 
diff
changeset
 | 
71  | 
val value_result: 'a Exn.result -> 'a future  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
72  | 
val value: 'a -> 'a future  | 
| 44427 | 73  | 
val cond_forks: params -> (unit -> 'a) list -> 'a future list  | 
| 28972 | 74  | 
  val map: ('a -> 'b) -> 'a future -> 'b future
 | 
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
75  | 
val promise_group: group -> (unit -> unit) -> 'a future  | 
| 
44298
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
76  | 
val promise: (unit -> unit) -> 'a future  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
77  | 
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
 | 
78  | 
val fulfill: 'a future -> 'a -> unit  | 
| 54369 | 79  | 
val group_snapshot: group -> task list  | 
| 49906 | 80  | 
val terminate: group -> unit  | 
| 28203 | 81  | 
val shutdown: unit -> unit  | 
| 28156 | 82  | 
end;  | 
83  | 
||
84  | 
structure Future: FUTURE =  | 
|
85  | 
struct  | 
|
86  | 
||
| 
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
 | 
87  | 
(** 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
 | 
88  | 
|
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
89  | 
type task = Task_Queue.task;  | 
| 
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
90  | 
type group = Task_Queue.group;  | 
| 
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
91  | 
val new_group = Task_Queue.new_group;  | 
| 
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
92  | 
|
| 
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
93  | 
|
| 28167 | 94  | 
(* identifiers *)  | 
95  | 
||
| 32058 | 96  | 
local  | 
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
97  | 
val tag = Universal.tag () : task option Universal.tag;  | 
| 32058 | 98  | 
in  | 
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
99  | 
fun worker_task () = the_default NONE (Thread.getLocal tag);  | 
| 44110 | 100  | 
fun setmp_worker_task task f x = setmp_thread_data tag (worker_task ()) (SOME task) f x;  | 
| 28167 | 101  | 
end;  | 
102  | 
||
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
103  | 
val worker_group = Option.map Task_Queue.group_of_task o worker_task;  | 
| 52603 | 104  | 
|
105  | 
fun the_worker_group () =  | 
|
106  | 
(case worker_group () of  | 
|
107  | 
SOME group => group  | 
|
108  | 
| NONE => raise Fail "Missing worker thread context");  | 
|
109  | 
||
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
110  | 
fun worker_subgroup () = new_group (worker_group ());  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
111  | 
|
| 41679 | 112  | 
fun worker_joining e =  | 
113  | 
(case worker_task () of  | 
|
114  | 
NONE => e ()  | 
|
115  | 
| SOME task => Task_Queue.joining task e);  | 
|
116  | 
||
| 
41680
 
a4c822915eaa
more informative task timing: some dependency tracking;
 
wenzelm 
parents: 
41679 
diff
changeset
 | 
117  | 
fun worker_waiting deps e =  | 
| 41670 | 118  | 
(case worker_task () of  | 
119  | 
NONE => e ()  | 
|
| 
41680
 
a4c822915eaa
more informative task timing: some dependency tracking;
 
wenzelm 
parents: 
41679 
diff
changeset
 | 
120  | 
| SOME task => Task_Queue.waiting task deps e);  | 
| 41670 | 121  | 
|
| 28167 | 122  | 
|
123  | 
(* datatype future *)  | 
|
124  | 
||
| 35016 | 125  | 
type 'a result = 'a Exn.result Single_Assignment.var;  | 
126  | 
||
| 28972 | 127  | 
datatype 'a future = Future of  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
128  | 
 {promised: bool,
 | 
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
129  | 
task: task,  | 
| 35016 | 130  | 
result: 'a result};  | 
| 28167 | 131  | 
|
132  | 
fun task_of (Future {task, ...}) = task;
 | 
|
| 32253 | 133  | 
fun result_of (Future {result, ...}) = result;
 | 
| 28167 | 134  | 
|
| 35016 | 135  | 
fun peek x = Single_Assignment.peek (result_of x);  | 
| 28558 | 136  | 
fun is_finished x = is_some (peek x);  | 
| 28320 | 137  | 
|
| 28167 | 138  | 
|
| 
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
 | 
139  | 
|
| 
 
8c0335bc9336
inherit group from running thread, or create a new one -- make it harder to re-use canceled groups;
 
wenzelm 
parents: 
28170 
diff
changeset
 | 
140  | 
(** 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
 | 
141  | 
|
| 
 
8c0335bc9336
inherit group from running thread, or create a new one -- make it harder to re-use canceled groups;
 
wenzelm 
parents: 
28170 
diff
changeset
 | 
142  | 
(* synchronization *)  | 
| 28156 | 143  | 
|
| 
32219
 
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
 
wenzelm 
parents: 
32186 
diff
changeset
 | 
144  | 
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
 | 
145  | 
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
 | 
146  | 
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
 | 
147  | 
|
| 28156 | 148  | 
local  | 
149  | 
val lock = Mutex.mutex ();  | 
|
150  | 
in  | 
|
151  | 
||
| 
37216
 
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
 
wenzelm 
parents: 
37182 
diff
changeset
 | 
152  | 
fun SYNCHRONIZED name = Simple_Thread.synchronized name lock;  | 
| 28156 | 153  | 
|
| 
32219
 
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
 
wenzelm 
parents: 
32186 
diff
changeset
 | 
154  | 
fun wait cond = (*requires SYNCHRONIZED*)  | 
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32293 
diff
changeset
 | 
155  | 
Multithreading.sync_wait NONE NONE cond lock;  | 
| 
28206
 
bcd48c6897d4
eliminated requests, use global state variables uniformly;
 
wenzelm 
parents: 
28203 
diff
changeset
 | 
156  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32293 
diff
changeset
 | 
157  | 
fun wait_timeout timeout cond = (*requires SYNCHRONIZED*)  | 
| 
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32293 
diff
changeset
 | 
158  | 
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
 | 
159  | 
|
| 
32219
 
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
 
wenzelm 
parents: 
32186 
diff
changeset
 | 
160  | 
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
 | 
161  | 
ConditionVar.signal cond;  | 
| 
 
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
 
wenzelm 
parents: 
32186 
diff
changeset
 | 
162  | 
|
| 
 
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
 
wenzelm 
parents: 
32186 
diff
changeset
 | 
163  | 
fun broadcast cond = (*requires SYNCHRONIZED*)  | 
| 
28166
 
43087721a66e
moved task, thread_data, group, queue to task_queue.ML;
 
wenzelm 
parents: 
28163 
diff
changeset
 | 
164  | 
ConditionVar.broadcast cond;  | 
| 28156 | 165  | 
|
166  | 
end;  | 
|
167  | 
||
168  | 
||
| 
33410
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
169  | 
(* global state *)  | 
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
170  | 
|
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
171  | 
val queue = Unsynchronized.ref Task_Queue.empty;  | 
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
172  | 
val next = Unsynchronized.ref 0;  | 
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
173  | 
val scheduler = Unsynchronized.ref (NONE: Thread.thread option);  | 
| 
44300
 
349cc426d929
tuned signature -- treat structure Task_Queue as private to implementation;
 
wenzelm 
parents: 
44299 
diff
changeset
 | 
174  | 
val canceled = Unsynchronized.ref ([]: group list);  | 
| 
33410
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
175  | 
val do_shutdown = Unsynchronized.ref false;  | 
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
176  | 
val max_workers = Unsynchronized.ref 0;  | 
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
177  | 
val max_active = Unsynchronized.ref 0;  | 
| 
33411
 
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
 
wenzelm 
parents: 
33410 
diff
changeset
 | 
178  | 
val worker_trend = Unsynchronized.ref 0;  | 
| 
33410
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
179  | 
|
| 50280 | 180  | 
val status_ticks = Unsynchronized.ref 0;  | 
181  | 
val last_round = Unsynchronized.ref Time.zeroTime;  | 
|
182  | 
val next_round = seconds 0.05;  | 
|
183  | 
||
| 
33410
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
184  | 
datatype worker_state = Working | Waiting | Sleeping;  | 
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
185  | 
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
 | 
186  | 
|
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
187  | 
fun count_workers state = (*requires SYNCHRONIZED*)  | 
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
188  | 
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
 | 
189  | 
|
| 
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
190  | 
|
| 50280 | 191  | 
|
192  | 
(* status *)  | 
|
193  | 
||
194  | 
val ML_statistics = Unsynchronized.ref false;  | 
|
195  | 
||
196  | 
fun report_status () = (*requires SYNCHRONIZED*)  | 
|
197  | 
if ! ML_statistics then  | 
|
198  | 
let  | 
|
199  | 
      val {ready, pending, running, passive} = Task_Queue.status (! queue);
 | 
|
200  | 
val total = length (! workers);  | 
|
201  | 
val active = count_workers Working;  | 
|
202  | 
val waiting = count_workers Waiting;  | 
|
203  | 
val stats =  | 
|
| 51990 | 204  | 
       [("now", Markup.print_real (Time.toReal (Time.now ()))),
 | 
| 50280 | 205  | 
        ("tasks_ready", Markup.print_int ready),
 | 
206  | 
        ("tasks_pending", Markup.print_int pending),
 | 
|
207  | 
        ("tasks_running", Markup.print_int running),
 | 
|
208  | 
        ("tasks_passive", Markup.print_int passive),
 | 
|
209  | 
        ("workers_total", Markup.print_int total),
 | 
|
210  | 
        ("workers_active", Markup.print_int active),
 | 
|
211  | 
        ("workers_waiting", Markup.print_int waiting)] @
 | 
|
212  | 
ML_Statistics.get ();  | 
|
| 51661 | 213  | 
in Output.try_protocol_message (Markup.ML_statistics :: stats) "" end  | 
| 50280 | 214  | 
else ();  | 
215  | 
||
216  | 
||
| 44110 | 217  | 
(* cancellation primitives *)  | 
| 32099 | 218  | 
|
| 
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
 | 
219  | 
fun cancel_now group = (*requires SYNCHRONIZED*)  | 
| 
44341
 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 
wenzelm 
parents: 
44330 
diff
changeset
 | 
220  | 
let  | 
| 
47404
 
e6e5750f1311
simplified Future.cancel/cancel_group (again) -- running threads only;
 
wenzelm 
parents: 
45666 
diff
changeset
 | 
221  | 
val running = Task_Queue.cancel (! queue) group;  | 
| 
49894
 
69bfd86cc711
more robust cancel_now: avoid shooting yourself in the foot;
 
wenzelm 
parents: 
49009 
diff
changeset
 | 
222  | 
val _ = running |> List.app (fn thread =>  | 
| 
 
69bfd86cc711
more robust cancel_now: avoid shooting yourself in the foot;
 
wenzelm 
parents: 
49009 
diff
changeset
 | 
223  | 
if Simple_Thread.is_self thread then ()  | 
| 
 
69bfd86cc711
more robust cancel_now: avoid shooting yourself in the foot;
 
wenzelm 
parents: 
49009 
diff
changeset
 | 
224  | 
else Simple_Thread.interrupt_unsynchronized thread);  | 
| 
47404
 
e6e5750f1311
simplified Future.cancel/cancel_group (again) -- running threads only;
 
wenzelm 
parents: 
45666 
diff
changeset
 | 
225  | 
in running end;  | 
| 
44341
 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 
wenzelm 
parents: 
44330 
diff
changeset
 | 
226  | 
|
| 
 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 
wenzelm 
parents: 
44330 
diff
changeset
 | 
227  | 
fun cancel_all () = (*requires SYNCHRONIZED*)  | 
| 
 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 
wenzelm 
parents: 
44330 
diff
changeset
 | 
228  | 
let  | 
| 
 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 
wenzelm 
parents: 
44330 
diff
changeset
 | 
229  | 
val (groups, threads) = Task_Queue.cancel_all (! queue);  | 
| 
 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 
wenzelm 
parents: 
44330 
diff
changeset
 | 
230  | 
val _ = List.app Simple_Thread.interrupt_unsynchronized threads;  | 
| 
 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 
wenzelm 
parents: 
44330 
diff
changeset
 | 
231  | 
in groups end;  | 
| 
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
 | 
232  | 
|
| 
 
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
 | 
233  | 
fun cancel_later group = (*requires SYNCHRONIZED*)  | 
| 32738 | 234  | 
(Unsynchronized.change canceled (insert Task_Queue.eq_group group);  | 
235  | 
broadcast scheduler_event);  | 
|
| 
29341
 
6bb007a0f9f2
more reactive scheduler: reduced loop timeout, propagate broadcast interrupt via TaskQueue.cancel_all;
 
wenzelm 
parents: 
29119 
diff
changeset
 | 
236  | 
|
| 44301 | 237  | 
fun interruptible_task f x =  | 
238  | 
(if Multithreading.available then  | 
|
239  | 
Multithreading.with_attributes  | 
|
240  | 
(if is_some (worker_task ())  | 
|
241  | 
then Multithreading.private_interrupts  | 
|
242  | 
else Multithreading.public_interrupts)  | 
|
243  | 
(fn _ => f x)  | 
|
244  | 
else interruptible f x)  | 
|
245  | 
before Multithreading.interrupted ();  | 
|
246  | 
||
247  | 
||
| 44110 | 248  | 
(* worker threads *)  | 
249  | 
||
250  | 
fun worker_exec (task, jobs) =  | 
|
| 28167 | 251  | 
let  | 
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
252  | 
val group = Task_Queue.group_of_task task;  | 
| 32102 | 253  | 
val valid = not (Task_Queue.is_canceled group);  | 
| 41670 | 254  | 
val ok =  | 
255  | 
Task_Queue.running task (fn () =>  | 
|
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
256  | 
setmp_worker_task task (fn () =>  | 
| 41670 | 257  | 
fold (fn job => fn ok => job valid andalso ok) jobs true) ());  | 
| 50975 | 258  | 
val _ =  | 
259  | 
if ! Multithreading.trace >= 2 then  | 
|
| 51661 | 260  | 
Output.try_protocol_message (Markup.task_statistics :: Task_Queue.task_statistics task) ""  | 
| 50975 | 261  | 
else ();  | 
| 32246 | 262  | 
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
 | 
263  | 
let  | 
| 32738 | 264  | 
val maximal = Unsynchronized.change_result queue (Task_Queue.finish task);  | 
| 
44295
 
e43f0ea90c9a
more focused use of Multithreading.interrupted: retain interrupts within task group boundary, without loss of information;
 
wenzelm 
parents: 
44294 
diff
changeset
 | 
265  | 
val test = 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
 | 
266  | 
val _ =  | 
| 
44295
 
e43f0ea90c9a
more focused use of Multithreading.interrupted: retain interrupts within task group boundary, without loss of information;
 
wenzelm 
parents: 
44294 
diff
changeset
 | 
267  | 
if ok andalso not (Exn.is_interrupt_exn test) then ()  | 
| 
44299
 
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
 
wenzelm 
parents: 
44298 
diff
changeset
 | 
268  | 
else if null (cancel_now group) 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
 | 
269  | 
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
 | 
270  | 
val _ = broadcast work_finished;  | 
| 
33413
 
cb409680dda8
avoid broadcast work_available, use daisy-chained signal instead;
 
wenzelm 
parents: 
33411 
diff
changeset
 | 
271  | 
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
 | 
272  | 
in () end);  | 
| 28167 | 273  | 
in () end;  | 
274  | 
||
| 
33410
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
275  | 
fun worker_wait active cond = (*requires SYNCHRONIZED*)  | 
| 
52558
 
271663ddf289
allow worker guest threads, which participate actively in future joins, but are outside thread accounting;
 
wenzelm 
parents: 
51990 
diff
changeset
 | 
276  | 
(case AList.lookup Thread.equal (! workers) (Thread.self ()) of  | 
| 
 
271663ddf289
allow worker guest threads, which participate actively in future joins, but are outside thread accounting;
 
wenzelm 
parents: 
51990 
diff
changeset
 | 
277  | 
SOME state =>  | 
| 
 
271663ddf289
allow worker guest threads, which participate actively in future joins, but are outside thread accounting;
 
wenzelm 
parents: 
51990 
diff
changeset
 | 
278  | 
(state := (if active then Waiting else Sleeping);  | 
| 
 
271663ddf289
allow worker guest threads, which participate actively in future joins, but are outside thread accounting;
 
wenzelm 
parents: 
51990 
diff
changeset
 | 
279  | 
wait cond;  | 
| 
 
271663ddf289
allow worker guest threads, which participate actively in future joins, but are outside thread accounting;
 
wenzelm 
parents: 
51990 
diff
changeset
 | 
280  | 
state := Working)  | 
| 
 
271663ddf289
allow worker guest threads, which participate actively in future joins, but are outside thread accounting;
 
wenzelm 
parents: 
51990 
diff
changeset
 | 
281  | 
| NONE => ignore (wait cond));  | 
| 28162 | 282  | 
|
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
283  | 
fun worker_next () = (*requires SYNCHRONIZED*)  | 
| 
33406
 
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
 
wenzelm 
parents: 
33061 
diff
changeset
 | 
284  | 
if length (! workers) > ! max_workers then  | 
| 
 
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
 
wenzelm 
parents: 
33061 
diff
changeset
 | 
285  | 
(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
 | 
286  | 
signal work_available;  | 
| 28167 | 287  | 
NONE)  | 
| 
33410
 
e351f4c1f18c
worker activity: distinguish between waiting (formerly active) and sleeping;
 
wenzelm 
parents: 
33409 
diff
changeset
 | 
288  | 
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
 | 
289  | 
(worker_wait false work_available; worker_next ())  | 
| 
28166
 
43087721a66e
moved task, thread_data, group, queue to task_queue.ML;
 
wenzelm 
parents: 
28163 
diff
changeset
 | 
290  | 
else  | 
| 32738 | 291  | 
(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
 | 
292  | 
NONE => (worker_wait false work_available; worker_next ())  | 
| 
33413
 
cb409680dda8
avoid broadcast work_available, use daisy-chained signal instead;
 
wenzelm 
parents: 
33411 
diff
changeset
 | 
293  | 
| some => (signal work_available; some));  | 
| 28156 | 294  | 
|
| 28167 | 295  | 
fun worker_loop name =  | 
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
296  | 
(case SYNCHRONIZED name (fn () => worker_next ()) of  | 
| 29119 | 297  | 
NONE => ()  | 
| 
44295
 
e43f0ea90c9a
more focused use of Multithreading.interrupted: retain interrupts within task group boundary, without loss of information;
 
wenzelm 
parents: 
44294 
diff
changeset
 | 
298  | 
| SOME work => (worker_exec work; worker_loop name));  | 
| 28156 | 299  | 
|
| 
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
 | 
300  | 
fun worker_start name = (*requires SYNCHRONIZED*)  | 
| 
37216
 
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
 
wenzelm 
parents: 
37182 
diff
changeset
 | 
301  | 
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
 | 
302  | 
Unsynchronized.ref Working));  | 
| 28156 | 303  | 
|
304  | 
||
305  | 
(* scheduler *)  | 
|
306  | 
||
| 
28206
 
bcd48c6897d4
eliminated requests, use global state variables uniformly;
 
wenzelm 
parents: 
28203 
diff
changeset
 | 
307  | 
fun scheduler_next () = (*requires SYNCHRONIZED*)  | 
| 28156 | 308  | 
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
 | 
309  | 
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
 | 
310  | 
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
 | 
311  | 
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
 | 
312  | 
|
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
313  | 
|
| 50280 | 314  | 
(* runtime status *)  | 
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
315  | 
|
| 32226 | 316  | 
val _ =  | 
| 51046 | 317  | 
if tick then Unsynchronized.change status_ticks (fn i => i + 1) else ();  | 
| 
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
 | 
318  | 
val _ =  | 
| 51046 | 319  | 
if tick andalso ! status_ticks mod (if ! Multithreading.trace >= 1 then 2 else 10) = 0  | 
320  | 
then report_status () else ();  | 
|
| 32053 | 321  | 
|
| 28191 | 322  | 
val _ =  | 
| 
32219
 
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
 
wenzelm 
parents: 
32186 
diff
changeset
 | 
323  | 
if forall (Thread.isActive o #1) (! workers) then ()  | 
| 32095 | 324  | 
else  | 
| 33409 | 325  | 
let  | 
| 37682 | 326  | 
val (alive, dead) = List.partition (Thread.isActive o #1) (! workers);  | 
| 33409 | 327  | 
val _ = workers := alive;  | 
328  | 
in  | 
|
329  | 
Multithreading.tracing 0 (fn () =>  | 
|
| 51279 | 330  | 
"SCHEDULER: disposed " ^ string_of_int (length dead) ^ " dead worker threads")  | 
| 33409 | 331  | 
end;  | 
| 28191 | 332  | 
|
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
333  | 
|
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
334  | 
(* worker pool adjustments *)  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
335  | 
|
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
336  | 
val max_active0 = ! max_active;  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
337  | 
val max_workers0 = ! max_workers;  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
338  | 
|
| 
28206
 
bcd48c6897d4
eliminated requests, use global state variables uniformly;
 
wenzelm 
parents: 
28203 
diff
changeset
 | 
339  | 
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
 | 
340  | 
val _ = max_active := m;  | 
| 
 
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
 
wenzelm 
parents: 
33061 
diff
changeset
 | 
341  | 
|
| 
33411
 
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
 
wenzelm 
parents: 
33410 
diff
changeset
 | 
342  | 
val mm =  | 
| 
 
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
 
wenzelm 
parents: 
33410 
diff
changeset
 | 
343  | 
if ! do_shutdown then 0  | 
| 
33413
 
cb409680dda8
avoid broadcast work_available, use daisy-chained signal instead;
 
wenzelm 
parents: 
33411 
diff
changeset
 | 
344  | 
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
 | 
345  | 
val _ =  | 
| 
 
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
 
wenzelm 
parents: 
33410 
diff
changeset
 | 
346  | 
if tick andalso mm > ! max_workers then  | 
| 
 
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
 
wenzelm 
parents: 
33410 
diff
changeset
 | 
347  | 
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
 | 
348  | 
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
 | 
349  | 
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
 | 
350  | 
else ();  | 
| 
 
a07558eb5029
worker_next: treat wait for work_available as Sleeping, not Waiting;
 
wenzelm 
parents: 
33410 
diff
changeset
 | 
351  | 
val _ =  | 
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
352  | 
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
 | 
353  | 
max_workers := mm  | 
| 
44173
 
aaaa13e297dc
immediate fork of initial workers -- avoid 5 ticks (250ms) for adaptive scheme (a07558eb5029);
 
wenzelm 
parents: 
44115 
diff
changeset
 | 
354  | 
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
 | 
355  | 
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
 | 
356  | 
else ();  | 
| 
33406
 
1ddcb8472bd2
slightly leaner and more direct control of worker activity etc.;
 
wenzelm 
parents: 
33061 
diff
changeset
 | 
357  | 
|
| 
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
 | 
358  | 
val missing = ! max_workers - length (! workers);  | 
| 28203 | 359  | 
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
 | 
360  | 
if missing > 0 then  | 
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
361  | 
funpow missing (fn () =>  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
362  | 
          ignore (worker_start ("worker " ^ string_of_int (Unsynchronized.inc next)))) ()
 | 
| 28203 | 363  | 
else ();  | 
| 
28206
 
bcd48c6897d4
eliminated requests, use global state variables uniformly;
 
wenzelm 
parents: 
28203 
diff
changeset
 | 
364  | 
|
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
365  | 
val _ =  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
366  | 
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
 | 
367  | 
else signal work_available;  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
368  | 
|
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
369  | 
|
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
370  | 
(* canceled groups *)  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
371  | 
|
| 
32225
 
d5d6f47fb018
cancel: improved reactivity due to more careful broadcasting;
 
wenzelm 
parents: 
32224 
diff
changeset
 | 
372  | 
val _ =  | 
| 
 
d5d6f47fb018
cancel: improved reactivity due to more careful broadcasting;
 
wenzelm 
parents: 
32224 
diff
changeset
 | 
373  | 
if null (! canceled) then ()  | 
| 32293 | 374  | 
else  | 
375  | 
(Multithreading.tracing 1 (fn () =>  | 
|
376  | 
string_of_int (length (! canceled)) ^ " canceled groups");  | 
|
| 
44299
 
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
 
wenzelm 
parents: 
44298 
diff
changeset
 | 
377  | 
Unsynchronized.change canceled (filter_out (null o cancel_now));  | 
| 
51281
 
c05f7e1dd602
signal work_available should be sufficient to initiate daisy-chained workers, and lead to separate broadcast work_finished eventually -- NB: broadcasting all worker threads tends to burn parallel CPU cycles;
 
wenzelm 
parents: 
51280 
diff
changeset
 | 
378  | 
signal work_available);  | 
| 
28206
 
bcd48c6897d4
eliminated requests, use global state variables uniformly;
 
wenzelm 
parents: 
28203 
diff
changeset
 | 
379  | 
|
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
380  | 
|
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
381  | 
(* delay loop *)  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
382  | 
|
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32293 
diff
changeset
 | 
383  | 
val _ = Exn.release (wait_timeout next_round scheduler_event);  | 
| 28167 | 384  | 
|
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
385  | 
|
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
386  | 
(* shutdown *)  | 
| 
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
387  | 
|
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
388  | 
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
 | 
389  | 
val continue = not (! do_shutdown andalso null (! workers));  | 
| 
50429
 
f8cd5e53653b
final report_status within SYNCHRONIZED part of scheduler loop: required for sanity of data;
 
wenzelm 
parents: 
50280 
diff
changeset
 | 
390  | 
val _ = if continue then () else (report_status (); scheduler := NONE);  | 
| 
33415
 
352fe8e9162d
worker_next: plain signalling via work_available only, not scheduler_event;
 
wenzelm 
parents: 
33413 
diff
changeset
 | 
391  | 
|
| 
32219
 
9a2566d1fdbd
more specific conditions: scheduler_event, work_available, work_finished -- considereably reduces overhead with many threads;
 
wenzelm 
parents: 
32186 
diff
changeset
 | 
392  | 
val _ = broadcast scheduler_event;  | 
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32293 
diff
changeset
 | 
393  | 
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
 | 
394  | 
handle exn =>  | 
| 
 
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
 
wenzelm 
parents: 
38236 
diff
changeset
 | 
395  | 
if Exn.is_interrupt exn then  | 
| 51279 | 396  | 
(Multithreading.tracing 1 (fn () => "SCHEDULER: Interrupt");  | 
| 
44341
 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 
wenzelm 
parents: 
44330 
diff
changeset
 | 
397  | 
List.app cancel_later (cancel_all ());  | 
| 
51281
 
c05f7e1dd602
signal work_available should be sufficient to initiate daisy-chained workers, and lead to separate broadcast work_finished eventually -- NB: broadcasting all worker threads tends to burn parallel CPU cycles;
 
wenzelm 
parents: 
51280 
diff
changeset
 | 
398  | 
signal work_available; true)  | 
| 
39232
 
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
 
wenzelm 
parents: 
38236 
diff
changeset
 | 
399  | 
else reraise exn;  | 
| 
32295
 
400cc493d466
renamed Multithreading.regular_interrupts to Multithreading.public_interrupts;
 
wenzelm 
parents: 
32293 
diff
changeset
 | 
400  | 
|
| 
28206
 
bcd48c6897d4
eliminated requests, use global state variables uniformly;
 
wenzelm 
parents: 
28203 
diff
changeset
 | 
401  | 
fun scheduler_loop () =  | 
| 
44173
 
aaaa13e297dc
immediate fork of initial workers -- avoid 5 ticks (250ms) for adaptive scheme (a07558eb5029);
 
wenzelm 
parents: 
44115 
diff
changeset
 | 
402  | 
(while  | 
| 
33416
 
13d00799fe49
scheduler: clarified interrupt attributes and handling;
 
wenzelm 
parents: 
33415 
diff
changeset
 | 
403  | 
Multithreading.with_attributes  | 
| 
 
13d00799fe49
scheduler: clarified interrupt attributes and handling;
 
wenzelm 
parents: 
33415 
diff
changeset
 | 
404  | 
(Multithreading.sync_interrupts Multithreading.public_interrupts)  | 
| 
 
13d00799fe49
scheduler: clarified interrupt attributes and handling;
 
wenzelm 
parents: 
33415 
diff
changeset
 | 
405  | 
(fn _ => SYNCHRONIZED "scheduler" (fn () => scheduler_next ()))  | 
| 
50429
 
f8cd5e53653b
final report_status within SYNCHRONIZED part of scheduler loop: required for sanity of data;
 
wenzelm 
parents: 
50280 
diff
changeset
 | 
406  | 
do (); last_round := Time.zeroTime);  | 
| 28156 | 407  | 
|
| 28203 | 408  | 
fun scheduler_active () = (*requires SYNCHRONIZED*)  | 
409  | 
(case ! scheduler of NONE => false | SOME thread => Thread.isActive thread);  | 
|
410  | 
||
| 
32228
 
7622c03141b0
scheduler: shutdown spontaneously (after some delay) if queue is empty;
 
wenzelm 
parents: 
32227 
diff
changeset
 | 
411  | 
fun scheduler_check () = (*requires SYNCHRONIZED*)  | 
| 
 
7622c03141b0
scheduler: shutdown spontaneously (after some delay) if queue is empty;
 
wenzelm 
parents: 
32227 
diff
changeset
 | 
412  | 
(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
 | 
413  | 
if scheduler_active () then ()  | 
| 
37216
 
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
 
wenzelm 
parents: 
37182 
diff
changeset
 | 
414  | 
else scheduler := SOME (Simple_Thread.fork false scheduler_loop));  | 
| 28156 | 415  | 
|
| 44301 | 416  | 
|
417  | 
||
418  | 
(** futures **)  | 
|
419  | 
||
420  | 
(* cancel *)  | 
|
421  | 
||
| 49906 | 422  | 
fun cancel_group_unsynchronized group = (*requires SYNCHRONIZED*)  | 
| 
44299
 
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
 
wenzelm 
parents: 
44298 
diff
changeset
 | 
423  | 
let  | 
| 
47421
 
9624408d8827
always signal after cancel_group: passive tasks may have become active;
 
wenzelm 
parents: 
47404 
diff
changeset
 | 
424  | 
val _ = if null (cancel_now group) then () else cancel_later group;  | 
| 
 
9624408d8827
always signal after cancel_group: passive tasks may have become active;
 
wenzelm 
parents: 
47404 
diff
changeset
 | 
425  | 
val _ = signal work_available;  | 
| 
 
9624408d8827
always signal after cancel_group: passive tasks may have become active;
 
wenzelm 
parents: 
47404 
diff
changeset
 | 
426  | 
val _ = scheduler_check ();  | 
| 49906 | 427  | 
in () end;  | 
428  | 
||
429  | 
fun cancel_group group =  | 
|
430  | 
SYNCHRONIZED "cancel_group" (fn () => cancel_group_unsynchronized group);  | 
|
| 
44299
 
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
 
wenzelm 
parents: 
44298 
diff
changeset
 | 
431  | 
|
| 44301 | 432  | 
fun cancel x = cancel_group (Task_Queue.group_of_task (task_of x));  | 
| 29366 | 433  | 
|
| 28156 | 434  | 
|
| 
50914
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
435  | 
(* results *)  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
436  | 
|
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
437  | 
fun error_msg pos ((serial, msg), exec_id) =  | 
| 
50916
 
fd902b616b48
proper runtime position (cf. fe4714886d92 and Toplevel.error_msg) -- to make error messages actually appear in the document;
 
wenzelm 
parents: 
50914 
diff
changeset
 | 
438  | 
Position.setmp_thread_data pos (fn () =>  | 
| 
50931
 
a7484a7b6c8a
clarified Future.error_msg: slightly more robust id check, actually suppress displaced messages;
 
wenzelm 
parents: 
50916 
diff
changeset
 | 
439  | 
let val id = Position.get_id pos in  | 
| 
 
a7484a7b6c8a
clarified Future.error_msg: slightly more robust id check, actually suppress displaced messages;
 
wenzelm 
parents: 
50916 
diff
changeset
 | 
440  | 
if is_none id orelse is_none exec_id orelse id = exec_id  | 
| 54387 | 441  | 
then Output.error_message' (serial, msg) else ()  | 
| 
50931
 
a7484a7b6c8a
clarified Future.error_msg: slightly more robust id check, actually suppress displaced messages;
 
wenzelm 
parents: 
50916 
diff
changeset
 | 
442  | 
end) ();  | 
| 44110 | 443  | 
|
| 
50914
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
444  | 
fun identify_result pos res =  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
445  | 
(case res of  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
446  | 
Exn.Exn exn =>  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
447  | 
let val exec_id =  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
448  | 
(case Position.get_id pos of  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
449  | 
NONE => []  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
450  | 
| SOME id => [(Markup.exec_idN, id)])  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
451  | 
in Exn.Exn (Par_Exn.identify exec_id exn) end  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
452  | 
| _ => res);  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
453  | 
|
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
454  | 
fun assign_result group result res =  | 
| 44110 | 455  | 
let  | 
456  | 
val _ = Single_Assignment.assign result res  | 
|
457  | 
handle exn as Fail _ =>  | 
|
458  | 
(case Single_Assignment.peek result of  | 
|
459  | 
SOME (Exn.Exn e) => reraise (if Exn.is_interrupt e then e else exn)  | 
|
460  | 
| _ => reraise exn);  | 
|
461  | 
val ok =  | 
|
462  | 
(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
 | 
463  | 
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
 | 
464  | 
(SYNCHRONIZED "cancel" (fn () => Task_Queue.cancel_group group exn); false)  | 
| 44110 | 465  | 
| Exn.Res _ => true);  | 
466  | 
in ok end;  | 
|
467  | 
||
| 
50914
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
468  | 
|
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
469  | 
(* future jobs *)  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
470  | 
|
| 
54649
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
471  | 
fun future_job group atts (e: unit -> 'a) =  | 
| 44110 | 472  | 
let  | 
473  | 
val result = Single_Assignment.var "future" : 'a result;  | 
|
474  | 
val pos = Position.thread_data ();  | 
|
475  | 
fun job ok =  | 
|
476  | 
let  | 
|
477  | 
val res =  | 
|
478  | 
if ok then  | 
|
479  | 
Exn.capture (fn () =>  | 
|
| 
54649
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
480  | 
Multithreading.with_attributes atts (fn _ => Position.setmp_thread_data pos e ())) ()  | 
| 44110 | 481  | 
else Exn.interrupt_exn;  | 
| 
50914
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
482  | 
in assign_result group result (identify_result pos res) end;  | 
| 44110 | 483  | 
in (result, job) end;  | 
484  | 
||
485  | 
||
| 29366 | 486  | 
(* fork *)  | 
487  | 
||
| 44427 | 488  | 
type params = {name: string, group: group option, deps: task list, pri: int, interrupts: bool};
 | 
489  | 
val default_params: params = {name = "", group = NONE, deps = [], pri = 0, interrupts = true};
 | 
|
| 44113 | 490  | 
|
| 44427 | 491  | 
fun forks ({name, group, deps, pri, interrupts}: params) es =
 | 
| 41674 | 492  | 
if null es then []  | 
493  | 
else  | 
|
494  | 
let  | 
|
495  | 
val grp =  | 
|
496  | 
(case group of  | 
|
497  | 
NONE => worker_subgroup ()  | 
|
498  | 
| SOME grp => grp);  | 
|
| 41708 | 499  | 
fun enqueue e queue =  | 
| 41674 | 500  | 
let  | 
| 
54649
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
501  | 
val atts =  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
502  | 
if interrupts  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
503  | 
then Multithreading.private_interrupts  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
504  | 
else Multithreading.no_interrupts;  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
505  | 
val (result, job) = future_job grp atts e;  | 
| 41708 | 506  | 
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
 | 
507  | 
          val future = Future {promised = false, task = task, result = result};
 | 
| 41708 | 508  | 
in (future, queue') end;  | 
| 41674 | 509  | 
in  | 
510  | 
SYNCHRONIZED "enqueue" (fn () =>  | 
|
511  | 
let  | 
|
| 41708 | 512  | 
val (futures, queue') = fold_map enqueue es (! queue);  | 
513  | 
val _ = queue := queue';  | 
|
514  | 
val minimal = forall (not o Task_Queue.known_task queue') deps;  | 
|
| 41674 | 515  | 
val _ = if minimal then signal work_available else ();  | 
516  | 
val _ = scheduler_check ();  | 
|
517  | 
in futures end)  | 
|
518  | 
end;  | 
|
| 28162 | 519  | 
|
| 50983 | 520  | 
fun fork e =  | 
521  | 
  (singleton o forks) {name = "fork", group = NONE, deps = [], pri = 0, interrupts = true} e;
 | 
|
| 28186 | 522  | 
|
523  | 
||
| 29366 | 524  | 
(* join *)  | 
525  | 
||
| 32099 | 526  | 
fun get_result x =  | 
527  | 
(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
 | 
528  | 
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
 | 
529  | 
| SOME res =>  | 
| 
 
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
 
wenzelm 
parents: 
38236 
diff
changeset
 | 
530  | 
if Exn.is_interrupt_exn res then  | 
| 44247 | 531  | 
(case Task_Queue.group_status (Task_Queue.group_of_task (task_of x)) of  | 
| 
53190
 
5d92649a310e
simplified Goal.forked_proofs: status is determined via group instead of dummy future (see also Pure/PIDE/execution.ML);
 
wenzelm 
parents: 
53189 
diff
changeset
 | 
532  | 
[] => res  | 
| 
 
5d92649a310e
simplified Goal.forked_proofs: status is determined via group instead of dummy future (see also Pure/PIDE/execution.ML);
 
wenzelm 
parents: 
53189 
diff
changeset
 | 
533  | 
| exns => Exn.Exn (Par_Exn.make exns))  | 
| 
39232
 
69c6d3e87660
more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
 
wenzelm 
parents: 
38236 
diff
changeset
 | 
534  | 
else res);  | 
| 28186 | 535  | 
|
| 
49935
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
536  | 
local  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
537  | 
|
| 32095 | 538  | 
fun join_next deps = (*requires SYNCHRONIZED*)  | 
| 
41695
 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 
wenzelm 
parents: 
41683 
diff
changeset
 | 
539  | 
if null deps then NONE  | 
| 32224 | 540  | 
else  | 
| 
41681
 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 
wenzelm 
parents: 
41680 
diff
changeset
 | 
541  | 
(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
 | 
542  | 
(NONE, []) => NONE  | 
| 
 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 
wenzelm 
parents: 
41683 
diff
changeset
 | 
543  | 
| (NONE, deps') =>  | 
| 
 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 
wenzelm 
parents: 
41683 
diff
changeset
 | 
544  | 
(worker_waiting deps' (fn () => worker_wait true work_finished); join_next deps')  | 
| 32224 | 545  | 
| (SOME work, deps') => SOME (work, deps'));  | 
| 32095 | 546  | 
|
| 
32814
 
81897d30b97f
added Task_Queue.depend (again) -- light-weight version for transitive graph;
 
wenzelm 
parents: 
32738 
diff
changeset
 | 
547  | 
fun execute_work NONE = ()  | 
| 44110 | 548  | 
| execute_work (SOME (work, deps')) =  | 
549  | 
(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
 | 
550  | 
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
 | 
551  | 
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
 | 
552  | 
(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
 | 
553  | 
|
| 
29551
 
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
 
wenzelm 
parents: 
29431 
diff
changeset
 | 
554  | 
in  | 
| 
 
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
 
wenzelm 
parents: 
29431 
diff
changeset
 | 
555  | 
|
| 29366 | 556  | 
fun join_results xs =  | 
| 41679 | 557  | 
let  | 
558  | 
val _ =  | 
|
559  | 
if forall is_finished xs then ()  | 
|
560  | 
else if Multithreading.self_critical () then  | 
|
| 52603 | 561  | 
raise Fail "Cannot join future values within critical section"  | 
| 
41695
 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 
wenzelm 
parents: 
41683 
diff
changeset
 | 
562  | 
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
 | 
563  | 
else List.app (ignore o Single_Assignment.await o result_of) xs;  | 
| 41679 | 564  | 
in map get_result xs end;  | 
| 28186 | 565  | 
|
| 
29551
 
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
 
wenzelm 
parents: 
29431 
diff
changeset
 | 
566  | 
end;  | 
| 
 
95e469919c3e
join_results: when dependencies are resulved (but not finished yet),
 
wenzelm 
parents: 
29431 
diff
changeset
 | 
567  | 
|
| 
28647
 
8068cdc84e7e
join_results: allow CRITICAL join of finished futures;
 
wenzelm 
parents: 
28645 
diff
changeset
 | 
568  | 
fun join_result x = singleton join_results x;  | 
| 44330 | 569  | 
fun joins xs = Par_Exn.release_all (join_results xs);  | 
| 
28647
 
8068cdc84e7e
join_results: allow CRITICAL join of finished futures;
 
wenzelm 
parents: 
28645 
diff
changeset
 | 
570  | 
fun join x = Exn.release (join_result x);  | 
| 28156 | 571  | 
|
| 54369 | 572  | 
fun join_tasks tasks =  | 
573  | 
if null tasks then ()  | 
|
574  | 
else  | 
|
575  | 
(singleton o forks)  | 
|
576  | 
      {name = "join_tasks", group = SOME (new_group NONE),
 | 
|
577  | 
deps = tasks, pri = 0, interrupts = false} I  | 
|
578  | 
|> join;  | 
|
579  | 
||
| 29366 | 580  | 
|
| 
54649
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
581  | 
(* task context for running thread *)  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
582  | 
|
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
583  | 
fun task_context name group f x =  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
584  | 
Multithreading.with_attributes Multithreading.no_interrupts (fn orig_atts =>  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
585  | 
let  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
586  | 
val (result, job) = future_job group orig_atts (fn () => f x);  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
587  | 
val task =  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
588  | 
SYNCHRONIZED "enroll" (fn () =>  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
589  | 
Unsynchronized.change_result queue (Task_Queue.enroll (Thread.self ()) name group));  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
590  | 
val _ = worker_exec (task, [job]);  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
591  | 
in  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
592  | 
(case Single_Assignment.peek result of  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
593  | 
NONE => raise Fail "Missing task context result"  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
594  | 
| SOME res => Exn.release res)  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
595  | 
end);  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
596  | 
|
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
597  | 
|
| 
51325
 
bcd6b1aa4db5
more uniform Future.map: always internalize failure;
 
wenzelm 
parents: 
51283 
diff
changeset
 | 
598  | 
(* fast-path operations -- bypass task queue if possible *)  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
599  | 
|
| 
44294
 
a0ddd5760444
clarified Future.cond_forks: more uniform handling of exceptional situations;
 
wenzelm 
parents: 
44268 
diff
changeset
 | 
600  | 
fun value_result (res: 'a Exn.result) =  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
601  | 
let  | 
| 
45136
 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 
wenzelm 
parents: 
44427 
diff
changeset
 | 
602  | 
val task = Task_Queue.dummy_task;  | 
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
603  | 
val group = Task_Queue.group_of_task task;  | 
| 35016 | 604  | 
val result = Single_Assignment.var "value" : 'a result;  | 
| 
50914
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
605  | 
val _ = assign_result group result (identify_result (Position.thread_data ()) res);  | 
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
606  | 
  in Future {promised = false, task = task, result = result} end;
 | 
| 29366 | 607  | 
|
| 
44294
 
a0ddd5760444
clarified Future.cond_forks: more uniform handling of exceptional situations;
 
wenzelm 
parents: 
44268 
diff
changeset
 | 
608  | 
fun value x = value_result (Exn.Res x);  | 
| 
 
a0ddd5760444
clarified Future.cond_forks: more uniform handling of exceptional situations;
 
wenzelm 
parents: 
44268 
diff
changeset
 | 
609  | 
|
| 44330 | 610  | 
fun cond_forks args es =  | 
611  | 
if Multithreading.enabled () then forks args es  | 
|
612  | 
else map (fn e => value_result (Exn.interruptible_capture e ())) es;  | 
|
613  | 
||
| 
29384
 
a3c7e9ae9b71
more robust propagation of errors through bulk jobs;
 
wenzelm 
parents: 
29366 
diff
changeset
 | 
614  | 
fun map_future f x =  | 
| 
51325
 
bcd6b1aa4db5
more uniform Future.map: always internalize failure;
 
wenzelm 
parents: 
51283 
diff
changeset
 | 
615  | 
if is_finished x then value_result (Exn.interruptible_capture (f o join) x)  | 
| 
49935
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
616  | 
else  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
617  | 
let  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
618  | 
val task = task_of x;  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
619  | 
val group = Task_Queue.group_of_task task;  | 
| 
54649
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
620  | 
val (result, job) =  | 
| 
 
99b9249b3e05
more official task context via Task_Queue.enroll, which is required to participate in group cancellation (e.g. to terminate command exec);
 
wenzelm 
parents: 
54637 
diff
changeset
 | 
621  | 
future_job group Multithreading.private_interrupts (fn () => f (join x));  | 
| 
29384
 
a3c7e9ae9b71
more robust propagation of errors through bulk jobs;
 
wenzelm 
parents: 
29366 
diff
changeset
 | 
622  | 
|
| 
49935
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
623  | 
val extended = SYNCHRONIZED "extend" (fn () =>  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
624  | 
(case Task_Queue.extend task job (! queue) of  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
625  | 
SOME queue' => (queue := queue'; true)  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
626  | 
| NONE => false));  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
627  | 
in  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
628  | 
      if extended then Future {promised = false, task = task, result = result}
 | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
629  | 
else  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
630  | 
(singleton o cond_forks)  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
631  | 
          {name = "map_future", group = SOME group, deps = [task],
 | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
632  | 
pri = Task_Queue.pri_of_task task, interrupts = true}  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
633  | 
(fn () => f (join x))  | 
| 
 
d1ecb3554b25
clarified Future.map (again): finished value is mapped in-place, which saves task structures and changes error behaviour slightly (tolerance against canceled group of old value etc.);
 
wenzelm 
parents: 
49910 
diff
changeset
 | 
634  | 
end;  | 
| 
28979
 
3ce619d8d432
fork/map: no inheritance of group (structure is nested, not parallel);
 
wenzelm 
parents: 
28972 
diff
changeset
 | 
635  | 
|
| 28191 | 636  | 
|
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
637  | 
(* promised futures -- fulfilled by external means *)  | 
| 
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
638  | 
|
| 
44298
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
639  | 
fun promise_group group abort : 'a future =  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
640  | 
let  | 
| 35016 | 641  | 
val result = Single_Assignment.var "promise" : 'a result;  | 
| 
44298
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
642  | 
fun assign () = assign_result group result Exn.interrupt_exn  | 
| 
39243
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
643  | 
handle Fail _ => true  | 
| 
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
644  | 
| exn =>  | 
| 
44298
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
645  | 
if Exn.is_interrupt exn  | 
| 
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
646  | 
then raise Fail "Concurrent attempt to fulfill promise"  | 
| 
39243
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
647  | 
else reraise exn;  | 
| 
44298
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
648  | 
fun job () =  | 
| 
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
649  | 
Multithreading.with_attributes Multithreading.no_interrupts  | 
| 
47423
 
8a179a0493e3
more robust Future.fulfill wrt. duplicate assignment and interrupt;
 
wenzelm 
parents: 
47421 
diff
changeset
 | 
650  | 
(fn _ => Exn.release (Exn.capture assign () before abort ()));  | 
| 
37854
 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 
wenzelm 
parents: 
37852 
diff
changeset
 | 
651  | 
val task = SYNCHRONIZED "enqueue_passive" (fn () =>  | 
| 
44298
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
652  | 
Unsynchronized.change_result queue (Task_Queue.enqueue_passive group job));  | 
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
653  | 
  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
 | 
654  | 
|
| 
44298
 
b8f8488704e2
Future.promise: explicit abort operation (like uninterruptible future job);
 
wenzelm 
parents: 
44295 
diff
changeset
 | 
655  | 
fun promise abort = promise_group (worker_subgroup ()) abort;  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
656  | 
|
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
657  | 
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
 | 
658  | 
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
 | 
659  | 
else  | 
| 
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
660  | 
let  | 
| 
41683
 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 
wenzelm 
parents: 
41681 
diff
changeset
 | 
661  | 
val group = Task_Queue.group_of_task task;  | 
| 
50914
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
662  | 
val pos = Position.thread_data ();  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
663  | 
fun job ok =  | 
| 
 
fe4714886d92
identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
 
wenzelm 
parents: 
50911 
diff
changeset
 | 
664  | 
assign_result group result (if ok then identify_result pos res else Exn.interrupt_exn);  | 
| 
39243
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
665  | 
val _ =  | 
| 
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
666  | 
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
 | 
667  | 
let  | 
| 
47423
 
8a179a0493e3
more robust Future.fulfill wrt. duplicate assignment and interrupt;
 
wenzelm 
parents: 
47421 
diff
changeset
 | 
668  | 
val passive_job =  | 
| 
39243
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
669  | 
SYNCHRONIZED "fulfill_result" (fn () =>  | 
| 
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
670  | 
Unsynchronized.change_result queue  | 
| 
 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 
wenzelm 
parents: 
39232 
diff
changeset
 | 
671  | 
(Task_Queue.dequeue_passive (Thread.self ()) task));  | 
| 
47423
 
8a179a0493e3
more robust Future.fulfill wrt. duplicate assignment and interrupt;
 
wenzelm 
parents: 
47421 
diff
changeset
 | 
672  | 
in  | 
| 
 
8a179a0493e3
more robust Future.fulfill wrt. duplicate assignment and interrupt;
 
wenzelm 
parents: 
47421 
diff
changeset
 | 
673  | 
(case passive_job of  | 
| 
 
8a179a0493e3
more robust Future.fulfill wrt. duplicate assignment and interrupt;
 
wenzelm 
parents: 
47421 
diff
changeset
 | 
674  | 
SOME true => worker_exec (task, [job])  | 
| 
 
8a179a0493e3
more robust Future.fulfill wrt. duplicate assignment and interrupt;
 
wenzelm 
parents: 
47421 
diff
changeset
 | 
675  | 
| SOME false => ()  | 
| 
 
8a179a0493e3
more robust Future.fulfill wrt. duplicate assignment and interrupt;
 
wenzelm 
parents: 
47421 
diff
changeset
 | 
676  | 
| NONE => ignore (job (not (Task_Queue.is_canceled group))))  | 
| 
 
8a179a0493e3
more robust Future.fulfill wrt. duplicate assignment and interrupt;
 
wenzelm 
parents: 
47421 
diff
changeset
 | 
677  | 
end);  | 
| 
41681
 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 
wenzelm 
parents: 
41680 
diff
changeset
 | 
678  | 
val _ =  | 
| 
41695
 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 
wenzelm 
parents: 
41683 
diff
changeset
 | 
679  | 
if is_some (Single_Assignment.peek result) then ()  | 
| 
 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 
wenzelm 
parents: 
41683 
diff
changeset
 | 
680  | 
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
 | 
681  | 
in () end;  | 
| 
34277
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
682  | 
|
| 
43761
 
e72ba84ae58f
tuned signature -- corresponding to Scala version;
 
wenzelm 
parents: 
43665 
diff
changeset
 | 
683  | 
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
 | 
684  | 
|
| 
 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 
wenzelm 
parents: 
33416 
diff
changeset
 | 
685  | 
|
| 54369 | 686  | 
(* group snapshot *)  | 
687  | 
||
688  | 
fun group_snapshot group =  | 
|
689  | 
SYNCHRONIZED "group_snapshot" (fn () =>  | 
|
690  | 
Task_Queue.group_tasks (! queue) group);  | 
|
691  | 
||
692  | 
||
| 49906 | 693  | 
(* terminate *)  | 
694  | 
||
695  | 
fun terminate group =  | 
|
| 54369 | 696  | 
SYNCHRONIZED "terminate" (fn () =>  | 
697  | 
let val _ = cancel_group_unsynchronized group;  | 
|
698  | 
in Task_Queue.group_tasks (! queue) group end)  | 
|
699  | 
|> join_tasks;  | 
|
| 49906 | 700  | 
|
701  | 
||
| 
32228
 
7622c03141b0
scheduler: shutdown spontaneously (after some delay) if queue is empty;
 
wenzelm 
parents: 
32227 
diff
changeset
 | 
702  | 
(* shutdown *)  | 
| 29366 | 703  | 
|
| 28203 | 704  | 
fun shutdown () =  | 
| 
51283
 
fefd07697979
disallow shutdown from worker, which would lead to deadlock since the scheduler cannot terminate;
 
wenzelm 
parents: 
51281 
diff
changeset
 | 
705  | 
if not Multithreading.available then ()  | 
| 
 
fefd07697979
disallow shutdown from worker, which would lead to deadlock since the scheduler cannot terminate;
 
wenzelm 
parents: 
51281 
diff
changeset
 | 
706  | 
else if is_some (worker_task ()) then  | 
| 
 
fefd07697979
disallow shutdown from worker, which would lead to deadlock since the scheduler cannot terminate;
 
wenzelm 
parents: 
51281 
diff
changeset
 | 
707  | 
raise Fail "Cannot shutdown while running as worker thread"  | 
| 
 
fefd07697979
disallow shutdown from worker, which would lead to deadlock since the scheduler cannot terminate;
 
wenzelm 
parents: 
51281 
diff
changeset
 | 
708  | 
else  | 
| 28276 | 709  | 
SYNCHRONIZED "shutdown" (fn () =>  | 
| 51279 | 710  | 
while scheduler_active () do  | 
711  | 
(Multithreading.tracing 1 (fn () => "SHUTDOWN: wait");  | 
|
| 
51283
 
fefd07697979
disallow shutdown from worker, which would lead to deadlock since the scheduler cannot terminate;
 
wenzelm 
parents: 
51281 
diff
changeset
 | 
712  | 
wait scheduler_event));  | 
| 28203 | 713  | 
|
| 29366 | 714  | 
|
715  | 
(*final declarations of this structure!*)  | 
|
716  | 
val map = map_future;  | 
|
717  | 
||
| 28156 | 718  | 
end;  | 
| 28972 | 719  | 
|
720  | 
type 'a future = 'a Future.future;  | 
|
721  |