wenzelm@28165
|
1 |
(* Title: Pure/Concurrent/task_queue.ML
|
wenzelm@28165
|
2 |
Author: Makarius
|
wenzelm@28165
|
3 |
|
wenzelm@28165
|
4 |
Ordered queue of grouped tasks.
|
wenzelm@28165
|
5 |
*)
|
wenzelm@28165
|
6 |
|
wenzelm@28165
|
7 |
signature TASK_QUEUE =
|
wenzelm@28165
|
8 |
sig
|
wenzelm@29340
|
9 |
type group
|
wenzelm@32221
|
10 |
val new_group: group option -> group
|
wenzelm@32052
|
11 |
val group_id: group -> int
|
wenzelm@29340
|
12 |
val eq_group: group * group -> bool
|
wenzelm@32221
|
13 |
val cancel_group: group -> exn -> unit
|
wenzelm@32221
|
14 |
val is_canceled: group -> bool
|
wenzelm@32121
|
15 |
val group_status: group -> exn list
|
wenzelm@28179
|
16 |
val str_of_group: group -> string
|
wenzelm@42563
|
17 |
type task
|
wenzelm@42563
|
18 |
val dummy_task: unit -> task
|
wenzelm@42563
|
19 |
val group_of_task: task -> group
|
wenzelm@42563
|
20 |
val name_of_task: task -> string
|
wenzelm@42563
|
21 |
val pri_of_task: task -> int
|
wenzelm@42563
|
22 |
val str_of_task: task -> string
|
wenzelm@42563
|
23 |
val timing_of_task: task -> Time.time * Time.time * string list
|
wenzelm@28165
|
24 |
type queue
|
wenzelm@28165
|
25 |
val empty: queue
|
wenzelm@34277
|
26 |
val all_passive: queue -> bool
|
wenzelm@34277
|
27 |
val status: queue -> {ready: int, pending: int, running: int, passive: int}
|
wenzelm@34280
|
28 |
val cancel: queue -> group -> bool
|
wenzelm@34280
|
29 |
val cancel_all: queue -> group list
|
wenzelm@42561
|
30 |
val finish: task -> queue -> bool * queue
|
wenzelm@38122
|
31 |
val enqueue_passive: group -> (unit -> bool) -> queue -> task * queue
|
wenzelm@42544
|
32 |
val enqueue: string -> group -> task list -> int -> (bool -> bool) ->
|
wenzelm@42544
|
33 |
queue -> (task * bool) * queue
|
wenzelm@29369
|
34 |
val extend: task -> (bool -> bool) -> queue -> queue option
|
wenzelm@39520
|
35 |
val dequeue_passive: Thread.thread -> task -> queue -> bool * queue
|
wenzelm@42563
|
36 |
val dequeue: Thread.thread -> queue -> (task * (bool -> bool) list) option * queue
|
wenzelm@42561
|
37 |
type deps
|
wenzelm@42561
|
38 |
val init_deps: task list -> deps
|
wenzelm@42561
|
39 |
val finished_deps: deps -> bool
|
wenzelm@42561
|
40 |
val dequeue_deps: Thread.thread -> deps -> queue ->
|
wenzelm@42563
|
41 |
(((task * (bool -> bool) list) option * deps) * queue)
|
wenzelm@42561
|
42 |
val running: task -> (unit -> 'a) -> 'a
|
wenzelm@42561
|
43 |
val joining: task -> (unit -> 'a) -> 'a
|
wenzelm@42561
|
44 |
val waiting: task -> deps -> (unit -> 'a) -> 'a
|
wenzelm@28165
|
45 |
end;
|
wenzelm@28165
|
46 |
|
wenzelm@35242
|
47 |
structure Task_Queue: TASK_QUEUE =
|
wenzelm@28165
|
48 |
struct
|
wenzelm@28165
|
49 |
|
wenzelm@40707
|
50 |
val new_id = Synchronized.counter ();
|
wenzelm@40707
|
51 |
|
wenzelm@40707
|
52 |
|
wenzelm@42563
|
53 |
(** nested groups of tasks **)
|
wenzelm@42563
|
54 |
|
wenzelm@42563
|
55 |
(* groups *)
|
wenzelm@42563
|
56 |
|
wenzelm@42563
|
57 |
abstype group = Group of
|
wenzelm@42563
|
58 |
{parent: group option,
|
wenzelm@42563
|
59 |
id: int,
|
wenzelm@42563
|
60 |
status: exn list Synchronized.var}
|
wenzelm@42563
|
61 |
with
|
wenzelm@42563
|
62 |
|
wenzelm@42563
|
63 |
fun make_group (parent, id, status) = Group {parent = parent, id = id, status = status};
|
wenzelm@42563
|
64 |
|
wenzelm@42563
|
65 |
fun new_group parent = make_group (parent, new_id (), Synchronized.var "group" []);
|
wenzelm@42563
|
66 |
|
wenzelm@42563
|
67 |
fun group_id (Group {id, ...}) = id;
|
wenzelm@42563
|
68 |
fun eq_group (group1, group2) = group_id group1 = group_id group2;
|
wenzelm@42563
|
69 |
|
wenzelm@42563
|
70 |
fun group_ancestry (Group {parent, id, ...}) =
|
wenzelm@42563
|
71 |
id :: (case parent of NONE => [] | SOME group => group_ancestry group);
|
wenzelm@42563
|
72 |
|
wenzelm@42563
|
73 |
|
wenzelm@42563
|
74 |
(* group status *)
|
wenzelm@42563
|
75 |
|
wenzelm@42563
|
76 |
fun cancel_group (Group {status, ...}) exn =
|
wenzelm@42563
|
77 |
Synchronized.change status
|
wenzelm@42563
|
78 |
(fn exns =>
|
wenzelm@42563
|
79 |
if not (Exn.is_interrupt exn) orelse null exns then exn :: exns
|
wenzelm@42563
|
80 |
else exns);
|
wenzelm@42563
|
81 |
|
wenzelm@42563
|
82 |
fun is_canceled (Group {parent, status, ...}) =
|
wenzelm@42563
|
83 |
not (null (Synchronized.value status)) orelse
|
wenzelm@42563
|
84 |
(case parent of NONE => false | SOME group => is_canceled group);
|
wenzelm@42563
|
85 |
|
wenzelm@42563
|
86 |
fun group_status (Group {parent, status, ...}) =
|
wenzelm@42563
|
87 |
Synchronized.value status @
|
wenzelm@42563
|
88 |
(case parent of NONE => [] | SOME group => group_status group);
|
wenzelm@42563
|
89 |
|
wenzelm@42563
|
90 |
fun str_of_group group =
|
wenzelm@42563
|
91 |
(is_canceled group ? enclose "(" ")") (string_of_int (group_id group));
|
wenzelm@42563
|
92 |
|
wenzelm@42563
|
93 |
end;
|
wenzelm@42563
|
94 |
|
wenzelm@42541
|
95 |
|
wenzelm@42561
|
96 |
(* tasks *)
|
wenzelm@42561
|
97 |
|
wenzelm@42561
|
98 |
type timing = Time.time * Time.time * string list; (*run, wait, wait dependencies*)
|
wenzelm@42541
|
99 |
|
wenzelm@42541
|
100 |
fun new_timing () =
|
wenzelm@42560
|
101 |
Synchronized.var "timing" ((Time.zeroTime, Time.zeroTime, []): timing);
|
wenzelm@42541
|
102 |
|
wenzelm@42544
|
103 |
abstype task = Task of
|
wenzelm@42563
|
104 |
{group: group,
|
wenzelm@42563
|
105 |
name: string,
|
wenzelm@42544
|
106 |
id: int,
|
wenzelm@42544
|
107 |
pri: int option,
|
wenzelm@42544
|
108 |
timing: timing Synchronized.var}
|
wenzelm@35242
|
109 |
with
|
wenzelm@35242
|
110 |
|
wenzelm@42563
|
111 |
fun dummy_task () =
|
wenzelm@42563
|
112 |
Task {group = new_group NONE, name = "", id = 0, pri = NONE, timing = new_timing ()};
|
wenzelm@29003
|
113 |
|
wenzelm@42563
|
114 |
fun new_task group name pri =
|
wenzelm@42563
|
115 |
Task {group = group, name = name, id = new_id (), pri = pri, timing = new_timing ()};
|
wenzelm@42563
|
116 |
|
wenzelm@42563
|
117 |
fun group_of_task (Task {group, ...}) = group;
|
wenzelm@42561
|
118 |
fun name_of_task (Task {name, ...}) = name;
|
wenzelm@42544
|
119 |
fun pri_of_task (Task {pri, ...}) = the_default 0 pri;
|
wenzelm@42544
|
120 |
fun str_of_task (Task {name, id, ...}) =
|
wenzelm@42544
|
121 |
if name = "" then string_of_int id else string_of_int id ^ " (" ^ name ^ ")";
|
wenzelm@28165
|
122 |
|
wenzelm@42544
|
123 |
fun timing_of_task (Task {timing, ...}) = Synchronized.value timing;
|
wenzelm@42559
|
124 |
|
wenzelm@42561
|
125 |
fun update_timing update (Task {timing, ...}) e =
|
wenzelm@42561
|
126 |
let
|
wenzelm@42561
|
127 |
val start = Time.now ();
|
wenzelm@42561
|
128 |
val result = Exn.capture e ();
|
wenzelm@42561
|
129 |
val t = Time.- (Time.now (), start);
|
wenzelm@42561
|
130 |
val _ = Synchronized.change timing (update t);
|
wenzelm@42561
|
131 |
in Exn.release result end;
|
wenzelm@42541
|
132 |
|
wenzelm@42544
|
133 |
fun task_ord (Task {id = id1, pri = pri1, ...}, Task {id = id2, pri = pri2, ...}) =
|
wenzelm@42544
|
134 |
prod_ord (rev_order o option_ord int_ord) int_ord ((pri1, id1), (pri2, id2));
|
wenzelm@42541
|
135 |
|
wenzelm@35242
|
136 |
val eq_task = is_equal o task_ord;
|
wenzelm@35242
|
137 |
|
wenzelm@35242
|
138 |
end;
|
wenzelm@35242
|
139 |
|
wenzelm@31972
|
140 |
structure Task_Graph = Graph(type key = task val ord = task_ord);
|
wenzelm@29122
|
141 |
|
wenzelm@29122
|
142 |
|
wenzelm@28165
|
143 |
|
wenzelm@42561
|
144 |
(** queue of jobs and groups **)
|
wenzelm@42561
|
145 |
|
wenzelm@28176
|
146 |
(* jobs *)
|
wenzelm@28165
|
147 |
|
wenzelm@28165
|
148 |
datatype job =
|
wenzelm@29369
|
149 |
Job of (bool -> bool) list |
|
wenzelm@34277
|
150 |
Running of Thread.thread |
|
wenzelm@38122
|
151 |
Passive of unit -> bool;
|
wenzelm@28165
|
152 |
|
wenzelm@42563
|
153 |
type jobs = job Task_Graph.T;
|
wenzelm@28176
|
154 |
|
wenzelm@42563
|
155 |
fun get_job (jobs: jobs) task = Task_Graph.get_node jobs task;
|
wenzelm@42563
|
156 |
fun set_job task job (jobs: jobs) = Task_Graph.map_node task (K job) jobs;
|
wenzelm@28202
|
157 |
|
wenzelm@32254
|
158 |
fun add_job task dep (jobs: jobs) =
|
wenzelm@32254
|
159 |
Task_Graph.add_edge (dep, task) jobs handle Task_Graph.UNDEF _ => jobs;
|
wenzelm@32254
|
160 |
|
wenzelm@32254
|
161 |
fun get_deps (jobs: jobs) task =
|
wenzelm@32254
|
162 |
Task_Graph.imm_preds jobs task handle Task_Graph.UNDEF _ => [];
|
wenzelm@32254
|
163 |
|
wenzelm@28176
|
164 |
|
wenzelm@42561
|
165 |
(* queue *)
|
wenzelm@28176
|
166 |
|
wenzelm@28165
|
167 |
datatype queue = Queue of
|
wenzelm@42562
|
168 |
{groups: task list Inttab.table, (*groups with presently known members*)
|
wenzelm@34280
|
169 |
jobs: jobs}; (*job dependency graph*)
|
wenzelm@28165
|
170 |
|
wenzelm@34280
|
171 |
fun make_queue groups jobs = Queue {groups = groups, jobs = jobs};
|
wenzelm@28204
|
172 |
|
wenzelm@34280
|
173 |
val empty = make_queue Inttab.empty Task_Graph.empty;
|
wenzelm@34277
|
174 |
|
wenzelm@38122
|
175 |
|
wenzelm@38122
|
176 |
(* job status *)
|
wenzelm@38122
|
177 |
|
wenzelm@42563
|
178 |
fun ready_job task (Job list, ([], _)) = SOME (task, rev list)
|
wenzelm@42563
|
179 |
| ready_job task (Passive abort, ([], _)) =
|
wenzelm@42563
|
180 |
if is_canceled (group_of_task task) then SOME (task, [fn _ => abort ()])
|
wenzelm@38122
|
181 |
else NONE
|
wenzelm@38122
|
182 |
| ready_job _ _ = NONE;
|
wenzelm@38122
|
183 |
|
wenzelm@42563
|
184 |
fun active_job (_, (Job _, _)) = SOME ()
|
wenzelm@42563
|
185 |
| active_job (_, (Running _, _)) = SOME ()
|
wenzelm@42563
|
186 |
| active_job (task, (Passive _, _)) =
|
wenzelm@42563
|
187 |
if is_canceled (group_of_task task) then SOME () else NONE;
|
wenzelm@38122
|
188 |
|
wenzelm@42563
|
189 |
fun all_passive (Queue {jobs, ...}) = is_none (Task_Graph.get_first active_job jobs);
|
wenzelm@28165
|
190 |
|
wenzelm@28165
|
191 |
|
wenzelm@32121
|
192 |
(* queue status *)
|
wenzelm@32052
|
193 |
|
wenzelm@32052
|
194 |
fun status (Queue {jobs, ...}) =
|
wenzelm@32052
|
195 |
let
|
wenzelm@34277
|
196 |
val (x, y, z, w) =
|
wenzelm@42563
|
197 |
Task_Graph.fold (fn (_, (job, (deps, _))) => fn (x, y, z, w) =>
|
wenzelm@32052
|
198 |
(case job of
|
wenzelm@38122
|
199 |
Job _ => if null deps then (x + 1, y, z, w) else (x, y + 1, z, w)
|
wenzelm@34277
|
200 |
| Running _ => (x, y, z + 1, w)
|
wenzelm@38122
|
201 |
| Passive _ => (x, y, z, w + 1)))
|
wenzelm@34277
|
202 |
jobs (0, 0, 0, 0);
|
wenzelm@34277
|
203 |
in {ready = x, pending = y, running = z, passive = w} end;
|
wenzelm@32052
|
204 |
|
wenzelm@32052
|
205 |
|
wenzelm@42561
|
206 |
|
wenzelm@42561
|
207 |
(** task queue operations **)
|
wenzelm@42561
|
208 |
|
wenzelm@32121
|
209 |
(* cancel -- peers and sub-groups *)
|
wenzelm@32121
|
210 |
|
wenzelm@34280
|
211 |
fun cancel (Queue {groups, jobs}) group =
|
wenzelm@32121
|
212 |
let
|
wenzelm@32121
|
213 |
val _ = cancel_group group Exn.Interrupt;
|
wenzelm@32121
|
214 |
val tasks = Inttab.lookup_list groups (group_id group);
|
wenzelm@32121
|
215 |
val running =
|
wenzelm@32121
|
216 |
fold (get_job jobs #> (fn Running t => insert Thread.equal t | _ => I)) tasks [];
|
wenzelm@37216
|
217 |
val _ = List.app Simple_Thread.interrupt running;
|
wenzelm@34280
|
218 |
in null running end;
|
wenzelm@32121
|
219 |
|
wenzelm@38122
|
220 |
fun cancel_all (Queue {jobs, ...}) =
|
wenzelm@32121
|
221 |
let
|
wenzelm@42563
|
222 |
fun cancel_job (task, (job, _)) (groups, running) =
|
wenzelm@42563
|
223 |
let
|
wenzelm@42563
|
224 |
val group = group_of_task task;
|
wenzelm@42563
|
225 |
val _ = cancel_group group Exn.Interrupt;
|
wenzelm@42563
|
226 |
in
|
wenzelm@34277
|
227 |
(case job of
|
wenzelm@34277
|
228 |
Running t => (insert eq_group group groups, insert Thread.equal t running)
|
wenzelm@42563
|
229 |
| _ => (groups, running))
|
wenzelm@42563
|
230 |
end;
|
wenzelm@42563
|
231 |
val (running_groups, running) = Task_Graph.fold cancel_job jobs ([], []);
|
wenzelm@37216
|
232 |
val _ = List.app Simple_Thread.interrupt running;
|
wenzelm@34280
|
233 |
in running_groups end;
|
wenzelm@32121
|
234 |
|
wenzelm@32121
|
235 |
|
wenzelm@42561
|
236 |
(* finish *)
|
wenzelm@42561
|
237 |
|
wenzelm@42561
|
238 |
fun finish task (Queue {groups, jobs}) =
|
wenzelm@42561
|
239 |
let
|
wenzelm@42563
|
240 |
val group = group_of_task task;
|
wenzelm@42561
|
241 |
val groups' = groups
|
wenzelm@42561
|
242 |
|> fold (fn gid => Inttab.remove_list eq_task (gid, task)) (group_ancestry group);
|
wenzelm@42561
|
243 |
val jobs' = Task_Graph.del_node task jobs;
|
wenzelm@42561
|
244 |
val maximal = null (Task_Graph.imm_succs jobs task);
|
wenzelm@42561
|
245 |
in (maximal, make_queue groups' jobs') end;
|
wenzelm@42561
|
246 |
|
wenzelm@42561
|
247 |
|
wenzelm@28185
|
248 |
(* enqueue *)
|
wenzelm@28165
|
249 |
|
wenzelm@38122
|
250 |
fun enqueue_passive group abort (Queue {groups, jobs}) =
|
wenzelm@34277
|
251 |
let
|
wenzelm@42563
|
252 |
val task = new_task group "passive" NONE;
|
wenzelm@34277
|
253 |
val groups' = groups
|
wenzelm@34277
|
254 |
|> fold (fn gid => Inttab.cons_list (gid, task)) (group_ancestry group);
|
wenzelm@42563
|
255 |
val jobs' = jobs |> Task_Graph.new_node (task, Passive abort);
|
wenzelm@34280
|
256 |
in (task, make_queue groups' jobs') end;
|
wenzelm@34277
|
257 |
|
wenzelm@42544
|
258 |
fun enqueue name group deps pri job (Queue {groups, jobs}) =
|
wenzelm@28165
|
259 |
let
|
wenzelm@42563
|
260 |
val task = new_task group name (SOME pri);
|
wenzelm@32121
|
261 |
val groups' = groups
|
wenzelm@32121
|
262 |
|> fold (fn gid => Inttab.cons_list (gid, task)) (group_ancestry group);
|
wenzelm@28185
|
263 |
val jobs' = jobs
|
wenzelm@42563
|
264 |
|> Task_Graph.new_node (task, Job [job])
|
wenzelm@42564
|
265 |
|> fold (add_job task) deps;
|
wenzelm@32218
|
266 |
val minimal = null (get_deps jobs' task);
|
wenzelm@34280
|
267 |
in ((task, minimal), make_queue groups' jobs') end;
|
wenzelm@28165
|
268 |
|
wenzelm@34280
|
269 |
fun extend task job (Queue {groups, jobs}) =
|
wenzelm@29369
|
270 |
(case try (get_job jobs) task of
|
wenzelm@34280
|
271 |
SOME (Job list) => SOME (make_queue groups (set_job task (Job (job :: list)) jobs))
|
wenzelm@29369
|
272 |
| _ => NONE);
|
wenzelm@29369
|
273 |
|
wenzelm@28185
|
274 |
|
wenzelm@28185
|
275 |
(* dequeue *)
|
wenzelm@28185
|
276 |
|
wenzelm@39520
|
277 |
fun dequeue_passive thread task (queue as Queue {groups, jobs}) =
|
wenzelm@39520
|
278 |
(case try (get_job jobs) task of
|
wenzelm@39520
|
279 |
SOME (Passive _) =>
|
wenzelm@39520
|
280 |
let val jobs' = set_job task (Running thread) jobs
|
wenzelm@39520
|
281 |
in (true, make_queue groups jobs') end
|
wenzelm@39520
|
282 |
| _ => (false, queue));
|
wenzelm@39520
|
283 |
|
wenzelm@34280
|
284 |
fun dequeue thread (queue as Queue {groups, jobs}) =
|
wenzelm@38122
|
285 |
(case Task_Graph.get_first (uncurry ready_job) jobs of
|
wenzelm@42563
|
286 |
SOME (result as (task, _)) =>
|
wenzelm@38122
|
287 |
let val jobs' = set_job task (Running thread) jobs
|
wenzelm@39520
|
288 |
in (SOME result, make_queue groups jobs') end
|
wenzelm@39520
|
289 |
| NONE => (NONE, queue));
|
wenzelm@28202
|
290 |
|
wenzelm@28176
|
291 |
|
wenzelm@42561
|
292 |
(* dequeue wrt. dynamic dependencies *)
|
wenzelm@32071
|
293 |
|
wenzelm@42561
|
294 |
abstype deps = Deps of task list
|
wenzelm@42561
|
295 |
with
|
wenzelm@32823
|
296 |
|
wenzelm@42561
|
297 |
fun init_deps tasks = Deps tasks;
|
wenzelm@42561
|
298 |
fun finished_deps (Deps tasks) = null tasks;
|
wenzelm@42561
|
299 |
|
wenzelm@42561
|
300 |
fun insert_deps (Deps tasks) = fold (insert (op =) o name_of_task) tasks;
|
wenzelm@42561
|
301 |
|
wenzelm@42561
|
302 |
fun dequeue_deps thread (Deps deps) (queue as Queue {groups, jobs}) =
|
wenzelm@32071
|
303 |
let
|
wenzelm@42564
|
304 |
fun ready [] rest = (NONE, rev rest)
|
wenzelm@42564
|
305 |
| ready (task :: tasks) rest =
|
wenzelm@42564
|
306 |
(case try (Task_Graph.get_entry jobs) task of
|
wenzelm@42564
|
307 |
NONE => ready tasks rest
|
wenzelm@42564
|
308 |
| SOME entry =>
|
wenzelm@42564
|
309 |
(case ready_job task entry of
|
wenzelm@42564
|
310 |
NONE => ready tasks (task :: rest)
|
wenzelm@42564
|
311 |
| some => (some, List.revAppend (rest, tasks))));
|
wenzelm@42564
|
312 |
|
wenzelm@42564
|
313 |
fun ready_dep _ [] = NONE
|
wenzelm@42564
|
314 |
| ready_dep seen (task :: tasks) =
|
wenzelm@42564
|
315 |
if member eq_task seen task then ready_dep seen tasks
|
wenzelm@42564
|
316 |
else
|
wenzelm@42564
|
317 |
let val entry as (_, (ds, _)) = Task_Graph.get_entry jobs task in
|
wenzelm@42564
|
318 |
(case ready_job task entry of
|
wenzelm@42564
|
319 |
NONE => ready_dep (task :: seen) (ds @ tasks)
|
wenzelm@42564
|
320 |
| some => some)
|
wenzelm@42564
|
321 |
end;
|
wenzelm@42564
|
322 |
|
wenzelm@42564
|
323 |
fun result (res as (task, _)) deps' =
|
wenzelm@34280
|
324 |
let val jobs' = set_job task (Running thread) jobs
|
wenzelm@42564
|
325 |
in ((SOME res, Deps deps'), make_queue groups jobs') end;
|
wenzelm@32071
|
326 |
in
|
wenzelm@42564
|
327 |
(case ready deps [] of
|
wenzelm@42564
|
328 |
(SOME res, deps') => result res deps'
|
wenzelm@42564
|
329 |
| (NONE, deps') =>
|
wenzelm@42564
|
330 |
(case ready_dep [] deps' of
|
wenzelm@42564
|
331 |
SOME res => result res deps'
|
wenzelm@42564
|
332 |
| NONE => ((NONE, Deps deps'), queue)))
|
wenzelm@32071
|
333 |
end;
|
wenzelm@32071
|
334 |
|
wenzelm@42561
|
335 |
end;
|
wenzelm@32071
|
336 |
|
wenzelm@32221
|
337 |
|
wenzelm@42561
|
338 |
(* timing *)
|
wenzelm@42561
|
339 |
|
wenzelm@42561
|
340 |
fun running task =
|
wenzelm@42561
|
341 |
update_timing (fn t => fn (a, b, ds) => (Time.+ (a, t), b, ds)) task;
|
wenzelm@42561
|
342 |
|
wenzelm@42561
|
343 |
fun joining task =
|
wenzelm@42561
|
344 |
update_timing (fn t => fn (a, b, ds) => (Time.- (a, t), b, ds)) task;
|
wenzelm@42561
|
345 |
|
wenzelm@42561
|
346 |
fun waiting task deps =
|
wenzelm@42561
|
347 |
update_timing (fn t => fn (a, b, ds) => (Time.- (a, t), Time.+ (b, t), insert_deps deps ds)) task;
|
wenzelm@32221
|
348 |
|
wenzelm@28165
|
349 |
end;
|