src/Pure/Concurrent/task_queue.ML
author wenzelm
Fri, 04 Feb 2011 16:33:12 +0100
changeset 41702 dca4c58c5d57
parent 41695 afdbec23b92b
child 41708 d2e6b1132df2
permissions -rw-r--r--
Task_Queue.update_timing: more precise treatment of interruptibility; Task_Queue.waiting: potentially expensive wait dependencies are subject to trace flag;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
     1
(*  Title:      Pure/Concurrent/task_queue.ML
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
     3
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
     4
Ordered queue of grouped tasks.
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
     5
*)
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
     6
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
     7
signature TASK_QUEUE =
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
     8
sig
29340
057a30ee8570 added eq_group;
wenzelm
parents: 29121
diff changeset
     9
  type group
32221
fcbd6c9ee9bb tuned signature;
wenzelm
parents: 32218
diff changeset
    10
  val new_group: group option -> group
32052
8c391a12df1d added group_id;
wenzelm
parents: 31971
diff changeset
    11
  val group_id: group -> int
29340
057a30ee8570 added eq_group;
wenzelm
parents: 29121
diff changeset
    12
  val eq_group: group * group -> bool
32221
fcbd6c9ee9bb tuned signature;
wenzelm
parents: 32218
diff changeset
    13
  val cancel_group: group -> exn -> unit
fcbd6c9ee9bb tuned signature;
wenzelm
parents: 32218
diff changeset
    14
  val is_canceled: group -> bool
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    15
  val group_status: group -> exn list
28179
8e8313aededc human-readable printing of TaskQueue.task/group;
wenzelm
parents: 28176
diff changeset
    16
  val str_of_group: group -> string
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    17
  type task
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    18
  val dummy_task: unit -> task
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    19
  val group_of_task: task -> group
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    20
  val name_of_task: task -> string
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    21
  val pri_of_task: task -> int
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    22
  val str_of_task: task -> string
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    23
  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
    24
  val running: task -> (unit -> 'a) -> 'a
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
    25
  val joining: task -> (unit -> 'a) -> 'a
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
    26
  val waiting: task -> task list -> (unit -> 'a) -> 'a
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
    27
  type queue
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
    28
  val empty: queue
34277
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
    29
  val all_passive: queue -> bool
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
    30
  val status: queue -> {ready: int, pending: int, running: int, passive: int}
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
    31
  val cancel: queue -> group -> bool
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
    32
  val cancel_all: queue -> group list
41681
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
    33
  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
    34
  val enqueue_passive: group -> (unit -> bool) -> queue -> task * queue
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41670
diff changeset
    35
  val enqueue: string -> group -> task list -> int -> (bool -> bool) ->
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41670
diff changeset
    36
    queue -> (task * bool) * queue
29365
5c5bc17d9135 added is_valid;
wenzelm
parents: 29342
diff changeset
    37
  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
    38
  val dequeue_passive: Thread.thread -> task -> queue -> bool * queue
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    39
  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
    40
  val dequeue_deps: Thread.thread -> task list -> queue ->
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
    41
    (((task * (bool -> bool) list) option * task list) * queue)
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
    42
end;
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
    43
35242
1c80c29086d7 eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents: 35012
diff changeset
    44
structure Task_Queue: TASK_QUEUE =
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
    45
struct
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
    46
40450
8eab60e1baeb private counter, to keep externalized ids a bit smaller;
wenzelm
parents: 39243
diff changeset
    47
val new_id = Synchronized.counter ();
8eab60e1baeb private counter, to keep externalized ids a bit smaller;
wenzelm
parents: 39243
diff changeset
    48
8eab60e1baeb private counter, to keep externalized ids a bit smaller;
wenzelm
parents: 39243
diff changeset
    49
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    50
(** nested groups of tasks **)
41670
74010c6af0a4 added basic task timing;
wenzelm
parents: 40450
diff changeset
    51
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    52
(* groups *)
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    53
35242
1c80c29086d7 eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents: 35012
diff changeset
    54
abstype group = Group of
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    55
 {parent: group option,
40450
8eab60e1baeb private counter, to keep externalized ids a bit smaller;
wenzelm
parents: 39243
diff changeset
    56
  id: int,
35242
1c80c29086d7 eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents: 35012
diff changeset
    57
  status: exn list Synchronized.var}
1c80c29086d7 eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents: 35012
diff changeset
    58
with
29121
ad73b63ae2c5 renamed structure TaskQueue to Task_Queue;
wenzelm
parents: 29117
diff changeset
    59
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    60
fun make_group (parent, id, status) = Group {parent = parent, id = id, status = status};
32052
8c391a12df1d added group_id;
wenzelm
parents: 31971
diff changeset
    61
40450
8eab60e1baeb private counter, to keep externalized ids a bit smaller;
wenzelm
parents: 39243
diff changeset
    62
fun new_group parent = make_group (parent, new_id (), Synchronized.var "group" []);
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    63
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    64
fun group_id (Group {id, ...}) = id;
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    65
fun eq_group (group1, group2) = group_id group1 = group_id group2;
28551
91eec4012bc5 added invalidate_group;
wenzelm
parents: 28384
diff changeset
    66
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    67
fun group_ancestry (Group {parent, id, ...}) =
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    68
  id :: (case parent of NONE => [] | SOME group => group_ancestry group);
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    69
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    70
32221
fcbd6c9ee9bb tuned signature;
wenzelm
parents: 32218
diff changeset
    71
(* group status *)
fcbd6c9ee9bb tuned signature;
wenzelm
parents: 32218
diff changeset
    72
32251
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    73
fun cancel_group (Group {status, ...}) exn =
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    74
  Synchronized.change status
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    75
    (fn exns =>
39232
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 37854
diff changeset
    76
      if not (Exn.is_interrupt exn) orelse null exns then exn :: exns
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 37854
diff changeset
    77
      else exns);
29121
ad73b63ae2c5 renamed structure TaskQueue to Task_Queue;
wenzelm
parents: 29117
diff changeset
    78
32251
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    79
fun is_canceled (Group {parent, status, ...}) =
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    80
  not (null (Synchronized.value status)) orelse
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    81
    (case parent of NONE => false | SOME group => is_canceled group);
32221
fcbd6c9ee9bb tuned signature;
wenzelm
parents: 32218
diff changeset
    82
32251
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    83
fun group_status (Group {parent, status, ...}) =
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    84
  Synchronized.value status @
e586c82fdf69 group status: Synchronized.var;
wenzelm
parents: 32250
diff changeset
    85
    (case parent of NONE => [] | SOME group => group_status group);
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
    86
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    87
fun str_of_group group =
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
    88
  (is_canceled group ? enclose "(" ")") (string_of_int (group_id group));
28179
8e8313aededc human-readable printing of TaskQueue.task/group;
wenzelm
parents: 28176
diff changeset
    89
35242
1c80c29086d7 eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents: 35012
diff changeset
    90
end;
1c80c29086d7 eliminated opaque signature matching -- tends to cause problems with toplevel pp for abstract types;
wenzelm
parents: 35012
diff changeset
    91
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
    92
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    93
(* tasks *)
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    94
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    95
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
    96
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    97
fun new_timing () =
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    98
  Synchronized.var "timing" ((Time.zeroTime, Time.zeroTime, []): timing);
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
    99
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   100
abstype task = Task of
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   101
 {group: group,
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   102
  name: string,
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   103
  id: int,
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   104
  pri: int option,
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   105
  timing: timing Synchronized.var}
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   106
with
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
fun dummy_task () =
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   109
  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
   110
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   111
fun new_task group name pri =
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   112
  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
   113
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   114
fun group_of_task (Task {group, ...}) = group;
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   115
fun name_of_task (Task {name, ...}) = name;
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   116
fun pri_of_task (Task {pri, ...}) = the_default 0 pri;
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   117
fun str_of_task (Task {name, id, ...}) =
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   118
  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
   119
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   120
fun timing_of_task (Task {timing, ...}) = Synchronized.value 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 update_timing update (Task {timing, ...}) e =
41702
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   123
  uninterruptible (fn restore_attributes => fn () =>
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   124
    let
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   125
      val start = Time.now ();
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   126
      val result = Exn.capture (restore_attributes e) ();
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   127
      val t = Time.- (Time.now (), start);
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   128
      val _ = Synchronized.change timing (update t);
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   129
    in Exn.release result end) ();
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   130
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   131
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
   132
  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
   133
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   134
val eq_task = is_equal o task_ord;
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   135
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   136
end;
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   137
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   138
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
   139
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   140
41695
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   141
(* timing *)
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   142
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   143
fun running task =
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   144
  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
   145
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   146
fun joining task =
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   147
  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
   148
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   149
fun waiting task deps =
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   150
  update_timing (fn t => fn (a, b, ds) =>
41702
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   151
    (Time.- (a, t), Time.+ (b, t),
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   152
      if ! Multithreading.trace > 0
dca4c58c5d57 Task_Queue.update_timing: more precise treatment of interruptibility;
wenzelm
parents: 41695
diff changeset
   153
      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
   154
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   155
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   156
41681
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   157
(** queue of jobs and groups **)
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   158
28176
01b21886e7f0 job: explicit 'ok' status -- false for canceled jobs;
wenzelm
parents: 28171
diff changeset
   159
(* jobs *)
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   160
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   161
datatype job =
29365
5c5bc17d9135 added is_valid;
wenzelm
parents: 29342
diff changeset
   162
  Job of (bool -> bool) list |
34277
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
   163
  Running of Thread.thread |
37854
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   164
  Passive of unit -> bool;
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   165
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   166
type jobs = job Task_Graph.T;
28176
01b21886e7f0 job: explicit 'ok' status -- false for canceled jobs;
wenzelm
parents: 28171
diff changeset
   167
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   168
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
   169
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
   170
32250
wenzelm
parents: 32249
diff changeset
   171
fun add_job task dep (jobs: jobs) =
wenzelm
parents: 32249
diff changeset
   172
  Task_Graph.add_edge (dep, task) jobs handle Task_Graph.UNDEF _ => jobs;
wenzelm
parents: 32249
diff changeset
   173
wenzelm
parents: 32249
diff changeset
   174
fun get_deps (jobs: jobs) task =
wenzelm
parents: 32249
diff changeset
   175
  Task_Graph.imm_preds jobs task handle Task_Graph.UNDEF _ => [];
wenzelm
parents: 32249
diff changeset
   176
28176
01b21886e7f0 job: explicit 'ok' status -- false for canceled jobs;
wenzelm
parents: 28171
diff changeset
   177
41681
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   178
(* queue *)
28176
01b21886e7f0 job: explicit 'ok' status -- false for canceled jobs;
wenzelm
parents: 28171
diff changeset
   179
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   180
datatype queue = Queue of
41695
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   181
 {groups: task list Inttab.table,   (*presently known group members*)
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
   182
  jobs: jobs};                      (*job dependency graph*)
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   183
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
   184
fun make_queue groups jobs = Queue {groups = groups, jobs = jobs};
28204
2d93b158ad99 added is_empty;
wenzelm
parents: 28202
diff changeset
   185
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
   186
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
   187
37854
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   188
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   189
(* job status *)
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   190
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   191
fun ready_job task (Job list, ([], _)) = SOME (task, rev list)
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   192
  | ready_job task (Passive abort, ([], _)) =
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   193
      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
   194
      else NONE
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   195
  | ready_job _ _ = NONE;
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   196
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   197
fun active_job (_, (Job _, _)) = SOME ()
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   198
  | active_job (_, (Running _, _)) = SOME ()
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   199
  | active_job (task, (Passive _, _)) =
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   200
      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
   201
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   202
fun all_passive (Queue {jobs, ...}) = is_none (Task_Graph.get_first active_job jobs);
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   203
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   204
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   205
(* queue status *)
32052
8c391a12df1d added group_id;
wenzelm
parents: 31971
diff changeset
   206
8c391a12df1d added group_id;
wenzelm
parents: 31971
diff changeset
   207
fun status (Queue {jobs, ...}) =
8c391a12df1d added group_id;
wenzelm
parents: 31971
diff changeset
   208
  let
34277
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
   209
    val (x, y, z, w) =
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   210
      Task_Graph.fold (fn (_, (job, (deps, _))) => fn (x, y, z, w) =>
32052
8c391a12df1d added group_id;
wenzelm
parents: 31971
diff changeset
   211
          (case job of
37854
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   212
            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
   213
          | 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
   214
          | 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
   215
        jobs (0, 0, 0, 0);
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
   216
  in {ready = x, pending = y, running = z, passive = w} end;
32052
8c391a12df1d added group_id;
wenzelm
parents: 31971
diff changeset
   217
8c391a12df1d added group_id;
wenzelm
parents: 31971
diff changeset
   218
41681
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   219
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   220
(** task queue operations **)
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   221
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   222
(* cancel -- peers and sub-groups *)
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   223
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
   224
fun cancel (Queue {groups, jobs}) group =
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   225
  let
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   226
    val _ = cancel_group group Exn.Interrupt;
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   227
    val tasks = Inttab.lookup_list groups (group_id group);
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   228
    val running =
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   229
      fold (get_job jobs #> (fn Running t => insert Thread.equal t | _ => I)) tasks [];
37216
3165bc303f66 modernized some structure names, keeping a few legacy aliases;
wenzelm
parents: 35242
diff changeset
   230
    val _ = List.app Simple_Thread.interrupt 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
   231
  in null running end;
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   232
37854
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   233
fun cancel_all (Queue {jobs, ...}) =
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   234
  let
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   235
    fun cancel_job (task, (job, _)) (groups, running) =
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   236
      let
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   237
        val group = group_of_task task;
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   238
        val _ = cancel_group group Exn.Interrupt;
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   239
      in
34277
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
   240
        (case job of
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
   241
          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
   242
        | _ => (groups, running))
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   243
      end;
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   244
    val (running_groups, running) = Task_Graph.fold cancel_job jobs ([], []);
37216
3165bc303f66 modernized some structure names, keeping a few legacy aliases;
wenzelm
parents: 35242
diff changeset
   245
    val _ = List.app Simple_Thread.interrupt 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
   246
  in running_groups end;
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   247
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   248
41681
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   249
(* finish *)
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   250
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   251
fun finish task (Queue {groups, jobs}) =
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   252
  let
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   253
    val group = group_of_task task;
41681
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   254
    val groups' = groups
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   255
      |> fold (fn gid => Inttab.remove_list eq_task (gid, task)) (group_ancestry group);
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   256
    val jobs' = Task_Graph.del_node task jobs;
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   257
    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
   258
  in (maximal, make_queue groups' jobs') end;
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   259
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   260
28185
0f20cbce4935 simplified dequeue: provide Thread.self internally;
wenzelm
parents: 28184
diff changeset
   261
(* enqueue *)
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   262
37854
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   263
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
   264
  let
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   265
    val task = new_task group "passive" NONE;
34277
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
   266
    val groups' = groups
7325a5e3587f added Future.promise/fulfill -- promised futures that are fulfilled by external means;
wenzelm
parents: 32814
diff changeset
   267
      |> fold (fn gid => Inttab.cons_list (gid, task)) (group_ancestry group);
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   268
    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
   269
  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
   270
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41670
diff changeset
   271
fun enqueue name group deps pri job (Queue {groups, jobs}) =
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   272
  let
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   273
    val task = new_task group name (SOME pri);
32101
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   274
    val groups' = groups
e25107ff4f56 support for nested groups -- cancellation is propagated to peers and subgroups;
wenzelm
parents: 32099
diff changeset
   275
      |> fold (fn gid => Inttab.cons_list (gid, task)) (group_ancestry group);
28185
0f20cbce4935 simplified dequeue: provide Thread.self internally;
wenzelm
parents: 28184
diff changeset
   276
    val jobs' = jobs
41683
73dde8006820 maintain Task_Queue.group within Task_Queue.task;
wenzelm
parents: 41682
diff changeset
   277
      |> Task_Graph.new_node (task, Job [job])
41684
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   278
      |> fold (add_job task) deps;
32218
222f26693757 enqueue/finish: return minimal/maximal state of this task;
wenzelm
parents: 32192
diff changeset
   279
    val minimal = null (get_deps jobs' task);
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
   280
  in ((task, minimal), make_queue groups' jobs') end;
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   281
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
   282
fun extend task job (Queue {groups, jobs}) =
29365
5c5bc17d9135 added is_valid;
wenzelm
parents: 29342
diff changeset
   283
  (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
   284
    SOME (Job list) => SOME (make_queue groups (set_job task (Job (job :: list)) jobs))
29365
5c5bc17d9135 added is_valid;
wenzelm
parents: 29342
diff changeset
   285
  | _ => NONE);
5c5bc17d9135 added is_valid;
wenzelm
parents: 29342
diff changeset
   286
28185
0f20cbce4935 simplified dequeue: provide Thread.self internally;
wenzelm
parents: 28184
diff changeset
   287
0f20cbce4935 simplified dequeue: provide Thread.self internally;
wenzelm
parents: 28184
diff changeset
   288
(* dequeue *)
0f20cbce4935 simplified dequeue: provide Thread.self internally;
wenzelm
parents: 28184
diff changeset
   289
39243
307e3d07d19f Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents: 39232
diff changeset
   290
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
   291
  (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
   292
    SOME (Passive _) =>
307e3d07d19f Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents: 39232
diff changeset
   293
      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
   294
      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
   295
  | _ => (false, queue));
307e3d07d19f Future.promise: more robust treatment of concurrent abort vs. fulfill (amending 047c96f41455);
wenzelm
parents: 39232
diff changeset
   296
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
   297
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
   298
  (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
   299
    SOME (result as (task, _)) =>
37854
047c96f41455 back to more strict dependencies, even for canceled groups (reverting parts of 02936e77a07c);
wenzelm
parents: 37216
diff changeset
   300
      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
   301
      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
   302
  | NONE => (NONE, queue));
28202
23cb9a974630 added focus, which indicates a particular collection of high-priority tasks;
wenzelm
parents: 28196
diff changeset
   303
28165
26bb048f463c Ordered queue of grouped tasks.
wenzelm
parents:
diff changeset
   304
41681
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   305
(* dequeue wrt. dynamic dependencies *)
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   306
41695
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   307
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
   308
  let
41684
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   309
    fun ready [] rest = (NONE, rev rest)
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   310
      | ready (task :: tasks) rest =
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   311
          (case try (Task_Graph.get_entry jobs) task of
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   312
            NONE => ready tasks rest
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   313
          | SOME entry =>
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   314
              (case ready_job task entry of
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   315
                NONE => ready tasks (task :: rest)
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   316
              | some => (some, List.revAppend (rest, tasks))));
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   317
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   318
    fun ready_dep _ [] = NONE
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   319
      | ready_dep seen (task :: tasks) =
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   320
          if member eq_task seen task then ready_dep seen tasks
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   321
          else
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   322
            let val entry as (_, (ds, _)) = Task_Graph.get_entry jobs task in
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   323
              (case ready_job task entry of
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   324
                NONE => ready_dep (task :: seen) (ds @ tasks)
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   325
              | some => some)
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   326
            end;
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   327
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   328
    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
   329
      let val jobs' = set_job task (Running thread) jobs
41695
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   330
      in ((SOME res, deps'), make_queue groups jobs') end;
32055
6a46898aa805 recovered a version of dequeue_towards (cf. bb7b5a5942c7);
wenzelm
parents: 32052
diff changeset
   331
  in
41684
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   332
    (case ready deps [] of
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   333
      (SOME res, deps') => result res deps'
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   334
    | (NONE, deps') =>
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   335
        (case ready_dep [] deps' of
b828d4b53386 refined Task_Queue.dequeue_deps (more incremental);
wenzelm
parents: 41683
diff changeset
   336
          SOME res => result res deps'
41695
afdbec23b92b eliminated slightly odd abstract type Task_Queue.deps;
wenzelm
parents: 41684
diff changeset
   337
        | NONE => ((NONE, deps'), queue)))
32055
6a46898aa805 recovered a version of dequeue_towards (cf. bb7b5a5942c7);
wenzelm
parents: 32052
diff changeset
   338
  end;
6a46898aa805 recovered a version of dequeue_towards (cf. bb7b5a5942c7);
wenzelm
parents: 32052
diff changeset
   339
41681
b5d7b15166bf Future.join_results: discontinued post-hoc recording of dynamic dependencies;
wenzelm
parents: 41680
diff changeset
   340
end;