author | haftmann |
Sat, 20 Aug 2011 01:21:22 +0200 | |
changeset 44323 | 4b5b430eb00e |
parent 44299 | 061599cb6eb0 |
child 44338 | 700008399ee5 |
permissions | -rw-r--r-- |
28165 | 1 |
(* Title: Pure/Concurrent/task_queue.ML |
2 |
Author: Makarius |
|
3 |
||
4 |
Ordered queue of grouped tasks. |
|
5 |
*) |
|
6 |
||
7 |
signature TASK_QUEUE = |
|
8 |
sig |
|
29340 | 9 |
type group |
32221 | 10 |
val new_group: group option -> group |
32052 | 11 |
val group_id: group -> int |
29340 | 12 |
val eq_group: group * group -> bool |
32221 | 13 |
val cancel_group: group -> exn -> unit |
14 |
val is_canceled: group -> bool |
|
44247 | 15 |
val group_status: group -> exn option |
28179 | 16 |
val str_of_group: group -> string |
43951 | 17 |
val str_of_groups: group -> string |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
18 |
type task |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
19 |
val dummy_task: unit -> task |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
20 |
val group_of_task: task -> group |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
21 |
val name_of_task: task -> string |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
22 |
val pri_of_task: task -> int |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
23 |
val str_of_task: task -> string |
43951 | 24 |
val str_of_task_groups: task -> string |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
25 |
val timing_of_task: task -> Time.time * Time.time * string list |
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
26 |
val running: task -> (unit -> 'a) -> 'a |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
27 |
val joining: task -> (unit -> 'a) -> 'a |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
28 |
val waiting: task -> task list -> (unit -> 'a) -> 'a |
28165 | 29 |
type queue |
30 |
val empty: queue |
|
41708 | 31 |
val known_task: queue -> task -> bool |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
32 |
val all_passive: queue -> bool |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
33 |
val status: queue -> {ready: int, pending: int, running: int, passive: int} |
44299
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents:
44247
diff
changeset
|
34 |
val cancel: queue -> group -> task list |
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
35 |
val cancel_all: queue -> group list |
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
36 |
val finish: task -> queue -> bool * queue |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
37 |
val enqueue_passive: group -> (unit -> bool) -> queue -> task * queue |
41708 | 38 |
val enqueue: string -> group -> task list -> int -> (bool -> bool) -> queue -> task * queue |
29365 | 39 |
val extend: task -> (bool -> bool) -> queue -> queue option |
39243
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
40 |
val dequeue_passive: Thread.thread -> task -> queue -> bool * queue |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
41 |
val dequeue: Thread.thread -> queue -> (task * (bool -> bool) list) option * queue |
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
42 |
val dequeue_deps: Thread.thread -> task list -> queue -> |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
43 |
(((task * (bool -> bool) list) option * task list) * queue) |
28165 | 44 |
end; |
45 |
||
35242
1c80c29086d7
eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents:
35012
diff
changeset
|
46 |
structure Task_Queue: TASK_QUEUE = |
28165 | 47 |
struct |
48 |
||
40450
8eab60e1baeb
private counter, to keep externalized ids a bit smaller;
wenzelm
parents:
39243
diff
changeset
|
49 |
val new_id = Synchronized.counter (); |
8eab60e1baeb
private counter, to keep externalized ids a bit smaller;
wenzelm
parents:
39243
diff
changeset
|
50 |
|
8eab60e1baeb
private counter, to keep externalized ids a bit smaller;
wenzelm
parents:
39243
diff
changeset
|
51 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
52 |
(** nested groups of tasks **) |
41670 | 53 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
54 |
(* groups *) |
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
55 |
|
35242
1c80c29086d7
eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents:
35012
diff
changeset
|
56 |
abstype group = Group of |
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
57 |
{parent: group option, |
40450
8eab60e1baeb
private counter, to keep externalized ids a bit smaller;
wenzelm
parents:
39243
diff
changeset
|
58 |
id: int, |
44247 | 59 |
status: exn option Synchronized.var} |
35242
1c80c29086d7
eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents:
35012
diff
changeset
|
60 |
with |
29121 | 61 |
|
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
62 |
fun make_group (parent, id, status) = Group {parent = parent, id = id, status = status}; |
32052 | 63 |
|
44247 | 64 |
fun new_group parent = make_group (parent, new_id (), Synchronized.var "group_status" NONE); |
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
65 |
|
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
66 |
fun group_id (Group {id, ...}) = id; |
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
67 |
fun eq_group (group1, group2) = group_id group1 = group_id group2; |
28551 | 68 |
|
43951 | 69 |
fun fold_groups f (g as Group {parent = NONE, ...}) a = f g a |
70 |
| fold_groups f (g as Group {parent = SOME group, ...}) a = fold_groups f group (f g a); |
|
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
71 |
|
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
72 |
|
32221 | 73 |
(* group status *) |
74 |
||
32251 | 75 |
fun cancel_group (Group {status, ...}) exn = |
76 |
Synchronized.change status |
|
44247 | 77 |
(fn exns => SOME (Par_Exn.make (exn :: the_list exns))); |
29121 | 78 |
|
32251 | 79 |
fun is_canceled (Group {parent, status, ...}) = |
44247 | 80 |
is_some (Synchronized.value status) orelse |
32251 | 81 |
(case parent of NONE => false | SOME group => is_canceled group); |
32221 | 82 |
|
44247 | 83 |
fun group_exns (Group {parent, status, ...}) = |
84 |
the_list (Synchronized.value status) @ |
|
85 |
(case parent of NONE => [] | SOME group => group_exns group); |
|
86 |
||
87 |
fun group_status group = |
|
88 |
(case group_exns group of |
|
89 |
[] => NONE |
|
90 |
| exns => SOME (Par_Exn.make exns)); |
|
28165 | 91 |
|
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
92 |
fun str_of_group group = |
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
93 |
(is_canceled group ? enclose "(" ")") (string_of_int (group_id group)); |
28179 | 94 |
|
43951 | 95 |
fun str_of_groups group = |
96 |
space_implode "/" (map str_of_group (rev (fold_groups cons group []))); |
|
97 |
||
35242
1c80c29086d7
eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents:
35012
diff
changeset
|
98 |
end; |
1c80c29086d7
eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents:
35012
diff
changeset
|
99 |
|
28165 | 100 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
101 |
(* tasks *) |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
102 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
103 |
type timing = Time.time * Time.time * string list; (*run, wait, wait dependencies*) |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
104 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
105 |
fun new_timing () = |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
106 |
Synchronized.var "timing" ((Time.zeroTime, Time.zeroTime, []): timing); |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
107 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
108 |
abstype task = Task of |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
109 |
{group: group, |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
110 |
name: string, |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
111 |
id: int, |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
112 |
pri: int option, |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
113 |
timing: timing Synchronized.var} |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
114 |
with |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
115 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
116 |
fun dummy_task () = |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
117 |
Task {group = new_group NONE, name = "", id = 0, pri = NONE, timing = new_timing ()}; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
118 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
119 |
fun new_task group name pri = |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
120 |
Task {group = group, name = name, id = new_id (), pri = pri, timing = new_timing ()}; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
121 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
122 |
fun group_of_task (Task {group, ...}) = group; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
123 |
fun name_of_task (Task {name, ...}) = name; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
124 |
fun pri_of_task (Task {pri, ...}) = the_default 0 pri; |
43951 | 125 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
126 |
fun str_of_task (Task {name, id, ...}) = |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
127 |
if name = "" then string_of_int id else string_of_int id ^ " (" ^ name ^ ")"; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
128 |
|
43951 | 129 |
fun str_of_task_groups task = str_of_task task ^ " in " ^ str_of_groups (group_of_task task); |
130 |
||
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
131 |
fun timing_of_task (Task {timing, ...}) = Synchronized.value timing; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
132 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
133 |
fun update_timing update (Task {timing, ...}) e = |
41702
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
134 |
uninterruptible (fn restore_attributes => fn () => |
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
135 |
let |
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
136 |
val start = Time.now (); |
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
137 |
val result = Exn.capture (restore_attributes e) (); |
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
138 |
val t = Time.- (Time.now (), start); |
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
139 |
val _ = Synchronized.change timing (update t); |
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
140 |
in Exn.release result end) (); |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
141 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
142 |
fun task_ord (Task {id = id1, pri = pri1, ...}, Task {id = id2, pri = pri2, ...}) = |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
143 |
prod_ord (rev_order o option_ord int_ord) int_ord ((pri1, id1), (pri2, id2)); |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
144 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
145 |
end; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
146 |
|
41709
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
147 |
structure Tasks = Table(type key = task val ord = task_ord); |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
148 |
structure Task_Graph = Graph(type key = task val ord = task_ord); |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
149 |
|
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
150 |
|
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
151 |
(* timing *) |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
152 |
|
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
153 |
fun running task = |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
154 |
update_timing (fn t => fn (a, b, ds) => (Time.+ (a, t), b, ds)) task; |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
155 |
|
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
156 |
fun joining task = |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
157 |
update_timing (fn t => fn (a, b, ds) => (Time.- (a, t), b, ds)) task; |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
158 |
|
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
159 |
fun waiting task deps = |
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
160 |
update_timing (fn t => fn (a, b, ds) => |
41702
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
161 |
(Time.- (a, t), Time.+ (b, t), |
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
162 |
if ! Multithreading.trace > 0 |
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents:
41695
diff
changeset
|
163 |
then fold (insert (op =) o name_of_task) deps ds else ds)) task; |
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
164 |
|
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
165 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
166 |
|
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
167 |
(** queue of jobs and groups **) |
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
168 |
|
41709
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
169 |
(* known group members *) |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
170 |
|
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
171 |
type groups = unit Tasks.table Inttab.table; |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
172 |
|
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
173 |
fun get_tasks (groups: groups) gid = |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
174 |
the_default Tasks.empty (Inttab.lookup groups gid); |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
175 |
|
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
176 |
fun add_task (gid, task) groups = |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
177 |
Inttab.update (gid, Tasks.update (task, ()) (get_tasks groups gid)) groups; |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
178 |
|
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
179 |
fun del_task (gid, task) groups = |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
180 |
let val tasks = Tasks.delete_safe task (get_tasks groups gid) in |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
181 |
if Tasks.is_empty tasks then Inttab.delete_safe gid groups |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
182 |
else Inttab.update (gid, tasks) groups |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
183 |
end; |
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
184 |
|
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
185 |
|
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
186 |
(* job dependency graph *) |
28165 | 187 |
|
188 |
datatype job = |
|
29365 | 189 |
Job of (bool -> bool) list | |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
190 |
Running of Thread.thread | |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
191 |
Passive of unit -> bool; |
28165 | 192 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
193 |
type jobs = job Task_Graph.T; |
28176
01b21886e7f0
job: explicit 'ok' status -- false for canceled jobs;
wenzelm
parents:
28171
diff
changeset
|
194 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
195 |
fun get_job (jobs: jobs) task = Task_Graph.get_node jobs task; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
196 |
fun set_job task job (jobs: jobs) = Task_Graph.map_node task (K job) jobs; |
28202
23cb9a974630
added focus, which indicates a particular collection of high-priority tasks;
wenzelm
parents:
28196
diff
changeset
|
197 |
|
32250 | 198 |
fun add_job task dep (jobs: jobs) = |
199 |
Task_Graph.add_edge (dep, task) jobs handle Task_Graph.UNDEF _ => jobs; |
|
200 |
||
28176
01b21886e7f0
job: explicit 'ok' status -- false for canceled jobs;
wenzelm
parents:
28171
diff
changeset
|
201 |
|
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
202 |
(* queue *) |
28176
01b21886e7f0
job: explicit 'ok' status -- false for canceled jobs;
wenzelm
parents:
28171
diff
changeset
|
203 |
|
41709
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
204 |
datatype queue = Queue of {groups: groups, jobs: jobs}; |
28165 | 205 |
|
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
206 |
fun make_queue groups jobs = Queue {groups = groups, jobs = jobs}; |
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
207 |
val empty = make_queue Inttab.empty Task_Graph.empty; |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
208 |
|
41708 | 209 |
fun known_task (Queue {jobs, ...}) task = can (Task_Graph.get_entry jobs) task; |
210 |
||
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
211 |
|
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
212 |
(* job status *) |
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
213 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
214 |
fun ready_job task (Job list, ([], _)) = SOME (task, rev list) |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
215 |
| ready_job task (Passive abort, ([], _)) = |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
216 |
if is_canceled (group_of_task task) then SOME (task, [fn _ => abort ()]) |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
217 |
else NONE |
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
218 |
| ready_job _ _ = NONE; |
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
219 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
220 |
fun active_job (_, (Job _, _)) = SOME () |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
221 |
| active_job (_, (Running _, _)) = SOME () |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
222 |
| active_job (task, (Passive _, _)) = |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
223 |
if is_canceled (group_of_task task) then SOME () else NONE; |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
224 |
|
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
225 |
fun all_passive (Queue {jobs, ...}) = is_none (Task_Graph.get_first active_job jobs); |
28165 | 226 |
|
227 |
||
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
228 |
(* queue status *) |
32052 | 229 |
|
230 |
fun status (Queue {jobs, ...}) = |
|
231 |
let |
|
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
232 |
val (x, y, z, w) = |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
233 |
Task_Graph.fold (fn (_, (job, (deps, _))) => fn (x, y, z, w) => |
32052 | 234 |
(case job of |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
235 |
Job _ => if null deps then (x + 1, y, z, w) else (x, y + 1, z, w) |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
236 |
| Running _ => (x, y, z + 1, w) |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
237 |
| Passive _ => (x, y, z, w + 1))) |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
238 |
jobs (0, 0, 0, 0); |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
239 |
in {ready = x, pending = y, running = z, passive = w} end; |
32052 | 240 |
|
241 |
||
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
242 |
|
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
243 |
(** task queue operations **) |
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
244 |
|
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
245 |
(* cancel -- peers and sub-groups *) |
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
246 |
|
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
247 |
fun cancel (Queue {groups, jobs}) group = |
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
248 |
let |
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
249 |
val _ = cancel_group group Exn.Interrupt; |
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
250 |
val running = |
44299
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents:
44247
diff
changeset
|
251 |
Tasks.fold (fn (task, _) => |
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents:
44247
diff
changeset
|
252 |
(case get_job jobs task of Running thread => cons (task, thread) | _ => I)) |
41709
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
253 |
(get_tasks groups (group_id group)) []; |
44299
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents:
44247
diff
changeset
|
254 |
val threads = fold (insert Thread.equal o #2) running []; |
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents:
44247
diff
changeset
|
255 |
val _ = List.app Simple_Thread.interrupt_unsynchronized threads; |
061599cb6eb0
refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents:
44247
diff
changeset
|
256 |
in map #1 running end; |
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
257 |
|
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
258 |
fun cancel_all (Queue {jobs, ...}) = |
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
259 |
let |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
260 |
fun cancel_job (task, (job, _)) (groups, running) = |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
261 |
let |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
262 |
val group = group_of_task task; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
263 |
val _ = cancel_group group Exn.Interrupt; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
264 |
in |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
265 |
(case job of |
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
266 |
Running t => (insert eq_group group groups, insert Thread.equal t running) |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
267 |
| _ => (groups, running)) |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
268 |
end; |
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
269 |
val (running_groups, running) = Task_Graph.fold cancel_job jobs ([], []); |
44112
ef876972fdc1
more explicit Simple_Thread.interrupt_unsynchronized, to emphasize its meaning;
wenzelm
parents:
43951
diff
changeset
|
270 |
val _ = List.app Simple_Thread.interrupt_unsynchronized running; |
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
271 |
in running_groups end; |
32101
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
272 |
|
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents:
32099
diff
changeset
|
273 |
|
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
274 |
(* finish *) |
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
275 |
|
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
276 |
fun finish task (Queue {groups, jobs}) = |
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
277 |
let |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
278 |
val group = group_of_task task; |
43951 | 279 |
val groups' = fold_groups (fn g => del_task (group_id g, task)) group groups; |
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
280 |
val jobs' = Task_Graph.del_node task jobs; |
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
281 |
val maximal = null (Task_Graph.imm_succs jobs task); |
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
282 |
in (maximal, make_queue groups' jobs') end; |
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
283 |
|
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
284 |
|
28185
0f20cbce4935
simplified dequeue: provide Thread.self internally;
wenzelm
parents:
28184
diff
changeset
|
285 |
(* enqueue *) |
28165 | 286 |
|
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
287 |
fun enqueue_passive group abort (Queue {groups, jobs}) = |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
288 |
let |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
289 |
val task = new_task group "passive" NONE; |
43951 | 290 |
val groups' = fold_groups (fn g => add_task (group_id g, task)) group groups; |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
291 |
val jobs' = jobs |> Task_Graph.new_node (task, Passive abort); |
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
292 |
in (task, make_queue groups' jobs') end; |
34277
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents:
32814
diff
changeset
|
293 |
|
41673 | 294 |
fun enqueue name group deps pri job (Queue {groups, jobs}) = |
28165 | 295 |
let |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
296 |
val task = new_task group name (SOME pri); |
43951 | 297 |
val groups' = fold_groups (fn g => add_task (group_id g, task)) group groups; |
28185
0f20cbce4935
simplified dequeue: provide Thread.self internally;
wenzelm
parents:
28184
diff
changeset
|
298 |
val jobs' = jobs |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
299 |
|> Task_Graph.new_node (task, Job [job]) |
41684
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
300 |
|> fold (add_job task) deps; |
41708 | 301 |
in (task, make_queue groups' jobs') end; |
28165 | 302 |
|
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
303 |
fun extend task job (Queue {groups, jobs}) = |
29365 | 304 |
(case try (get_job jobs) task of |
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
305 |
SOME (Job list) => SOME (make_queue groups (set_job task (Job (job :: list)) jobs)) |
29365 | 306 |
| _ => NONE); |
307 |
||
28185
0f20cbce4935
simplified dequeue: provide Thread.self internally;
wenzelm
parents:
28184
diff
changeset
|
308 |
|
0f20cbce4935
simplified dequeue: provide Thread.self internally;
wenzelm
parents:
28184
diff
changeset
|
309 |
(* dequeue *) |
0f20cbce4935
simplified dequeue: provide Thread.self internally;
wenzelm
parents:
28184
diff
changeset
|
310 |
|
39243
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
311 |
fun dequeue_passive thread task (queue as Queue {groups, jobs}) = |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
312 |
(case try (get_job jobs) task of |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
313 |
SOME (Passive _) => |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
314 |
let val jobs' = set_job task (Running thread) jobs |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
315 |
in (true, make_queue groups jobs') end |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
316 |
| _ => (false, queue)); |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
317 |
|
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
318 |
fun dequeue thread (queue as Queue {groups, jobs}) = |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
319 |
(case Task_Graph.get_first (uncurry ready_job) jobs of |
41683
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents:
41682
diff
changeset
|
320 |
SOME (result as (task, _)) => |
37854
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents:
37216
diff
changeset
|
321 |
let val jobs' = set_job task (Running thread) jobs |
39243
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
322 |
in (SOME result, make_queue groups jobs') end |
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents:
39232
diff
changeset
|
323 |
| NONE => (NONE, queue)); |
28202
23cb9a974630
added focus, which indicates a particular collection of high-priority tasks;
wenzelm
parents:
28196
diff
changeset
|
324 |
|
28165 | 325 |
|
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
326 |
(* dequeue wrt. dynamic dependencies *) |
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
327 |
|
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
328 |
fun dequeue_deps thread deps (queue as Queue {groups, jobs}) = |
32055
6a46898aa805
recovered a version of dequeue_towards (cf. bb7b5a5942c7);
wenzelm
parents:
32052
diff
changeset
|
329 |
let |
41684
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
330 |
fun ready [] rest = (NONE, rev rest) |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
331 |
| ready (task :: tasks) rest = |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
332 |
(case try (Task_Graph.get_entry jobs) task of |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
333 |
NONE => ready tasks rest |
43792
d5803c3d537a
Table.lookup_key and Graph.get_entry allow to retrieve the original key, which is not necessarily identical to the given one;
wenzelm
parents:
41709
diff
changeset
|
334 |
| SOME (_, entry) => |
41684
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
335 |
(case ready_job task entry of |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
336 |
NONE => ready tasks (task :: rest) |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
337 |
| some => (some, List.revAppend (rest, tasks)))); |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
338 |
|
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
339 |
fun ready_dep _ [] = NONE |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
340 |
| ready_dep seen (task :: tasks) = |
41709
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
341 |
if Tasks.defined seen task then ready_dep seen tasks |
41684
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
342 |
else |
43792
d5803c3d537a
Table.lookup_key and Graph.get_entry allow to retrieve the original key, which is not necessarily identical to the given one;
wenzelm
parents:
41709
diff
changeset
|
343 |
let val entry as (_, (ds, _)) = #2 (Task_Graph.get_entry jobs task) in |
41684
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
344 |
(case ready_job task entry of |
41709
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
345 |
NONE => ready_dep (Tasks.update (task, ()) seen) (ds @ tasks) |
41684
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
346 |
| some => some) |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
347 |
end; |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
348 |
|
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
349 |
fun result (res as (task, _)) deps' = |
34280
16bf3e9786a3
eliminated cache, which complicates the code without making a real difference (NB: deque_towards often disrupts caching, and daisy-chaining of workers already reduces queue overhead);
wenzelm
parents:
34279
diff
changeset
|
350 |
let val jobs' = set_job task (Running thread) jobs |
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
351 |
in ((SOME res, deps'), make_queue groups jobs') end; |
32055
6a46898aa805
recovered a version of dequeue_towards (cf. bb7b5a5942c7);
wenzelm
parents:
32052
diff
changeset
|
352 |
in |
41684
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
353 |
(case ready deps [] of |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
354 |
(SOME res, deps') => result res deps' |
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
355 |
| (NONE, deps') => |
41709
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
wenzelm
parents:
41708
diff
changeset
|
356 |
(case ready_dep Tasks.empty deps' of |
41684
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents:
41683
diff
changeset
|
357 |
SOME res => result res deps' |
41695
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents:
41684
diff
changeset
|
358 |
| NONE => ((NONE, deps'), queue))) |
32055
6a46898aa805
recovered a version of dequeue_towards (cf. bb7b5a5942c7);
wenzelm
parents:
32052
diff
changeset
|
359 |
end; |
6a46898aa805
recovered a version of dequeue_towards (cf. bb7b5a5942c7);
wenzelm
parents:
32052
diff
changeset
|
360 |
|
41681
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents:
41680
diff
changeset
|
361 |
end; |