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