| author | kuncar |
| Fri, 08 Mar 2013 13:21:06 +0100 | |
| changeset 51375 | d9e62d9c98de |
| parent 51300 | 7cdb86c8eb30 |
| child 51397 | 03b586ee5930 |
| permissions | -rw-r--r-- |
| 50686 | 1 |
/* Title: Pure/Tools/build.scala |
| 48276 | 2 |
Author: Makarius |
| 50367 | 3 |
Options: :folding=explicit:collapseFolds=1: |
| 48276 | 4 |
|
5 |
Build and manage Isabelle sessions. |
|
6 |
*/ |
|
7 |
||
8 |
package isabelle |
|
9 |
||
10 |
||
| 48661 | 11 |
import java.util.{Timer, TimerTask}
|
| 48548 | 12 |
import java.io.{BufferedInputStream, FileInputStream,
|
| 48494 | 13 |
BufferedReader, InputStreamReader, IOException} |
14 |
import java.util.zip.GZIPInputStream |
|
| 48335 | 15 |
|
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
16 |
import scala.collection.SortedSet |
|
48340
6f4fc030882a
allow explicit specification of additional session directories;
wenzelm
parents:
48339
diff
changeset
|
17 |
import scala.annotation.tailrec |
|
48337
9c7f8e5805b4
cumulate semantic Session_Info, based on syntactic Session_Entry;
wenzelm
parents:
48336
diff
changeset
|
18 |
|
| 48335 | 19 |
|
| 48276 | 20 |
object Build |
21 |
{
|
|
| 50366 | 22 |
/** progress context **/ |
23 |
||
|
50846
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
24 |
class Progress |
|
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
25 |
{
|
| 50367 | 26 |
def echo(msg: String) {}
|
|
50846
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
27 |
def theory(session: String, theory: String) {}
|
| 50367 | 28 |
def stopped: Boolean = false |
| 50366 | 29 |
} |
30 |
||
| 50367 | 31 |
object Ignore_Progress extends Progress |
| 50366 | 32 |
|
|
50846
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
33 |
class Console_Progress(verbose: Boolean) extends Progress |
|
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
34 |
{
|
| 50366 | 35 |
override def echo(msg: String) { java.lang.System.out.println(msg) }
|
|
50846
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
36 |
override def theory(session: String, theory: String): Unit = |
|
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
37 |
if (verbose) echo(session + ": theory " + theory) |
| 51252 | 38 |
|
39 |
@volatile private var is_stopped = false |
|
40 |
def interrupt_handler[A](e: => A): A = Interrupt.handler { is_stopped = true } { e }
|
|
| 51253 | 41 |
override def stopped: Boolean = is_stopped |
| 50366 | 42 |
} |
43 |
||
44 |
||
45 |
||
|
48337
9c7f8e5805b4
cumulate semantic Session_Info, based on syntactic Session_Entry;
wenzelm
parents:
48336
diff
changeset
|
46 |
/** session information **/ |
| 48334 | 47 |
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
48 |
// external version |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
49 |
sealed case class Session_Entry( |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
50 |
pos: Position.T, |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
51 |
name: String, |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
52 |
groups: List[String], |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
53 |
path: String, |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
54 |
parent: Option[String], |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
55 |
description: String, |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
56 |
options: List[Options.Spec], |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
57 |
theories: List[(List[Options.Spec], List[String])], |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
58 |
files: List[String]) |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
59 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
60 |
// internal version |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
61 |
sealed case class Session_Info( |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
62 |
select: Boolean, |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
63 |
pos: Position.T, |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
64 |
groups: List[String], |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
65 |
dir: Path, |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
66 |
parent: Option[String], |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
67 |
description: String, |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
68 |
options: Options, |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
69 |
theories: List[(Options, List[Path])], |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
70 |
files: List[Path], |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
71 |
entry_digest: SHA1.Digest) |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
72 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
73 |
def is_pure(name: String): Boolean = name == "RAW" || name == "Pure" |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
74 |
|
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
75 |
def session_info(options: Options, select: Boolean, dir: Path, entry: Session_Entry) |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
76 |
: (String, Session_Info) = |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
77 |
try {
|
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
78 |
val name = entry.name |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
79 |
|
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
80 |
if (name == "") error("Bad session name")
|
|
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
81 |
if (is_pure(name) && entry.parent.isDefined) error("Illegal parent session")
|
|
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
82 |
if (!is_pure(name) && !entry.parent.isDefined) error("Missing parent session")
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
83 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
84 |
val session_options = options ++ entry.options |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
85 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
86 |
val theories = |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
87 |
entry.theories.map({ case (opts, thys) =>
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
88 |
(session_options ++ opts, thys.map(Path.explode(_))) }) |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
89 |
val files = entry.files.map(Path.explode(_)) |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
90 |
val entry_digest = SHA1.digest((name, entry.parent, entry.options, entry.theories).toString) |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
91 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
92 |
val info = |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
93 |
Session_Info(select, entry.pos, entry.groups, dir + Path.explode(entry.path), |
|
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
94 |
entry.parent, entry.description, session_options, theories, files, entry_digest) |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
95 |
|
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
96 |
(name, info) |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
97 |
} |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
98 |
catch {
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
99 |
case ERROR(msg) => |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
100 |
error(msg + "\nThe error(s) above occurred in session entry " + |
| 48992 | 101 |
quote(entry.name) + Position.here(entry.pos)) |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
102 |
} |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
103 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
104 |
|
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
105 |
/* session tree */ |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
106 |
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
107 |
object Session_Tree |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
108 |
{
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
109 |
def apply(infos: Seq[(String, Session_Info)]): Session_Tree = |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
110 |
{
|
| 48680 | 111 |
val graph1 = |
112 |
(Graph.string[Session_Info] /: infos) {
|
|
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
113 |
case (graph, (name, info)) => |
| 48680 | 114 |
if (graph.defined(name)) |
| 48992 | 115 |
error("Duplicate session " + quote(name) + Position.here(info.pos))
|
| 48680 | 116 |
else graph.new_node(name, info) |
117 |
} |
|
118 |
val graph2 = |
|
119 |
(graph1 /: graph1.entries) {
|
|
120 |
case (graph, (name, (info, _))) => |
|
121 |
info.parent match {
|
|
122 |
case None => graph |
|
123 |
case Some(parent) => |
|
124 |
if (!graph.defined(parent)) |
|
125 |
error("Bad parent session " + quote(parent) + " for " +
|
|
| 48992 | 126 |
quote(name) + Position.here(info.pos)) |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
127 |
|
| 48680 | 128 |
try { graph.add_edge_acyclic(parent, name) }
|
129 |
catch {
|
|
130 |
case exn: Graph.Cycles[_] => |
|
131 |
error(cat_lines(exn.cycles.map(cycle => |
|
132 |
"Cyclic session dependency of " + |
|
133 |
cycle.map(c => quote(c.toString)).mkString(" via "))) +
|
|
| 48992 | 134 |
Position.here(info.pos)) |
| 48680 | 135 |
} |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
136 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
137 |
} |
| 48680 | 138 |
new Session_Tree(graph2) |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
139 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
140 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
141 |
|
| 48680 | 142 |
final class Session_Tree private(val graph: Graph[String, Session_Info]) |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
143 |
extends PartialFunction[String, Session_Info] |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
144 |
{
|
| 48680 | 145 |
def apply(name: String): Session_Info = graph.get_node(name) |
146 |
def isDefinedAt(name: String): Boolean = graph.defined(name) |
|
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
147 |
|
| 49131 | 148 |
def selection(requirements: Boolean, all_sessions: Boolean, |
149 |
session_groups: List[String], sessions: List[String]): (List[String], Session_Tree) = |
|
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
150 |
{
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
151 |
val bad_sessions = sessions.filterNot(isDefinedAt(_)) |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
152 |
if (!bad_sessions.isEmpty) error("Undefined session(s): " + commas_quote(bad_sessions))
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
153 |
|
| 49131 | 154 |
val pre_selected = |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
155 |
{
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
156 |
if (all_sessions) graph.keys.toList |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
157 |
else {
|
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
158 |
val select_group = session_groups.toSet |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
159 |
val select = sessions.toSet |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
160 |
(for {
|
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
161 |
(name, (info, _)) <- graph.entries |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
162 |
if info.select || select(name) || apply(name).groups.exists(select_group) |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
163 |
} yield name).toList |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
164 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
165 |
} |
| 49131 | 166 |
val selected = |
167 |
if (requirements) (graph.all_preds(pre_selected).toSet -- pre_selected).toList |
|
168 |
else pre_selected |
|
169 |
||
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
170 |
val tree1 = new Session_Tree(graph.restrict(graph.all_preds(selected).toSet)) |
| 49131 | 171 |
(selected, tree1) |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
172 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
173 |
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
174 |
def topological_order: List[(String, Session_Info)] = |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
175 |
graph.topological_order.map(name => (name, apply(name))) |
| 48794 | 176 |
|
177 |
override def toString: String = graph.entries.map(_._1).toList.sorted.mkString(",")
|
|
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
178 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
179 |
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
180 |
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
181 |
/* parser */ |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
182 |
|
|
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
183 |
private val SESSION = "session" |
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
184 |
private val IN = "in" |
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
185 |
private val DESCRIPTION = "description" |
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
186 |
private val OPTIONS = "options" |
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
187 |
private val THEORIES = "theories" |
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
188 |
private val FILES = "files" |
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
189 |
|
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
190 |
lazy val root_syntax = |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
191 |
Outer_Syntax.init() + "(" + ")" + "+" + "," + "=" + "[" + "]" +
|
| 48718 | 192 |
(SESSION, Keyword.THY_DECL) + IN + DESCRIPTION + OPTIONS + THEORIES + FILES |
|
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
193 |
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
194 |
private object Parser extends Parse.Parser |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
195 |
{
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
196 |
def session_entry(pos: Position.T): Parser[Session_Entry] = |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
197 |
{
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
198 |
val session_name = atom("session name", _.is_name)
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
199 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
200 |
val option = |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
201 |
name ~ opt(keyword("=") ~! name ^^ { case _ ~ x => x }) ^^ { case x ~ y => (x, y) }
|
| 48862 | 202 |
val options = keyword("[") ~> rep1sep(option, keyword(",")) <~ keyword("]")
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
203 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
204 |
val theories = |
| 48739 | 205 |
keyword(THEORIES) ~! ((options | success(Nil)) ~ rep(theory_name)) ^^ |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
206 |
{ case _ ~ (x ~ y) => (x, y) }
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
207 |
|
| 48912 | 208 |
command(SESSION) ~! |
209 |
(session_name ~ |
|
210 |
((keyword("(") ~! (rep1(name) <~ keyword(")")) ^^ { case _ ~ x => x }) | success(Nil)) ~
|
|
211 |
((keyword(IN) ~! path ^^ { case _ ~ x => x }) | success(".")) ~
|
|
212 |
(keyword("=") ~!
|
|
213 |
(opt(session_name ~! keyword("+") ^^ { case x ~ _ => x }) ~
|
|
214 |
((keyword(DESCRIPTION) ~! text ^^ { case _ ~ x => x }) | success("")) ~
|
|
215 |
((keyword(OPTIONS) ~! options ^^ { case _ ~ x => x }) | success(Nil)) ~
|
|
| 48916 | 216 |
rep1(theories) ~ |
| 48912 | 217 |
((keyword(FILES) ~! rep1(path) ^^ { case _ ~ x => x }) | success(Nil))))) ^^
|
218 |
{ case _ ~ (a ~ b ~ c ~ (_ ~ (d ~ e ~ f ~ g ~ h))) =>
|
|
219 |
Session_Entry(pos, a, b, c, d, e, f, g, h) } |
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
220 |
} |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
221 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
222 |
def parse_entries(root: Path): List[Session_Entry] = |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
223 |
{
|
|
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
224 |
val toks = root_syntax.scan(File.read(root)) |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
225 |
parse_all(rep(session_entry(root.position)), Token.reader(toks, root.implode)) match {
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
226 |
case Success(result, _) => result |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
227 |
case bad => error(bad.toString) |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
228 |
} |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
229 |
} |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
230 |
} |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
231 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
232 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
233 |
/* find sessions within certain directories */ |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
234 |
|
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
235 |
private val ROOT = Path.explode("ROOT")
|
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
236 |
private val ROOTS = Path.explode("ROOTS")
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
237 |
|
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
238 |
private def is_session_dir(dir: Path): Boolean = |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
239 |
(dir + ROOT).is_file || (dir + ROOTS).is_file |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
240 |
|
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
241 |
private def check_session_dir(dir: Path): Path = |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
242 |
if (is_session_dir(dir)) dir |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
243 |
else error("Bad session root directory: " + dir.toString)
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
244 |
|
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
245 |
def find_sessions(options: Options, more_dirs: List[(Boolean, Path)]): Session_Tree = |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
246 |
{
|
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
247 |
def find_dir(select: Boolean, dir: Path): List[(String, Session_Info)] = |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
248 |
find_root(select, dir) ::: find_roots(select, dir) |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
249 |
|
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
250 |
def find_root(select: Boolean, dir: Path): List[(String, Session_Info)] = |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
251 |
{
|
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
252 |
val root = dir + ROOT |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
253 |
if (root.is_file) Parser.parse_entries(root).map(session_info(options, select, dir, _)) |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
254 |
else Nil |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
255 |
} |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
256 |
|
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
257 |
def find_roots(select: Boolean, dir: Path): List[(String, Session_Info)] = |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
258 |
{
|
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
259 |
val roots = dir + ROOTS |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
260 |
if (roots.is_file) {
|
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
261 |
for {
|
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
262 |
line <- split_lines(File.read(roots)) |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
263 |
if !(line == "" || line.startsWith("#"))
|
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
264 |
dir1 = |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
265 |
try { check_session_dir(dir + Path.explode(line)) }
|
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
266 |
catch {
|
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
267 |
case ERROR(msg) => |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
268 |
error(msg + "\nThe error(s) above occurred in session catalog " + roots.toString) |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
269 |
} |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
270 |
info <- find_dir(select, dir1) |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
271 |
} yield info |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
272 |
} |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
273 |
else Nil |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
274 |
} |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
275 |
|
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
276 |
val default_dirs = Isabelle_System.components().filter(is_session_dir(_)).map((false, _)) |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
277 |
|
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
278 |
more_dirs foreach { case (_, dir) => check_session_dir(dir) }
|
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
279 |
|
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
280 |
Session_Tree( |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
281 |
for {
|
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
282 |
(select, dir) <- default_dirs ::: more_dirs |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
283 |
info <- find_dir(select, dir) |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
284 |
} yield info) |
|
48349
a78e5d399599
support Session.Queue with ordering and dependencies;
wenzelm
parents:
48347
diff
changeset
|
285 |
} |
| 48334 | 286 |
|
|
48337
9c7f8e5805b4
cumulate semantic Session_Info, based on syntactic Session_Entry;
wenzelm
parents:
48336
diff
changeset
|
287 |
|
| 48424 | 288 |
|
289 |
/** build **/ |
|
290 |
||
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
291 |
/* queue */ |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
292 |
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
293 |
object Queue |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
294 |
{
|
|
51230
19192615911e
option parallel_proofs_reuse_timing controls reuse of log information -- since it is not always beneficial for performance;
wenzelm
parents:
51229
diff
changeset
|
295 |
def apply(tree: Session_Tree, load_timings: String => (List[Properties.T], Double)): Queue = |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
296 |
{
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
297 |
val graph = tree.graph |
| 51220 | 298 |
val sessions = graph.keys.toList |
299 |
||
|
51300
7cdb86c8eb30
load timings in parallel for improved performance;
wenzelm
parents:
51297
diff
changeset
|
300 |
val timings = |
|
7cdb86c8eb30
load timings in parallel for improved performance;
wenzelm
parents:
51297
diff
changeset
|
301 |
sessions.par.map((name: String) => |
|
7cdb86c8eb30
load timings in parallel for improved performance;
wenzelm
parents:
51297
diff
changeset
|
302 |
Exn.capture {
|
|
7cdb86c8eb30
load timings in parallel for improved performance;
wenzelm
parents:
51297
diff
changeset
|
303 |
if (tree(name).options.bool("parallel_proofs_reuse_timing")) (name, load_timings(name))
|
|
7cdb86c8eb30
load timings in parallel for improved performance;
wenzelm
parents:
51297
diff
changeset
|
304 |
else (name, (Nil, 0.0)) |
|
7cdb86c8eb30
load timings in parallel for improved performance;
wenzelm
parents:
51297
diff
changeset
|
305 |
}).toList.map(Exn.release(_)) |
| 51220 | 306 |
val command_timings = |
307 |
Map(timings.map({ case (name, (ts, _)) => (name, ts) }): _*).withDefaultValue(Nil)
|
|
308 |
val session_timing = |
|
309 |
Map(timings.map({ case (name, (_, t)) => (name, t) }): _*).withDefaultValue(0.0)
|
|
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
310 |
|
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
311 |
def outdegree(name: String): Int = graph.imm_succs(name).size |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
312 |
def timeout(name: String): Double = tree(name).options.real("timeout")
|
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
313 |
|
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
314 |
object Ordering extends scala.math.Ordering[String] |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
315 |
{
|
|
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
316 |
def compare_timing(name1: String, name2: String): Int = |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
317 |
{
|
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
318 |
val t1 = session_timing(name1) |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
319 |
val t2 = session_timing(name2) |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
320 |
if (t1 == 0.0 || t2 == 0.0) 0 |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
321 |
else t1 compare t2 |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
322 |
} |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
323 |
|
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
324 |
def compare(name1: String, name2: String): Int = |
|
51229
6e40d0bb89e3
prefer outdegree in comparison again (cf. 88c96e836ed6) -- NB: big jobs might hide behind small ones in this naive queuing scheme;
wenzelm
parents:
51227
diff
changeset
|
325 |
outdegree(name2) compare outdegree(name1) match {
|
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
326 |
case 0 => |
|
51229
6e40d0bb89e3
prefer outdegree in comparison again (cf. 88c96e836ed6) -- NB: big jobs might hide behind small ones in this naive queuing scheme;
wenzelm
parents:
51227
diff
changeset
|
327 |
compare_timing(name2, name1) match {
|
| 51220 | 328 |
case 0 => |
329 |
timeout(name2) compare timeout(name1) match {
|
|
330 |
case 0 => name1 compare name2 |
|
331 |
case ord => ord |
|
332 |
} |
|
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
333 |
case ord => ord |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
334 |
} |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
335 |
case ord => ord |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
336 |
} |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
337 |
} |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
338 |
|
| 51220 | 339 |
new Queue(graph, SortedSet(sessions: _*)(Ordering), command_timings) |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
340 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
341 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
342 |
|
| 51220 | 343 |
final class Queue private( |
344 |
graph: Graph[String, Session_Info], |
|
345 |
order: SortedSet[String], |
|
346 |
val command_timings: String => List[Properties.T]) |
|
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
347 |
{
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
348 |
def is_inner(name: String): Boolean = !graph.is_maximal(name) |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
349 |
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
350 |
def is_empty: Boolean = graph.is_empty |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
351 |
|
|
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
352 |
def - (name: String): Queue = |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
353 |
new Queue(graph.del_node(name), |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
354 |
order - name, // FIXME scala-2.10.0 TreeSet problem!? |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
355 |
command_timings) |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
356 |
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
357 |
def dequeue(skip: String => Boolean): Option[(String, Session_Info)] = |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
358 |
{
|
|
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
359 |
val it = order.iterator.dropWhile(name => |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
360 |
skip(name) |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
361 |
|| !graph.defined(name) // FIXME scala-2.10.0 TreeSet problem!? |
|
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
362 |
|| !graph.is_minimal(name)) |
| 48680 | 363 |
if (it.hasNext) { val name = it.next; Some((name, graph.get_node(name))) }
|
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
364 |
else None |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
365 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
366 |
} |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
367 |
|
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
368 |
|
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
369 |
/* source dependencies and static content */ |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
370 |
|
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
371 |
sealed case class Session_Content( |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
372 |
loaded_theories: Set[String], |
|
48660
730ca503e955
static outer syntax based on session specifications;
wenzelm
parents:
48650
diff
changeset
|
373 |
syntax: Outer_Syntax, |
| 51297 | 374 |
sources: List[(Path, SHA1.Digest)]) |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
375 |
|
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
376 |
sealed case class Deps(deps: Map[String, Session_Content]) |
|
48423
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
377 |
{
|
| 48583 | 378 |
def is_empty: Boolean = deps.isEmpty |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
379 |
def apply(name: String): Session_Content = deps(name) |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
380 |
def sources(name: String): List[SHA1.Digest] = deps(name).sources.map(_._2) |
|
48423
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
381 |
} |
|
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
382 |
|
| 50366 | 383 |
def dependencies(progress: Build.Progress, inlined_files: Boolean, |
384 |
verbose: Boolean, list_files: Boolean, tree: Session_Tree): Deps = |
|
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
385 |
Deps((Map.empty[String, Session_Content] /: tree.topological_order)( |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
386 |
{ case (deps, (name, info)) =>
|
| 51297 | 387 |
val (preloaded, parent_syntax) = |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
388 |
info.parent match {
|
|
48870
4accee106f0f
clarified initialization of Thy_Load, Thy_Info, Session;
wenzelm
parents:
48867
diff
changeset
|
389 |
case None => |
| 51297 | 390 |
(Set.empty[String], Outer_Syntax.init_pure()) |
| 48794 | 391 |
case Some(parent_name) => |
392 |
val parent = deps(parent_name) |
|
| 51297 | 393 |
(parent.loaded_theories, parent.syntax) |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
394 |
} |
|
48870
4accee106f0f
clarified initialization of Thy_Load, Thy_Info, Session;
wenzelm
parents:
48867
diff
changeset
|
395 |
val thy_info = new Thy_Info(new Thy_Load(preloaded, parent_syntax)) |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
396 |
|
| 48903 | 397 |
if (verbose || list_files) {
|
| 48583 | 398 |
val groups = |
399 |
if (info.groups.isEmpty) "" |
|
400 |
else info.groups.mkString(" (", " ", ")")
|
|
| 50366 | 401 |
progress.echo("Session " + name + groups)
|
| 48583 | 402 |
} |
| 48478 | 403 |
|
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
404 |
val thy_deps = |
|
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
405 |
thy_info.dependencies( |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
406 |
info.theories.map(_._2).flatten. |
|
50566
b43c4f660320
tuned signature: use thy_load to adapt to prover/editor specific view on sources;
wenzelm
parents:
50414
diff
changeset
|
407 |
map(thy => Thy_Load.path_node_name(info.dir + Thy_Load.thy_path(thy)))) |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
408 |
|
| 48872 | 409 |
val loaded_theories = thy_deps.loaded_theories |
|
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
410 |
val syntax = thy_deps.syntax |
|
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
411 |
|
|
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
412 |
val body_files = if (inlined_files) thy_deps.load_files else Nil |
|
48660
730ca503e955
static outer syntax based on session specifications;
wenzelm
parents:
48650
diff
changeset
|
413 |
|
|
48423
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
414 |
val all_files = |
|
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
415 |
(thy_deps.deps.map(dep => Path.explode(dep.name.node)) ::: body_files ::: |
|
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
416 |
info.files.map(file => info.dir + file)).map(_.expand) |
| 48903 | 417 |
|
418 |
if (list_files) |
|
| 50366 | 419 |
progress.echo(cat_lines(all_files.map(_.implode).sorted.map(" " + _)))
|
| 48903 | 420 |
|
| 48485 | 421 |
val sources = |
| 49696 | 422 |
try { all_files.map(p => (p, SHA1.digest(p.file))) }
|
| 48485 | 423 |
catch {
|
424 |
case ERROR(msg) => |
|
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
425 |
error(msg + "\nThe error(s) above occurred in session " + |
| 48992 | 426 |
quote(name) + Position.here(info.pos)) |
| 48485 | 427 |
} |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
428 |
|
| 51297 | 429 |
deps + (name -> Session_Content(loaded_theories, syntax, sources)) |
|
48423
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
430 |
})) |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
431 |
|
|
49098
673e0ed547af
bypass slow check for inlined files, where it is not really required;
wenzelm
parents:
48992
diff
changeset
|
432 |
def session_content(inlined_files: Boolean, dirs: List[Path], session: String): Session_Content = |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
433 |
{
|
|
50404
898cac1dad5e
avoid startup within GUI thread -- it is only required later for dialog;
wenzelm
parents:
50367
diff
changeset
|
434 |
val options = Options.init() |
| 48791 | 435 |
val (_, tree) = |
| 49131 | 436 |
find_sessions(options, dirs.map((false, _))).selection(false, false, Nil, List(session)) |
| 50366 | 437 |
dependencies(Build.Ignore_Progress, inlined_files, false, false, tree)(session) |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
438 |
} |
|
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
439 |
|
| 48794 | 440 |
def outer_syntax(session: String): Outer_Syntax = |
| 51297 | 441 |
session_content(false, Nil, session).syntax |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
442 |
|
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
443 |
|
| 48424 | 444 |
/* jobs */ |
| 48341 | 445 |
|
| 50845 | 446 |
private class Job(progress: Build.Progress, |
447 |
name: String, val info: Session_Info, output: Path, do_output: Boolean, |
|
| 51220 | 448 |
verbose: Boolean, browser_info: Path, command_timings: List[Properties.T]) |
| 48418 | 449 |
{
|
|
48467
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
450 |
// global browser info dir |
| 48674 | 451 |
if (info.options.bool("browser_info") && !(browser_info + Path.explode("index.html")).is_file)
|
|
48467
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
452 |
{
|
|
50893
d55eb82ae77b
Isabelle_System.mkdirs with explicit error checking (in accordance to ML version), e.g. relevant with read-only DMG file-system on Mac OS X;
wenzelm
parents:
50847
diff
changeset
|
453 |
Isabelle_System.mkdirs(browser_info) |
|
48467
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
454 |
File.copy(Path.explode("~~/lib/logo/isabelle.gif"),
|
|
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
455 |
browser_info + Path.explode("isabelle.gif"))
|
|
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
456 |
File.write(browser_info + Path.explode("index.html"),
|
|
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
457 |
File.read(Path.explode("~~/lib/html/library_index_header.template")) +
|
| 48724 | 458 |
File.read(Path.explode("~~/lib/html/library_index_content.template")) +
|
|
48467
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
459 |
File.read(Path.explode("~~/lib/html/library_index_footer.template")))
|
|
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
460 |
} |
|
a4318c36a829
more precise propagation of options: build, session, theories;
wenzelm
parents:
48462
diff
changeset
|
461 |
|
| 48674 | 462 |
def output_path: Option[Path] = if (do_output) Some(output) else None |
463 |
||
464 |
private val parent = info.parent.getOrElse("")
|
|
| 48418 | 465 |
|
|
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
466 |
private val args_file = File.tmp_file("args")
|
|
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
467 |
File.write(args_file, YXML.string_of_body( |
|
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
468 |
if (is_pure(name)) Options.encode(info.options) |
|
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
469 |
else |
|
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
470 |
{
|
|
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
471 |
import XML.Encode._ |
|
51218
6425a0d3b7ac
support for build passing timings from Scala to ML;
wenzelm
parents:
51045
diff
changeset
|
472 |
pair(list(properties), pair(bool, pair(Options.encode, pair(bool, pair(Path.encode, |
|
6425a0d3b7ac
support for build passing timings from Scala to ML;
wenzelm
parents:
51045
diff
changeset
|
473 |
pair(string, pair(string, list(pair(Options.encode, list(Path.encode))))))))))( |
| 51220 | 474 |
(command_timings, (do_output, (info.options, (verbose, (browser_info, |
|
51218
6425a0d3b7ac
support for build passing timings from Scala to ML;
wenzelm
parents:
51045
diff
changeset
|
475 |
(parent, (name, info.theories)))))))) |
|
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
476 |
})) |
|
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
477 |
|
| 48674 | 478 |
private val env = |
|
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
479 |
Map("INPUT" -> parent, "TARGET" -> name, "OUTPUT" -> Isabelle_System.standard_path(output),
|
|
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
480 |
(if (is_pure(name)) "ISABELLE_PROCESS_OPTIONS" else "ARGS_FILE") -> |
|
50715
8cfd585b9162
prefer old graph browser in Isabelle/jEdit, which still produces better layout;
wenzelm
parents:
50713
diff
changeset
|
481 |
Isabelle_System.posix_path(args_file)) |
|
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
482 |
|
| 48674 | 483 |
private val script = |
|
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
484 |
if (is_pure(name)) {
|
|
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
485 |
if (do_output) "./build " + name + " \"$OUTPUT\"" |
|
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
486 |
else """ rm -f "$OUTPUT"; ./build """ + name |
|
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
487 |
} |
| 48418 | 488 |
else {
|
489 |
""" |
|
490 |
. "$ISABELLE_HOME/lib/scripts/timestart.bash" |
|
491 |
""" + |
|
|
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
492 |
(if (do_output) |
|
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
493 |
""" |
|
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
494 |
"$ISABELLE_PROCESS" -e "Build.build \"$ARGS_FILE\";" -q -w "$INPUT" "$OUTPUT" |
|
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
495 |
""" |
| 48418 | 496 |
else |
|
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
497 |
""" |
|
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
498 |
rm -f "$OUTPUT"; "$ISABELLE_PROCESS" -e "Build.build \"$ARGS_FILE\";" -r -q "$INPUT" |
|
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
499 |
""") + |
| 48418 | 500 |
""" |
501 |
RC="$?" |
|
502 |
||
503 |
. "$ISABELLE_HOME/lib/scripts/timestop.bash" |
|
504 |
||
505 |
if [ "$RC" -eq 0 ]; then |
|
506 |
echo "Finished $TARGET ($TIMES_REPORT)" >&2 |
|
507 |
fi |
|
508 |
||
509 |
exit "$RC" |
|
510 |
""" |
|
511 |
} |
|
| 48674 | 512 |
|
513 |
private val (thread, result) = |
|
| 50845 | 514 |
Simple_Thread.future("build") {
|
515 |
Isabelle_System.bash_env(info.dir.file, env, script, |
|
516 |
out_progress = (line: String) => |
|
| 50847 | 517 |
Library.try_unprefix("\floading_theory = ", line) match {
|
518 |
case Some(theory) => progress.theory(name, theory) |
|
519 |
case None => |
|
520 |
}) |
|
| 50845 | 521 |
} |
| 48674 | 522 |
|
523 |
def terminate: Unit = thread.interrupt |
|
524 |
def is_finished: Boolean = result.is_finished |
|
525 |
||
526 |
@volatile private var timeout = false |
|
| 50207 | 527 |
private val time = info.options.seconds("timeout")
|
| 48674 | 528 |
private val timer: Option[Timer] = |
529 |
if (time.seconds > 0.0) {
|
|
530 |
val t = new Timer("build", true)
|
|
531 |
t.schedule(new TimerTask { def run = { terminate; timeout = true } }, time.ms)
|
|
532 |
Some(t) |
|
533 |
} |
|
534 |
else None |
|
535 |
||
| 50845 | 536 |
def join: Isabelle_System.Bash_Result = |
537 |
{
|
|
538 |
val res = result.join |
|
539 |
||
| 48674 | 540 |
args_file.delete |
541 |
timer.map(_.cancel()) |
|
542 |
||
| 50845 | 543 |
if (res.rc == 130) |
544 |
res.add_err(if (timeout) "*** Timeout" else "*** Interrupt") |
|
545 |
else res |
|
| 48674 | 546 |
} |
| 48364 | 547 |
} |
548 |
||
| 48424 | 549 |
|
|
51045
630c0895d9d1
more efficient inlined properties, especially relevant for voluminous tasks trace;
wenzelm
parents:
50982
diff
changeset
|
550 |
/* inlined properties (YXML) */ |
|
50946
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
551 |
|
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
552 |
object Props |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
553 |
{
|
|
51045
630c0895d9d1
more efficient inlined properties, especially relevant for voluminous tasks trace;
wenzelm
parents:
50982
diff
changeset
|
554 |
def parse(text: String): Properties.T = XML.Decode.properties(YXML.parse_body(text)) |
|
50946
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
555 |
|
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
556 |
def parse_lines(prefix: String, lines: List[String]): List[Properties.T] = |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
557 |
for (line <- lines; s <- Library.try_unprefix(prefix, line)) yield parse(s) |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
558 |
|
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
559 |
def find_parse_line(prefix: String, lines: List[String]): Option[Properties.T] = |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
560 |
lines.find(_.startsWith(prefix)).map(line => parse(line.substring(prefix.length))) |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
561 |
} |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
562 |
|
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
563 |
|
| 50777 | 564 |
/* log files */ |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
565 |
|
| 48505 | 566 |
private val LOG = Path.explode("log")
|
567 |
private def log(name: String): Path = LOG + Path.basic(name) |
|
568 |
private def log_gz(name: String): Path = log(name).ext("gz")
|
|
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
569 |
|
| 50982 | 570 |
private val SESSION_NAME = "\fSession.name = " |
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
571 |
private val SESSION_PARENT_PATH = "\fSession.parent_path = " |
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
572 |
|
|
50946
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
573 |
|
| 50975 | 574 |
sealed case class Log_Info( |
| 51220 | 575 |
name: String, |
576 |
stats: List[Properties.T], |
|
577 |
tasks: List[Properties.T], |
|
578 |
command_timings: List[Properties.T], |
|
579 |
session_timing: Properties.T) |
|
| 50777 | 580 |
|
| 51220 | 581 |
def parse_log(full_stats: Boolean, text: String): Log_Info = |
| 50777 | 582 |
{
|
583 |
val lines = split_lines(text) |
|
| 51223 | 584 |
val xml_cache = new XML.Cache() |
585 |
def parse_lines(prfx: String): List[Properties.T] = |
|
586 |
Props.parse_lines(prfx, lines).map(xml_cache.cache_props) |
|
587 |
||
| 50982 | 588 |
val name = |
589 |
lines.find(_.startsWith(SESSION_NAME)).map(_.substring(SESSION_NAME.length)) getOrElse "" |
|
| 51223 | 590 |
val stats = if (full_stats) parse_lines("\fML_statistics = ") else Nil
|
591 |
val tasks = if (full_stats) parse_lines("\ftask_statistics = ") else Nil
|
|
592 |
val command_timings = parse_lines("\fcommand_timing = ")
|
|
| 51220 | 593 |
val session_timing = Props.find_parse_line("\fTiming = ", lines) getOrElse Nil
|
594 |
Log_Info(name, stats, tasks, command_timings, session_timing) |
|
| 50777 | 595 |
} |
596 |
||
597 |
||
598 |
/* sources and heaps */ |
|
599 |
||
| 48505 | 600 |
private def sources_stamp(digests: List[SHA1.Digest]): String = |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
601 |
digests.map(_.toString).sorted.mkString("sources: ", " ", "")
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
602 |
|
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
603 |
private val no_heap: String = "heap: -" |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
604 |
|
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
605 |
private def heap_stamp(heap: Option[Path]): String = |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
606 |
{
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
607 |
"heap: " + |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
608 |
(heap match {
|
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
609 |
case Some(path) => |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
610 |
val file = path.file |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
611 |
if (file.isFile) file.length.toString + " " + file.lastModified.toString |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
612 |
else "-" |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
613 |
case None => "-" |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
614 |
}) |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
615 |
} |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
616 |
|
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
617 |
private def read_stamps(path: Path): Option[(String, String, String)] = |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
618 |
if (path.is_file) {
|
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
619 |
val stream = new GZIPInputStream (new BufferedInputStream(new FileInputStream(path.file))) |
| 50203 | 620 |
val reader = new BufferedReader(new InputStreamReader(stream, UTF8.charset)) |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
621 |
val (s, h1, h2) = |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
622 |
try { (reader.readLine, reader.readLine, reader.readLine) }
|
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
623 |
finally { reader.close }
|
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
624 |
if (s != null && s.startsWith("sources: ") &&
|
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
625 |
h1 != null && h1.startsWith("heap: ") &&
|
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
626 |
h2 != null && h2.startsWith("heap: ")) Some((s, h1, h2))
|
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
627 |
else None |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
628 |
} |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
629 |
else None |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
630 |
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
631 |
|
| 48425 | 632 |
/* build */ |
| 48424 | 633 |
|
| 48509 | 634 |
def build( |
| 50366 | 635 |
progress: Build.Progress, |
|
50404
898cac1dad5e
avoid startup within GUI thread -- it is only required later for dialog;
wenzelm
parents:
50367
diff
changeset
|
636 |
options: Options, |
| 49131 | 637 |
requirements: Boolean = false, |
| 48509 | 638 |
all_sessions: Boolean = false, |
|
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
639 |
build_heap: Boolean = false, |
| 48595 | 640 |
clean_build: Boolean = false, |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
641 |
more_dirs: List[(Boolean, Path)] = Nil, |
| 48509 | 642 |
session_groups: List[String] = Nil, |
643 |
max_jobs: Int = 1, |
|
| 48903 | 644 |
list_files: Boolean = false, |
| 48509 | 645 |
no_build: Boolean = false, |
646 |
system_mode: Boolean = false, |
|
647 |
verbose: Boolean = false, |
|
648 |
sessions: List[String] = Nil): Int = |
|
| 48341 | 649 |
{
|
| 51220 | 650 |
/* session tree and dependencies */ |
651 |
||
| 49131 | 652 |
val full_tree = find_sessions(options, more_dirs) |
653 |
val (selected, selected_tree) = |
|
654 |
full_tree.selection(requirements, all_sessions, session_groups, sessions) |
|
655 |
||
| 50366 | 656 |
val deps = dependencies(progress, true, verbose, list_files, selected_tree) |
| 48368 | 657 |
|
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
658 |
def make_stamp(name: String): String = |
| 49131 | 659 |
sources_stamp(selected_tree(name).entry_digest :: deps.sources(name)) |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
660 |
|
| 51220 | 661 |
|
662 |
/* persistent information */ |
|
663 |
||
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
664 |
val (input_dirs, output_dir, browser_info) = |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
665 |
if (system_mode) {
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
666 |
val output_dir = Path.explode("~~/heaps/$ML_IDENTIFIER")
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
667 |
(List(output_dir), output_dir, Path.explode("~~/browser_info"))
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
668 |
} |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
669 |
else {
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
670 |
val output_dir = Path.explode("$ISABELLE_OUTPUT")
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
671 |
(output_dir :: Isabelle_System.find_logics_dirs(), output_dir, |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
672 |
Path.explode("$ISABELLE_BROWSER_INFO"))
|
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
673 |
} |
| 48363 | 674 |
|
| 51221 | 675 |
def find_log(name: String): Option[(Path, Path)] = |
676 |
input_dirs.find(dir => (dir + log(name)).is_file).map(dir => (dir, dir + log(name))) |
|
| 51220 | 677 |
|
678 |
||
679 |
/* queue with scheduling information */ |
|
680 |
||
|
51230
19192615911e
option parallel_proofs_reuse_timing controls reuse of log information -- since it is not always beneficial for performance;
wenzelm
parents:
51229
diff
changeset
|
681 |
def load_timings(name: String): (List[Properties.T], Double) = |
| 51221 | 682 |
{
|
683 |
val (path, text) = |
|
684 |
find_log(name + ".gz") match {
|
|
685 |
case Some((_, path)) => (path, File.read_gzip(path)) |
|
686 |
case None => |
|
687 |
find_log(name) match {
|
|
688 |
case Some((_, path)) => (path, File.read(path)) |
|
689 |
case None => (Path.current, "") |
|
690 |
} |
|
691 |
} |
|
|
51244
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
692 |
|
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
693 |
def ignore_error(msg: String): (List[Properties.T], Double) = |
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
694 |
{
|
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
695 |
java.lang.System.err.println("### Ignoring bad log file: " + path +
|
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
696 |
(if (msg == "") "" else "\n" + msg)) |
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
697 |
(Nil, 0.0) |
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
698 |
} |
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
699 |
|
| 51221 | 700 |
try {
|
701 |
val info = parse_log(false, text) |
|
702 |
val session_timing = Markup.Elapsed.unapply(info.session_timing) getOrElse 0.0 |
|
703 |
(info.command_timings, session_timing) |
|
| 51220 | 704 |
} |
| 51221 | 705 |
catch {
|
|
51244
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
706 |
case ERROR(msg) => ignore_error(msg) |
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
707 |
case _: XML.XML_Atom | _: XML.XML_Body => ignore_error("")
|
| 51221 | 708 |
} |
709 |
} |
|
| 51220 | 710 |
|
|
51230
19192615911e
option parallel_proofs_reuse_timing controls reuse of log information -- since it is not always beneficial for performance;
wenzelm
parents:
51229
diff
changeset
|
711 |
val queue = Queue(selected_tree, load_timings) |
| 51220 | 712 |
|
713 |
||
714 |
/* main build process */ |
|
715 |
||
| 48373 | 716 |
// prepare log dir |
|
50893
d55eb82ae77b
Isabelle_System.mkdirs with explicit error checking (in accordance to ML version), e.g. relevant with read-only DMG file-system on Mac OS X;
wenzelm
parents:
50847
diff
changeset
|
717 |
Isabelle_System.mkdirs(output_dir + LOG) |
| 48373 | 718 |
|
| 48595 | 719 |
// optional cleanup |
720 |
if (clean_build) {
|
|
| 49131 | 721 |
for (name <- full_tree.graph.all_succs(selected)) {
|
| 48595 | 722 |
val files = |
723 |
List(Path.basic(name), log(name), log_gz(name)).map(output_dir + _).filter(_.is_file) |
|
| 50366 | 724 |
if (!files.isEmpty) progress.echo("Cleaning " + name + " ...")
|
725 |
if (!files.forall(p => p.file.delete)) progress.echo(name + " FAILED to delete") |
|
| 48595 | 726 |
} |
727 |
} |
|
728 |
||
| 48425 | 729 |
// scheduler loop |
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
730 |
case class Result(current: Boolean, parent_path: Option[String], heap: String, rc: Int) |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
731 |
|
| 50366 | 732 |
def sleep(): Unit = Thread.sleep(500) |
733 |
||
| 48425 | 734 |
@tailrec def loop( |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
735 |
pending: Queue, |
| 48674 | 736 |
running: Map[String, (String, Job)], |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
737 |
results: Map[String, Result]): Map[String, Result] = |
| 48425 | 738 |
{
|
739 |
if (pending.is_empty) results |
|
| 51253 | 740 |
else {
|
741 |
if (progress.stopped) |
|
742 |
for ((_, (_, job)) <- running) job.terminate |
|
743 |
||
| 48674 | 744 |
running.find({ case (_, (_, job)) => job.is_finished }) match {
|
745 |
case Some((name, (parent_heap, job))) => |
|
| 50367 | 746 |
//{{{ finish job
|
| 48424 | 747 |
|
| 50845 | 748 |
val res = job.join |
749 |
progress.echo(res.err) |
|
| 48373 | 750 |
|
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
751 |
val (parent_path, heap) = |
| 50845 | 752 |
if (res.rc == 0) {
|
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
753 |
(output_dir + log(name)).file.delete |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
754 |
|
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
755 |
val sources = make_stamp(name) |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
756 |
val heap = heap_stamp(job.output_path) |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
757 |
File.write_gzip(output_dir + log_gz(name), |
| 50845 | 758 |
sources + "\n" + parent_heap + "\n" + heap + "\n" + res.out) |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
759 |
|
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
760 |
val parent_path = |
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
761 |
if (job.info.options.bool("browser_info"))
|
| 50982 | 762 |
res.out_lines.find(_.startsWith(SESSION_PARENT_PATH)) |
763 |
.map(_.substring(SESSION_PARENT_PATH.length)) |
|
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
764 |
else None |
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
765 |
|
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
766 |
(parent_path, heap) |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
767 |
} |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
768 |
else {
|
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
769 |
(output_dir + Path.basic(name)).file.delete |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
770 |
(output_dir + log_gz(name)).file.delete |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
771 |
|
| 50845 | 772 |
File.write(output_dir + log(name), res.out) |
| 50366 | 773 |
progress.echo(name + " FAILED") |
| 50845 | 774 |
if (res.rc != 130) {
|
| 50366 | 775 |
progress.echo("(see also " + (output_dir + log(name)).file.toString + ")")
|
| 50845 | 776 |
val lines = res.out_lines.filterNot(_.startsWith("\f"))
|
|
50713
dae523e6198b
tuned message -- suppress inlined system information;
wenzelm
parents:
50707
diff
changeset
|
777 |
val tail = lines.drop(lines.length - 20 max 0) |
| 50366 | 778 |
progress.echo("\n" + cat_lines(tail))
|
| 48661 | 779 |
} |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
780 |
|
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
781 |
(None, no_heap) |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
782 |
} |
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
783 |
loop(pending - name, running - name, |
| 50845 | 784 |
results + (name -> Result(false, parent_path, heap, res.rc))) |
| 50367 | 785 |
//}}} |
| 48547 | 786 |
case None if (running.size < (max_jobs max 1)) => |
| 50367 | 787 |
//{{{ check/start next job
|
| 48547 | 788 |
pending.dequeue(running.isDefinedAt(_)) match {
|
789 |
case Some((name, info)) => |
|
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
790 |
val parent_result = |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
791 |
info.parent match {
|
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
792 |
case None => Result(true, None, no_heap, 0) |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
793 |
case Some(parent) => results(parent) |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
794 |
} |
| 48547 | 795 |
val output = output_dir + Path.basic(name) |
796 |
val do_output = build_heap || queue.is_inner(name) |
|
797 |
||
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
798 |
val (current, heap) = |
| 48547 | 799 |
{
|
| 51221 | 800 |
find_log(name + ".gz") match {
|
801 |
case Some((dir, path)) => |
|
| 51220 | 802 |
read_stamps(path) match {
|
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
803 |
case Some((s, h1, h2)) => |
| 51221 | 804 |
val heap = heap_stamp(Some(dir + Path.basic(name))) |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
805 |
(s == make_stamp(name) && h1 == parent_result.heap && h2 == heap && |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
806 |
!(do_output && heap == no_heap), heap) |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
807 |
case None => (false, no_heap) |
| 48547 | 808 |
} |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
809 |
case None => (false, no_heap) |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
810 |
} |
| 48547 | 811 |
} |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
812 |
val all_current = current && parent_result.current |
|
48528
784c6f63d79c
proper all_current, which regards parent status as well;
wenzelm
parents:
48511
diff
changeset
|
813 |
|
| 48547 | 814 |
if (all_current) |
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
815 |
loop(pending - name, running, results + (name -> Result(true, None, heap, 0))) |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
816 |
else if (no_build) {
|
| 50366 | 817 |
if (verbose) progress.echo("Skipping " + name + " ...")
|
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
818 |
loop(pending - name, running, results + (name -> Result(false, None, heap, 1))) |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
819 |
} |
| 51253 | 820 |
else if (parent_result.rc == 0 && !progress.stopped) {
|
| 50366 | 821 |
progress.echo((if (do_output) "Building " else "Running ") + name + " ...") |
| 51220 | 822 |
val job = |
823 |
new Job(progress, name, info, output, do_output, verbose, browser_info, |
|
824 |
queue.command_timings(name)) |
|
| 48674 | 825 |
loop(pending, running + (name -> (parent_result.heap, job)), results) |
| 48547 | 826 |
} |
827 |
else {
|
|
| 50366 | 828 |
progress.echo(name + " CANCELLED") |
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
829 |
loop(pending - name, running, results + (name -> Result(false, None, heap, 1))) |
| 48547 | 830 |
} |
831 |
case None => sleep(); loop(pending, running, results) |
|
| 48425 | 832 |
} |
| 50367 | 833 |
///}}} |
| 48425 | 834 |
case None => sleep(); loop(pending, running, results) |
| 48373 | 835 |
} |
| 51253 | 836 |
} |
| 48425 | 837 |
} |
838 |
||
| 51220 | 839 |
|
840 |
/* build results */ |
|
841 |
||
| 48583 | 842 |
val results = |
843 |
if (deps.is_empty) {
|
|
| 50366 | 844 |
progress.echo("### Nothing to build")
|
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
845 |
Map.empty[String, Result] |
| 48583 | 846 |
} |
847 |
else loop(queue, Map.empty, Map.empty) |
|
848 |
||
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
849 |
val session_entries = |
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
850 |
(for ((name, res) <- results.iterator if res.parent_path.isDefined) |
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
851 |
yield (res.parent_path.get, name)).toList.groupBy(_._1).map( |
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
852 |
{ case (p, es) => (p, es.map(_._2).sorted) })
|
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
853 |
for ((p, names) <- session_entries) |
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
854 |
Present.update_index(browser_info + Path.explode(p), names) |
|
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
855 |
|
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
856 |
val rc = (0 /: results)({ case (rc1, (_, res)) => rc1 max res.rc })
|
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
857 |
if (rc != 0 && (verbose || !no_build)) {
|
| 48552 | 858 |
val unfinished = |
| 49951 | 859 |
(for ((name, res) <- results.iterator if res.rc != 0) yield name).toList |
860 |
.sorted(scala.math.Ordering.String) // FIXME scala-2.10.0-RC1 |
|
| 50366 | 861 |
progress.echo("Unfinished session(s): " + commas(unfinished))
|
| 48473 | 862 |
} |
863 |
rc |
|
| 48341 | 864 |
} |
865 |
||
866 |
||
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
867 |
/* command line entry point */ |
| 48341 | 868 |
|
869 |
def main(args: Array[String]) |
|
870 |
{
|
|
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
871 |
Command_Line.tool {
|
|
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
872 |
args.toList match {
|
|
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
873 |
case |
| 49131 | 874 |
Properties.Value.Boolean(requirements) :: |
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
875 |
Properties.Value.Boolean(all_sessions) :: |
|
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
876 |
Properties.Value.Boolean(build_heap) :: |
| 48595 | 877 |
Properties.Value.Boolean(clean_build) :: |
| 48425 | 878 |
Properties.Value.Int(max_jobs) :: |
| 48903 | 879 |
Properties.Value.Boolean(list_files) :: |
| 48469 | 880 |
Properties.Value.Boolean(no_build) :: |
|
48447
ef600ce4559c
added system build mode: produce output in ISABELLE_HOME;
wenzelm
parents:
48425
diff
changeset
|
881 |
Properties.Value.Boolean(system_mode) :: |
| 48425 | 882 |
Properties.Value.Boolean(verbose) :: |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
883 |
Command_Line.Chunks(select_dirs, include_dirs, session_groups, build_options, sessions) => |
|
50404
898cac1dad5e
avoid startup within GUI thread -- it is only required later for dialog;
wenzelm
parents:
50367
diff
changeset
|
884 |
val options = (Options.init() /: build_options)(_ + _) |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
885 |
val dirs = |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
886 |
select_dirs.map(d => (true, Path.explode(d))) ::: |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
887 |
include_dirs.map(d => (false, Path.explode(d))) |
| 51252 | 888 |
val progress = new Build.Console_Progress(verbose) |
889 |
progress.interrupt_handler {
|
|
890 |
build(progress, options, requirements, all_sessions, |
|
891 |
build_heap, clean_build, dirs, session_groups, max_jobs, list_files, no_build, |
|
892 |
system_mode, verbose, sessions) |
|
893 |
} |
|
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
894 |
case _ => error("Bad arguments:\n" + cat_lines(args))
|
| 48341 | 895 |
} |
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
896 |
} |
| 48341 | 897 |
} |
| 48276 | 898 |
} |
899 |