| author | wenzelm | 
| Sun, 26 Feb 2012 18:25:28 +0100 | |
| changeset 46684 | 7f741b2c82a3 | 
| parent 45642 | 65e4eeea09cd | 
| child 47404 | e6e5750f1311 | 
| 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: 
41682diff
changeset | 18 | type task | 
| 45136 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 19 | val dummy_task: task | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 20 | val group_of_task: task -> group | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 21 | val name_of_task: task -> string | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 22 | val pri_of_task: task -> int | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
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: 
41682diff
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: 
41684diff
changeset | 26 | val running: task -> (unit -> 'a) -> 'a | 
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 27 | val joining: task -> (unit -> 'a) -> 'a | 
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
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: 
32814diff
changeset | 32 | val all_passive: queue -> bool | 
| 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 33 |   val status: queue -> {ready: int, pending: int, running: int, passive: int}
 | 
| 44341 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 wenzelm parents: 
44340diff
changeset | 34 | val cancel: queue -> group -> task list * Thread.thread list | 
| 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 wenzelm parents: 
44340diff
changeset | 35 | val cancel_all: queue -> group list * Thread.thread list | 
| 41681 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
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: 
37216diff
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: 
39232diff
changeset | 40 | val dequeue_passive: Thread.thread -> task -> queue -> bool * queue | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
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: 
41684diff
changeset | 42 | val dequeue_deps: Thread.thread -> task list -> queue -> | 
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
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: 
35012diff
changeset | 46 | structure Task_Queue: TASK_QUEUE = | 
| 28165 | 47 | struct | 
| 48 | ||
| 40450 
8eab60e1baeb
private counter, to keep externalized ids a bit smaller;
 wenzelm parents: 
39243diff
changeset | 49 | val new_id = Synchronized.counter (); | 
| 
8eab60e1baeb
private counter, to keep externalized ids a bit smaller;
 wenzelm parents: 
39243diff
changeset | 50 | |
| 
8eab60e1baeb
private counter, to keep externalized ids a bit smaller;
 wenzelm parents: 
39243diff
changeset | 51 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 52 | (** nested groups of tasks **) | 
| 41670 | 53 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 54 | (* groups *) | 
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 55 | |
| 35242 
1c80c29086d7
eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
 wenzelm parents: 
35012diff
changeset | 56 | abstype group = Group of | 
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 57 |  {parent: group option,
 | 
| 40450 
8eab60e1baeb
private counter, to keep externalized ids a bit smaller;
 wenzelm parents: 
39243diff
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: 
35012diff
changeset | 60 | with | 
| 29121 | 61 | |
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
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: 
32099diff
changeset | 65 | |
| 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 66 | fun group_id (Group {id, ...}) = id;
 | 
| 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
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: 
32099diff
changeset | 71 | |
| 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
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: 
32099diff
changeset | 92 | fun str_of_group group = | 
| 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
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: 
35012diff
changeset | 98 | end; | 
| 
1c80c29086d7
eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
 wenzelm parents: 
35012diff
changeset | 99 | |
| 28165 | 100 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 101 | (* tasks *) | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 102 | |
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
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: 
41682diff
changeset | 104 | |
| 45136 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 105 | val timing_start = (Time.zeroTime, Time.zeroTime, []): timing; | 
| 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 106 | |
| 45354 
a2157057024c
optional timing, to avoid redundant allocation of mutable cells;
 wenzelm parents: 
45136diff
changeset | 107 | fun new_timing () = | 
| 
a2157057024c
optional timing, to avoid redundant allocation of mutable cells;
 wenzelm parents: 
45136diff
changeset | 108 | if ! Multithreading.trace < 2 then NONE | 
| 
a2157057024c
optional timing, to avoid redundant allocation of mutable cells;
 wenzelm parents: 
45136diff
changeset | 109 | else SOME (Synchronized.var "timing" timing_start); | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 110 | |
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 111 | abstype task = Task of | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 112 |  {group: group,
 | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 113 | name: string, | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 114 | id: int, | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 115 | pri: int option, | 
| 45136 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 116 | timing: timing Synchronized.var option} | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 117 | with | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 118 | |
| 45136 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 119 | val dummy_task = | 
| 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 120 |   Task {group = new_group NONE, name = "", id = 0, pri = NONE, timing = NONE};
 | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 121 | |
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 122 | fun new_task group name pri = | 
| 45354 
a2157057024c
optional timing, to avoid redundant allocation of mutable cells;
 wenzelm parents: 
45136diff
changeset | 123 |   Task {group = group, name = name, id = new_id (), pri = pri, timing = new_timing ()};
 | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 124 | |
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 125 | fun group_of_task (Task {group, ...}) = group;
 | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 126 | fun name_of_task (Task {name, ...}) = name;
 | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 127 | fun pri_of_task (Task {pri, ...}) = the_default 0 pri;
 | 
| 43951 | 128 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 129 | fun str_of_task (Task {name, id, ...}) =
 | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 130 |   if name = "" then string_of_int id else string_of_int id ^ " (" ^ name ^ ")";
 | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 131 | |
| 43951 | 132 | fun str_of_task_groups task = str_of_task task ^ " in " ^ str_of_groups (group_of_task task); | 
| 133 | ||
| 45136 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 134 | fun timing_of_task (Task {timing, ...}) =
 | 
| 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 135 | (case timing of NONE => timing_start | SOME var => Synchronized.value var); | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 136 | |
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 137 | fun update_timing update (Task {timing, ...}) e =
 | 
| 41702 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 138 | uninterruptible (fn restore_attributes => fn () => | 
| 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 139 | let | 
| 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 140 | val start = Time.now (); | 
| 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 141 | val result = Exn.capture (restore_attributes e) (); | 
| 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 142 | val t = Time.- (Time.now (), start); | 
| 45136 
2afb928c71ca
static dummy_task (again) to avoid a few extra allocations;
 wenzelm parents: 
44341diff
changeset | 143 | val _ = (case timing of NONE => () | SOME var => Synchronized.change var (update t)); | 
| 41702 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 144 | in Exn.release result end) (); | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 145 | |
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 146 | fun task_ord (Task {id = id1, pri = pri1, ...}, Task {id = id2, pri = pri2, ...}) =
 | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 147 | 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: 
41682diff
changeset | 148 | |
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 149 | end; | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 150 | |
| 41709 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 151 | structure Tasks = Table(type key = task val ord = task_ord); | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 152 | structure Task_Graph = Graph(type key = task val ord = task_ord); | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 153 | |
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 154 | |
| 41695 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 155 | (* timing *) | 
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 156 | |
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 157 | fun running task = | 
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 158 | 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: 
41684diff
changeset | 159 | |
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 160 | fun joining task = | 
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 161 | 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: 
41684diff
changeset | 162 | |
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 163 | fun waiting task deps = | 
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 164 | update_timing (fn t => fn (a, b, ds) => | 
| 41702 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 165 | (Time.- (a, t), Time.+ (b, t), | 
| 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 166 | if ! Multithreading.trace > 0 | 
| 
dca4c58c5d57
Task_Queue.update_timing: more precise treatment of interruptibility;
 wenzelm parents: 
41695diff
changeset | 167 | 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: 
41684diff
changeset | 168 | |
| 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 169 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 170 | |
| 41681 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 171 | (** queue of jobs and groups **) | 
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 172 | |
| 41709 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 173 | (* known group members *) | 
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 174 | |
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 175 | type groups = unit Tasks.table Inttab.table; | 
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 176 | |
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 177 | fun get_tasks (groups: groups) gid = | 
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 178 | the_default Tasks.empty (Inttab.lookup groups gid); | 
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 179 | |
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 180 | fun add_task (gid, task) groups = | 
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 181 | 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: 
41708diff
changeset | 182 | |
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 183 | fun del_task (gid, task) groups = | 
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 184 | 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: 
41708diff
changeset | 185 | 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: 
41708diff
changeset | 186 | else Inttab.update (gid, tasks) groups | 
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 187 | end; | 
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 188 | |
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 189 | |
| 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 190 | (* job dependency graph *) | 
| 28165 | 191 | |
| 192 | datatype job = | |
| 29365 | 193 | Job of (bool -> bool) list | | 
| 34277 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 194 | Running of Thread.thread | | 
| 37854 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 195 | Passive of unit -> bool; | 
| 28165 | 196 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 197 | type jobs = job Task_Graph.T; | 
| 28176 
01b21886e7f0
job: explicit 'ok' status -- false for canceled jobs;
 wenzelm parents: 
28171diff
changeset | 198 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 199 | fun get_job (jobs: jobs) task = Task_Graph.get_node jobs task; | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 200 | 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: 
28196diff
changeset | 201 | |
| 32250 | 202 | fun add_job task dep (jobs: jobs) = | 
| 203 | Task_Graph.add_edge (dep, task) jobs handle Task_Graph.UNDEF _ => jobs; | |
| 204 | ||
| 28176 
01b21886e7f0
job: explicit 'ok' status -- false for canceled jobs;
 wenzelm parents: 
28171diff
changeset | 205 | |
| 41681 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 206 | (* queue *) | 
| 28176 
01b21886e7f0
job: explicit 'ok' status -- false for canceled jobs;
 wenzelm parents: 
28171diff
changeset | 207 | |
| 41709 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 208 | datatype queue = Queue of {groups: groups, jobs: jobs};
 | 
| 28165 | 209 | |
| 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: 
34279diff
changeset | 210 | 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: 
34279diff
changeset | 211 | 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: 
32814diff
changeset | 212 | |
| 41708 | 213 | fun known_task (Queue {jobs, ...}) task = can (Task_Graph.get_entry jobs) task;
 | 
| 214 | ||
| 37854 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 215 | |
| 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 216 | (* job status *) | 
| 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 217 | |
| 44338 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
44299diff
changeset | 218 | fun ready_job task (Job list, (deps, _)) = | 
| 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
44299diff
changeset | 219 | if Task_Graph.Keys.is_empty deps then SOME (task, rev list) else NONE | 
| 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
44299diff
changeset | 220 | | ready_job task (Passive abort, (deps, _)) = | 
| 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
44299diff
changeset | 221 | if Task_Graph.Keys.is_empty deps andalso is_canceled (group_of_task task) | 
| 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
44299diff
changeset | 222 | then SOME (task, [fn _ => abort ()]) | 
| 37854 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 223 | else NONE | 
| 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 224 | | ready_job _ _ = NONE; | 
| 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 225 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 226 | fun active_job (_, (Job _, _)) = SOME () | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 227 | | active_job (_, (Running _, _)) = SOME () | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 228 | | active_job (task, (Passive _, _)) = | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 229 | 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: 
37216diff
changeset | 230 | |
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 231 | fun all_passive (Queue {jobs, ...}) = is_none (Task_Graph.get_first active_job jobs);
 | 
| 28165 | 232 | |
| 233 | ||
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 234 | (* queue status *) | 
| 32052 | 235 | |
| 236 | fun status (Queue {jobs, ...}) =
 | |
| 237 | let | |
| 34277 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 238 | val (x, y, z, w) = | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 239 | Task_Graph.fold (fn (_, (job, (deps, _))) => fn (x, y, z, w) => | 
| 32052 | 240 | (case job of | 
| 44338 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
44299diff
changeset | 241 | Job _ => if Task_Graph.Keys.is_empty 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: 
32814diff
changeset | 242 | | Running _ => (x, y, z + 1, w) | 
| 37854 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 243 | | Passive _ => (x, y, z, w + 1))) | 
| 34277 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 244 | jobs (0, 0, 0, 0); | 
| 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 245 |   in {ready = x, pending = y, running = z, passive = w} end;
 | 
| 32052 | 246 | |
| 247 | ||
| 41681 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 248 | |
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 249 | (** task queue operations **) | 
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 250 | |
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 251 | (* cancel -- peers and sub-groups *) | 
| 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 252 | |
| 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: 
34279diff
changeset | 253 | fun cancel (Queue {groups, jobs}) group =
 | 
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 254 | let | 
| 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 255 | val _ = cancel_group group Exn.Interrupt; | 
| 44341 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 wenzelm parents: 
44340diff
changeset | 256 | val running = | 
| 44340 
3b859b573f1a
refined Task_Queue.cancel: passive tasks are considered running due to pending abort operation;
 wenzelm parents: 
44338diff
changeset | 257 | Tasks.fold (fn (task, _) => fn (tasks, threads) => | 
| 
3b859b573f1a
refined Task_Queue.cancel: passive tasks are considered running due to pending abort operation;
 wenzelm parents: 
44338diff
changeset | 258 | (case get_job jobs task of | 
| 
3b859b573f1a
refined Task_Queue.cancel: passive tasks are considered running due to pending abort operation;
 wenzelm parents: 
44338diff
changeset | 259 | Running thread => (task :: tasks, insert Thread.equal thread threads) | 
| 
3b859b573f1a
refined Task_Queue.cancel: passive tasks are considered running due to pending abort operation;
 wenzelm parents: 
44338diff
changeset | 260 | | Passive _ => (task :: tasks, threads) | 
| 
3b859b573f1a
refined Task_Queue.cancel: passive tasks are considered running due to pending abort operation;
 wenzelm parents: 
44338diff
changeset | 261 | | _ => (tasks, threads))) | 
| 
3b859b573f1a
refined Task_Queue.cancel: passive tasks are considered running due to pending abort operation;
 wenzelm parents: 
44338diff
changeset | 262 | (get_tasks groups (group_id group)) ([], []); | 
| 44341 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 wenzelm parents: 
44340diff
changeset | 263 | in running end; | 
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 264 | |
| 37854 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 265 | fun cancel_all (Queue {jobs, ...}) =
 | 
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 266 | let | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 267 | fun cancel_job (task, (job, _)) (groups, running) = | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 268 | let | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 269 | val group = group_of_task task; | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 270 | val _ = cancel_group group Exn.Interrupt; | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 271 | in | 
| 34277 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 272 | (case job of | 
| 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 273 | Running t => (insert eq_group group groups, insert Thread.equal t running) | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 274 | | _ => (groups, running)) | 
| 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 275 | end; | 
| 44341 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 wenzelm parents: 
44340diff
changeset | 276 | val running = Task_Graph.fold cancel_job jobs ([], []); | 
| 
a93d25fb14fc
purely functional task_queue.ML -- moved actual interrupt_unsynchronized to future.ML;
 wenzelm parents: 
44340diff
changeset | 277 | in running end; | 
| 32101 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 278 | |
| 
e25107ff4f56
support for nested groups -- cancellation is propagated to peers and subgroups;
 wenzelm parents: 
32099diff
changeset | 279 | |
| 41681 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 280 | (* finish *) | 
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 281 | |
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 282 | fun finish task (Queue {groups, jobs}) =
 | 
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 283 | let | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 284 | val group = group_of_task task; | 
| 43951 | 285 | 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: 
41680diff
changeset | 286 | val jobs' = Task_Graph.del_node task jobs; | 
| 44338 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
44299diff
changeset | 287 | val maximal = Task_Graph.is_maximal jobs task; | 
| 41681 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 288 | in (maximal, make_queue groups' jobs') end; | 
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 289 | |
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 290 | |
| 28185 
0f20cbce4935
simplified dequeue: provide Thread.self internally;
 wenzelm parents: 
28184diff
changeset | 291 | (* enqueue *) | 
| 28165 | 292 | |
| 37854 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 293 | fun enqueue_passive group abort (Queue {groups, jobs}) =
 | 
| 34277 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 294 | let | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 295 | val task = new_task group "passive" NONE; | 
| 43951 | 296 | 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: 
41682diff
changeset | 297 | 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: 
34279diff
changeset | 298 | in (task, make_queue groups' jobs') end; | 
| 34277 
7325a5e3587f
added Future.promise/fulfill -- promised futures that are fulfilled by external means;
 wenzelm parents: 
32814diff
changeset | 299 | |
| 41673 | 300 | fun enqueue name group deps pri job (Queue {groups, jobs}) =
 | 
| 28165 | 301 | let | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 302 | val task = new_task group name (SOME pri); | 
| 43951 | 303 | val groups' = fold_groups (fn g => add_task (group_id g, task)) group groups; | 
| 28185 
0f20cbce4935
simplified dequeue: provide Thread.self internally;
 wenzelm parents: 
28184diff
changeset | 304 | val jobs' = jobs | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 305 | |> Task_Graph.new_node (task, Job [job]) | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 306 | |> fold (add_job task) deps; | 
| 41708 | 307 | in (task, make_queue groups' jobs') end; | 
| 28165 | 308 | |
| 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: 
34279diff
changeset | 309 | fun extend task job (Queue {groups, jobs}) =
 | 
| 29365 | 310 | (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: 
34279diff
changeset | 311 | SOME (Job list) => SOME (make_queue groups (set_job task (Job (job :: list)) jobs)) | 
| 29365 | 312 | | _ => NONE); | 
| 313 | ||
| 28185 
0f20cbce4935
simplified dequeue: provide Thread.self internally;
 wenzelm parents: 
28184diff
changeset | 314 | |
| 
0f20cbce4935
simplified dequeue: provide Thread.self internally;
 wenzelm parents: 
28184diff
changeset | 315 | (* dequeue *) | 
| 
0f20cbce4935
simplified dequeue: provide Thread.self internally;
 wenzelm parents: 
28184diff
changeset | 316 | |
| 39243 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 wenzelm parents: 
39232diff
changeset | 317 | 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: 
39232diff
changeset | 318 | (case try (get_job jobs) task of | 
| 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 wenzelm parents: 
39232diff
changeset | 319 | SOME (Passive _) => | 
| 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 wenzelm parents: 
39232diff
changeset | 320 | let val jobs' = set_job task (Running thread) jobs | 
| 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 wenzelm parents: 
39232diff
changeset | 321 | in (true, make_queue groups jobs') end | 
| 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 wenzelm parents: 
39232diff
changeset | 322 | | _ => (false, queue)); | 
| 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 wenzelm parents: 
39232diff
changeset | 323 | |
| 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: 
34279diff
changeset | 324 | 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: 
37216diff
changeset | 325 | (case Task_Graph.get_first (uncurry ready_job) jobs of | 
| 41683 
73dde8006820
maintain Task_Queue.group within Task_Queue.task;
 wenzelm parents: 
41682diff
changeset | 326 | SOME (result as (task, _)) => | 
| 37854 
047c96f41455
back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
 wenzelm parents: 
37216diff
changeset | 327 | 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: 
39232diff
changeset | 328 | in (SOME result, make_queue groups jobs') end | 
| 
307e3d07d19f
Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
 wenzelm parents: 
39232diff
changeset | 329 | | NONE => (NONE, queue)); | 
| 28202 
23cb9a974630
added focus, which indicates a particular collection of high-priority tasks;
 wenzelm parents: 
28196diff
changeset | 330 | |
| 28165 | 331 | |
| 41681 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 332 | (* dequeue wrt. dynamic dependencies *) | 
| 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 333 | |
| 41695 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 334 | fun dequeue_deps thread deps (queue as Queue {groups, jobs}) =
 | 
| 32055 
6a46898aa805
recovered a version of dequeue_towards (cf. bb7b5a5942c7);
 wenzelm parents: 
32052diff
changeset | 335 | let | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 336 | fun ready [] rest = (NONE, rev rest) | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 337 | | ready (task :: tasks) rest = | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 338 | (case try (Task_Graph.get_entry jobs) task of | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 339 | 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: 
41709diff
changeset | 340 | | SOME (_, entry) => | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 341 | (case ready_job task entry of | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 342 | NONE => ready tasks (task :: rest) | 
| 45642 | 343 | | some => (some, fold cons rest tasks))); | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 344 | |
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 345 | fun ready_dep _ [] = NONE | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 346 | | ready_dep seen (task :: tasks) = | 
| 41709 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 347 | if Tasks.defined seen task then ready_dep seen tasks | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 348 | 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: 
41709diff
changeset | 349 | let val entry as (_, (ds, _)) = #2 (Task_Graph.get_entry jobs task) in | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 350 | (case ready_job task entry of | 
| 44338 
700008399ee5
refined Graph implementation: more abstract/scalable Graph.Keys instead of plain lists -- order of adjacency is now standardized wrt. Key.ord;
 wenzelm parents: 
44299diff
changeset | 351 | NONE => ready_dep (Tasks.update (task, ()) seen) (Task_Graph.Keys.dest ds @ tasks) | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 352 | | some => some) | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 353 | end; | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 354 | |
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 355 | 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: 
34279diff
changeset | 356 | let val jobs' = set_job task (Running thread) jobs | 
| 41695 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 357 | in ((SOME res, deps'), make_queue groups jobs') end; | 
| 32055 
6a46898aa805
recovered a version of dequeue_towards (cf. bb7b5a5942c7);
 wenzelm parents: 
32052diff
changeset | 358 | in | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 359 | (case ready deps [] of | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 360 | (SOME res, deps') => result res deps' | 
| 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 361 | | (NONE, deps') => | 
| 41709 
2e427f340ad1
more scalable collections of tasks, notably for totality of known group members;
 wenzelm parents: 
41708diff
changeset | 362 | (case ready_dep Tasks.empty deps' of | 
| 41684 
b828d4b53386
refined Task_Queue.dequeue_deps (more incremental);
 wenzelm parents: 
41683diff
changeset | 363 | SOME res => result res deps' | 
| 41695 
afdbec23b92b
eliminated slightly odd abstract type Task_Queue.deps;
 wenzelm parents: 
41684diff
changeset | 364 | | NONE => ((NONE, deps'), queue))) | 
| 32055 
6a46898aa805
recovered a version of dequeue_towards (cf. bb7b5a5942c7);
 wenzelm parents: 
32052diff
changeset | 365 | end; | 
| 
6a46898aa805
recovered a version of dequeue_towards (cf. bb7b5a5942c7);
 wenzelm parents: 
32052diff
changeset | 366 | |
| 41681 
b5d7b15166bf
Future.join_results: discontinued post-hoc recording of dynamic dependencies;
 wenzelm parents: 
41680diff
changeset | 367 | end; |