author | wenzelm |
Mon, 05 May 2014 20:10:33 +0200 | |
changeset 56871 | d06ff36b4fa7 |
parent 56861 | 5f827142d89a |
child 56873 | f7c793b7fe7d |
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 |
||
48548 | 11 |
import java.io.{BufferedInputStream, FileInputStream, |
48494 | 12 |
BufferedReader, InputStreamReader, IOException} |
13 |
import java.util.zip.GZIPInputStream |
|
48335 | 14 |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
15 |
import scala.collection.SortedSet |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
16 |
import scala.collection.mutable |
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 |
{ |
56831
e3ccf0809d51
prefer scala.Console with its support for thread-local redirection;
wenzelm
parents:
56824
diff
changeset
|
35 |
override def echo(msg: String) { Console.println(msg) } |
50846
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
36 |
override def theory(session: String, theory: String): Unit = |
529e652d389d
more uniform theory progress in build -v and build_dialog;
wenzelm
parents:
50845
diff
changeset
|
37 |
if (verbose) echo(session + ": theory " + theory) |
51252 | 38 |
|
39 |
@volatile private var is_stopped = false |
|
56860 | 40 |
def interrupt_handler[A](e: => A): A = POSIX_Interrupt.handler { is_stopped = true } { e } |
56837
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
41 |
override def stopped: Boolean = |
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
42 |
{ |
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
43 |
if (Thread.interrupted) is_stopped = true |
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
44 |
is_stopped |
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
45 |
} |
50366 | 46 |
} |
47 |
||
48 |
||
49 |
||
48337
9c7f8e5805b4
cumulate semantic Session_Info, based on syntactic Session_Entry;
wenzelm
parents:
48336
diff
changeset
|
50 |
/** session information **/ |
48334 | 51 |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
52 |
// external version |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
53 |
abstract class Entry |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
54 |
sealed case class Chapter(name: String) extends Entry |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
55 |
sealed case class Session_Entry( |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
56 |
pos: Position.T, |
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
57 |
name: String, |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
58 |
groups: List[String], |
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
59 |
path: String, |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
60 |
parent: Option[String], |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
61 |
description: String, |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
62 |
options: List[Options.Spec], |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
63 |
theories: List[(Boolean, List[Options.Spec], List[String])], |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
64 |
files: List[String], |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
65 |
document_files: List[(String, String)]) extends Entry |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
66 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
67 |
// internal version |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
68 |
sealed case class Session_Info( |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
69 |
chapter: String, |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
70 |
select: Boolean, |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
71 |
pos: Position.T, |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
72 |
groups: List[String], |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
73 |
dir: Path, |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
74 |
parent: Option[String], |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
75 |
description: String, |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
76 |
options: Options, |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
77 |
theories: List[(Boolean, Options, List[Path])], |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
78 |
files: List[Path], |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
79 |
document_files: List[(Path, Path)], |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
80 |
entry_digest: SHA1.Digest) |
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 |
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
|
83 |
|
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
84 |
def session_info(options: Options, select: Boolean, dir: Path, |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
85 |
chapter: String, entry: Session_Entry): (String, Session_Info) = |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
86 |
try { |
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
87 |
val name = entry.name |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
88 |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
89 |
if (name == "") error("Bad session name") |
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
90 |
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
|
91 |
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
|
92 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
93 |
val session_options = options ++ entry.options |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
94 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
95 |
val theories = |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
96 |
entry.theories.map({ case (global, opts, thys) => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
97 |
(global, session_options ++ opts, thys.map(Path.explode(_))) }) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
98 |
val files = entry.files.map(Path.explode(_)) |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
99 |
val document_files = |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
100 |
entry.document_files.map({ case (s1, s2) => (Path.explode(s1), Path.explode(s2)) }) |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
101 |
|
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
102 |
val entry_digest = |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
103 |
SHA1.digest((chapter, name, entry.parent, entry.options, |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
104 |
entry.theories, entry.files, entry.document_files).toString) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
105 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
106 |
val info = |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
107 |
Session_Info(chapter, select, entry.pos, entry.groups, dir + Path.explode(entry.path), |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
108 |
entry.parent, entry.description, session_options, theories, files, |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
109 |
document_files, entry_digest) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
110 |
|
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
111 |
(name, info) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
112 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
113 |
catch { |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
114 |
case ERROR(msg) => |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
115 |
error(msg + "\nThe error(s) above occurred in session entry " + |
48992 | 116 |
quote(entry.name) + Position.here(entry.pos)) |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
117 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
118 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
119 |
|
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
120 |
/* session tree */ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
121 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
122 |
object Session_Tree |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
123 |
{ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
124 |
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
|
125 |
{ |
48680 | 126 |
val graph1 = |
127 |
(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
|
128 |
case (graph, (name, info)) => |
48680 | 129 |
if (graph.defined(name)) |
54939 | 130 |
error("Duplicate session " + quote(name) + Position.here(info.pos) + |
131 |
Position.here(graph.get_node(name).pos)) |
|
48680 | 132 |
else graph.new_node(name, info) |
133 |
} |
|
134 |
val graph2 = |
|
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
135 |
(graph1 /: graph1.iterator) { |
48680 | 136 |
case (graph, (name, (info, _))) => |
137 |
info.parent match { |
|
138 |
case None => graph |
|
139 |
case Some(parent) => |
|
140 |
if (!graph.defined(parent)) |
|
141 |
error("Bad parent session " + quote(parent) + " for " + |
|
48992 | 142 |
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
|
143 |
|
48680 | 144 |
try { graph.add_edge_acyclic(parent, name) } |
145 |
catch { |
|
146 |
case exn: Graph.Cycles[_] => |
|
147 |
error(cat_lines(exn.cycles.map(cycle => |
|
148 |
"Cyclic session dependency of " + |
|
149 |
cycle.map(c => quote(c.toString)).mkString(" via "))) + |
|
48992 | 150 |
Position.here(info.pos)) |
48680 | 151 |
} |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
152 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
153 |
} |
48680 | 154 |
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
|
155 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
156 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
157 |
|
48680 | 158 |
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
|
159 |
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
|
160 |
{ |
48680 | 161 |
def apply(name: String): Session_Info = graph.get_node(name) |
162 |
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
|
163 |
|
49131 | 164 |
def selection(requirements: Boolean, all_sessions: Boolean, |
165 |
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
|
166 |
{ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
167 |
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
|
168 |
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
|
169 |
|
49131 | 170 |
val pre_selected = |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
171 |
{ |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
172 |
if (all_sessions) graph.keys |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
173 |
else { |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
174 |
val select_group = session_groups.toSet |
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
175 |
val select = sessions.toSet |
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
176 |
(for { |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
177 |
(name, (info, _)) <- graph.iterator |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
178 |
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
|
179 |
} yield name).toList |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
180 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
181 |
} |
49131 | 182 |
val selected = |
183 |
if (requirements) (graph.all_preds(pre_selected).toSet -- pre_selected).toList |
|
184 |
else pre_selected |
|
185 |
||
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
186 |
val graph1 = graph.restrict(graph.all_preds(selected).toSet) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
187 |
(selected, new Session_Tree(graph1)) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
188 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
189 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
190 |
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
|
191 |
graph.topological_order.map(name => (name, apply(name))) |
48794 | 192 |
|
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
193 |
override def toString: String = graph.keys_iterator.mkString("Session_Tree(", ", ", ")") |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
194 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
195 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
196 |
|
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
197 |
/* parser */ |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
198 |
|
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
199 |
val chapter_default = "Unsorted" |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
200 |
|
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
201 |
private val CHAPTER = "chapter" |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
202 |
private val SESSION = "session" |
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
203 |
private val IN = "in" |
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
204 |
private val DESCRIPTION = "description" |
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
205 |
private val OPTIONS = "options" |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
206 |
private val GLOBAL_THEORIES = "global_theories" |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
207 |
private val THEORIES = "theories" |
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
208 |
private val FILES = "files" |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
209 |
private val DOCUMENT_FILES = "document_files" |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
210 |
|
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
211 |
lazy val root_syntax = |
48738
f8c1a5b9488f
simplified session specifications: names are taken verbatim and current directory is default;
wenzelm
parents:
48737
diff
changeset
|
212 |
Outer_Syntax.init() + "(" + ")" + "+" + "," + "=" + "[" + "]" + |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
213 |
(CHAPTER, Keyword.THY_DECL) + (SESSION, Keyword.THY_DECL) + |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
214 |
IN + DESCRIPTION + OPTIONS + GLOBAL_THEORIES + THEORIES + FILES + DOCUMENT_FILES |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
215 |
|
56780
e76467fed375
tuned signature -- accomodate operations of ROOT files;
wenzelm
parents:
56779
diff
changeset
|
216 |
object Parser extends Parse.Parser |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
217 |
{ |
56780
e76467fed375
tuned signature -- accomodate operations of ROOT files;
wenzelm
parents:
56779
diff
changeset
|
218 |
private val chapter: Parser[Chapter] = |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
219 |
{ |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
220 |
val chapter_name = atom("chapter name", _.is_name) |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
221 |
|
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
222 |
command(CHAPTER) ~! chapter_name ^^ { case _ ~ a => Chapter(a) } |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
223 |
} |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
224 |
|
56780
e76467fed375
tuned signature -- accomodate operations of ROOT files;
wenzelm
parents:
56779
diff
changeset
|
225 |
private val session_entry: Parser[Session_Entry] = |
48675
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 |
val session_name = atom("session name", _.is_name) |
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 |
val option = |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
230 |
name ~ opt(keyword("=") ~! name ^^ { case _ ~ x => x }) ^^ { case x ~ y => (x, y) } |
48862 | 231 |
val options = keyword("[") ~> rep1sep(option, keyword(",")) <~ keyword("]") |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
232 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
233 |
val theories = |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
234 |
(keyword(GLOBAL_THEORIES) | keyword(THEORIES)) ~! |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
235 |
((options | success(Nil)) ~ rep(theory_xname)) ^^ |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
236 |
{ case x ~ (y ~ z) => (x == GLOBAL_THEORIES, y, z) } |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
237 |
|
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
238 |
val document_files = |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
239 |
keyword(DOCUMENT_FILES) ~! |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
240 |
((keyword("(") ~! (keyword(IN) ~! (path ~ keyword(")"))) ^^ |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
241 |
{ case _ ~ (_ ~ (x ~ _)) => x } | success("document")) ~ |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
242 |
rep1(path)) ^^ { case _ ~ (x ~ y) => y.map((x, _)) } |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
243 |
|
48912 | 244 |
command(SESSION) ~! |
245 |
(session_name ~ |
|
246 |
((keyword("(") ~! (rep1(name) <~ keyword(")")) ^^ { case _ ~ x => x }) | success(Nil)) ~ |
|
247 |
((keyword(IN) ~! path ^^ { case _ ~ x => x }) | success(".")) ~ |
|
248 |
(keyword("=") ~! |
|
249 |
(opt(session_name ~! keyword("+") ^^ { case x ~ _ => x }) ~ |
|
250 |
((keyword(DESCRIPTION) ~! text ^^ { case _ ~ x => x }) | success("")) ~ |
|
251 |
((keyword(OPTIONS) ~! options ^^ { case _ ~ x => x }) | success(Nil)) ~ |
|
48916 | 252 |
rep1(theories) ~ |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
253 |
((keyword(FILES) ~! rep1(path) ^^ { case _ ~ x => x }) | success(Nil)) ~ |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
254 |
(rep(document_files) ^^ (x => x.flatten))))) ^^ |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
255 |
{ case pos ~ (a ~ b ~ c ~ (_ ~ (d ~ e ~ f ~ g ~ h ~ i))) => |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
256 |
Session_Entry(pos, a, b, c, d, e, f, g, h, i) } |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
257 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
258 |
|
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
259 |
def parse_entries(root: Path): List[(String, Session_Entry)] = |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
260 |
{ |
48713
de26cf3191a3
more token markers, based on actual outer syntax;
wenzelm
parents:
48710
diff
changeset
|
261 |
val toks = root_syntax.scan(File.read(root)) |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
262 |
|
56464 | 263 |
parse_all(rep(chapter | session_entry), Token.reader(toks, root.implode)) match { |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
264 |
case Success(result, _) => |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
265 |
var chapter = chapter_default |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
266 |
val entries = new mutable.ListBuffer[(String, Session_Entry)] |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
267 |
result.foreach { |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
268 |
case Chapter(name) => chapter = name |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
269 |
case session_entry: Session_Entry => entries += ((chapter, session_entry)) |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
270 |
} |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
271 |
entries.toList |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
272 |
case bad => error(bad.toString) |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
273 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
274 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
275 |
} |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
276 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
277 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
278 |
/* find sessions within certain directories */ |
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
279 |
|
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
280 |
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
|
281 |
private val ROOTS = Path.explode("ROOTS") |
48675
10f5303f86e5
clarified Session_Entry vs. Session_Info with related parsing operations;
wenzelm
parents:
48674
diff
changeset
|
282 |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
283 |
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
|
284 |
(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
|
285 |
|
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
286 |
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
|
287 |
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
|
288 |
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
|
289 |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
290 |
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
|
291 |
{ |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
292 |
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
|
293 |
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
|
294 |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
295 |
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
|
296 |
{ |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
297 |
val root = dir + ROOT |
51397
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
298 |
if (root.is_file) |
03b586ee5930
support for 'chapter' specifications within session ROOT;
wenzelm
parents:
51300
diff
changeset
|
299 |
Parser.parse_entries(root).map(p => session_info(options, select, dir, p._1, p._2)) |
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
300 |
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
|
301 |
} |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
302 |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
303 |
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
|
304 |
{ |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
305 |
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
|
306 |
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
|
307 |
for { |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
308 |
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
|
309 |
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
|
310 |
dir1 = |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
311 |
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
|
312 |
catch { |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
313 |
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
|
314 |
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
|
315 |
} |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
316 |
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
|
317 |
} 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
|
318 |
} |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
319 |
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
|
320 |
} |
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
321 |
|
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
322 |
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
|
323 |
|
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
324 |
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
|
325 |
|
48684
9170e10c651e
re-introduced ROOTS catalog files (cf. 47330b712f8f) which help to organize AFP or make -d options persistent;
wenzelm
parents:
48680
diff
changeset
|
326 |
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
|
327 |
for { |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
328 |
(select, dir) <- default_dirs ::: more_dirs |
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
329 |
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
|
330 |
} yield info) |
48349
a78e5d399599
support Session.Queue with ordering and dependencies;
wenzelm
parents:
48347
diff
changeset
|
331 |
} |
48334 | 332 |
|
48337
9c7f8e5805b4
cumulate semantic Session_Info, based on syntactic Session_Entry;
wenzelm
parents:
48336
diff
changeset
|
333 |
|
48424 | 334 |
|
335 |
/** build **/ |
|
336 |
||
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
337 |
/* queue */ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
338 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
339 |
object Queue |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
340 |
{ |
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
|
341 |
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
|
342 |
{ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
343 |
val graph = tree.graph |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56208
diff
changeset
|
344 |
val sessions = graph.keys |
51220 | 345 |
|
51300
7cdb86c8eb30
load timings in parallel for improved performance;
wenzelm
parents:
51297
diff
changeset
|
346 |
val timings = |
7cdb86c8eb30
load timings in parallel for improved performance;
wenzelm
parents:
51297
diff
changeset
|
347 |
sessions.par.map((name: String) => |
51564
bfdc3f720bd6
discontinued obsolete parallel_proofs_reuse_timing;
wenzelm
parents:
51418
diff
changeset
|
348 |
Exn.capture { (name, load_timings(name)) }).toList.map(Exn.release(_)) |
51220 | 349 |
val command_timings = |
350 |
Map(timings.map({ case (name, (ts, _)) => (name, ts) }): _*).withDefaultValue(Nil) |
|
351 |
val session_timing = |
|
352 |
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
|
353 |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
354 |
def outdegree(name: String): Int = graph.imm_succs(name).size |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
355 |
def timeout(name: String): Double = tree(name).options.real("timeout") |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
356 |
|
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
357 |
object Ordering extends scala.math.Ordering[String] |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
358 |
{ |
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
359 |
def compare_timing(name1: String, name2: String): Int = |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
360 |
{ |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
361 |
val t1 = session_timing(name1) |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
362 |
val t2 = session_timing(name2) |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
363 |
if (t1 == 0.0 || t2 == 0.0) 0 |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
364 |
else t1 compare t2 |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
365 |
} |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
366 |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
367 |
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
|
368 |
outdegree(name2) compare outdegree(name1) match { |
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
369 |
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
|
370 |
compare_timing(name2, name1) match { |
51220 | 371 |
case 0 => |
372 |
timeout(name2) compare timeout(name1) match { |
|
373 |
case 0 => name1 compare name2 |
|
374 |
case ord => ord |
|
375 |
} |
|
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
376 |
case ord => ord |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
377 |
} |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
378 |
case ord => ord |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
379 |
} |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
380 |
} |
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
381 |
|
51220 | 382 |
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
|
383 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
384 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
385 |
|
51220 | 386 |
final class Queue private( |
387 |
graph: Graph[String, Session_Info], |
|
388 |
order: SortedSet[String], |
|
389 |
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
|
390 |
{ |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
391 |
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
|
392 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
393 |
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
|
394 |
|
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
395 |
def - (name: String): Queue = |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
396 |
new Queue(graph.del_node(name), |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
397 |
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
|
398 |
command_timings) |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
399 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
400 |
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
|
401 |
{ |
51227
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
402 |
val it = order.iterator.dropWhile(name => |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
403 |
skip(name) |
88c96e836ed6
prefer comparison of session timing, if this is known already;
wenzelm
parents:
51223
diff
changeset
|
404 |
|| !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
|
405 |
|| !graph.is_minimal(name)) |
48680 | 406 |
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
|
407 |
else None |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
408 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
409 |
} |
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
410 |
|
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
411 |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
412 |
/* source dependencies and static content */ |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
413 |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
414 |
sealed case class Session_Content( |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
415 |
loaded_theories: Set[String], |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
416 |
known_theories: Map[String, Document.Node.Name], |
52439
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
417 |
keywords: Thy_Header.Keywords, |
48660
730ca503e955
static outer syntax based on session specifications;
wenzelm
parents:
48650
diff
changeset
|
418 |
syntax: Outer_Syntax, |
51297 | 419 |
sources: List[(Path, SHA1.Digest)]) |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
420 |
|
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
421 |
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
|
422 |
{ |
48583 | 423 |
def is_empty: Boolean = deps.isEmpty |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
424 |
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
|
425 |
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
|
426 |
} |
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
427 |
|
52114 | 428 |
def dependencies(progress: Progress, inlined_files: Boolean, |
50366 | 429 |
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
|
430 |
Deps((Map.empty[String, Session_Content] /: tree.topological_order)( |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
431 |
{ case (deps, (name, info)) => |
56668
56335a8e2e8b
interruptible dependencies, which can take a few seconds;
wenzelm
parents:
56667
diff
changeset
|
432 |
if (progress.stopped) throw Exn.Interrupt() |
56335a8e2e8b
interruptible dependencies, which can take a few seconds;
wenzelm
parents:
56667
diff
changeset
|
433 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
434 |
try { |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
435 |
val (loaded_theories0, known_theories0, syntax0) = |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
436 |
info.parent.map(deps(_)) match { |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
437 |
case None => |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
438 |
(Set.empty[String], Map.empty[String, Document.Node.Name], Outer_Syntax.init()) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
439 |
case Some(parent) => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
440 |
(parent.loaded_theories, parent.known_theories, parent.syntax) |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
441 |
} |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
442 |
val resources = new Resources(loaded_theories0, known_theories0, syntax0) |
56208 | 443 |
val thy_info = new Thy_Info(resources) |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
444 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
445 |
if (verbose || list_files) { |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
446 |
val groups = |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
447 |
if (info.groups.isEmpty) "" |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
448 |
else info.groups.mkString(" (", " ", ")") |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
449 |
progress.echo("Session " + info.chapter + "/" + name + groups) |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
450 |
} |
48478 | 451 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
452 |
val thy_deps = |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
453 |
{ |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
454 |
val root_theories = |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
455 |
info.theories.flatMap({ |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
456 |
case (global, _, thys) => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
457 |
thys.map(thy => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
458 |
(resources.node_name( |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
459 |
if (global) "" else name, info.dir + Resources.thy_path(thy)), info.pos)) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
460 |
}) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
461 |
val thy_deps = thy_info.dependencies(name, root_theories) |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
462 |
|
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
463 |
thy_deps.errors match { |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
464 |
case Nil => thy_deps |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
465 |
case errs => error(cat_lines(errs)) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
466 |
} |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
467 |
} |
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
468 |
|
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
469 |
val known_theories = |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
470 |
(known_theories0 /: thy_deps.deps)({ case (known, dep) => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
471 |
val name = dep.name |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
472 |
known.get(name.theory) match { |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
473 |
case Some(name1) if name != name1 => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
474 |
error("Duplicate theory " + quote(name.node) + " vs. " + quote(name1.node)) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
475 |
case _ => |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
476 |
known + (name.theory -> name) + (Long_Name.base_name(name.theory) -> name) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
477 |
} |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
478 |
}) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
479 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
480 |
val loaded_theories = thy_deps.loaded_theories |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
481 |
val keywords = thy_deps.keywords |
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56392
diff
changeset
|
482 |
val syntax = thy_deps.syntax.asInstanceOf[Outer_Syntax] |
48660
730ca503e955
static outer syntax based on session specifications;
wenzelm
parents:
48650
diff
changeset
|
483 |
|
56392 | 484 |
val loaded_files = if (inlined_files) thy_deps.loaded_files else Nil |
48903 | 485 |
|
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
486 |
val all_files = |
56392 | 487 |
(thy_deps.deps.map(dep => Path.explode(dep.name.node)) ::: loaded_files ::: |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
488 |
info.files.map(file => info.dir + file) ::: |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
489 |
info.document_files.map(file => info.dir + file._1 + file._2)).map(_.expand) |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
490 |
|
56824
5ae68f53b7c2
discontinued adhoc check (see also ea8343187225);
wenzelm
parents:
56801
diff
changeset
|
491 |
if (list_files) |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
492 |
progress.echo(cat_lines(all_files.map(_.implode).sorted.map(" " + _))) |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
493 |
|
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
494 |
val sources = all_files.map(p => (p, SHA1.digest(p.file))) |
48903 | 495 |
|
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
496 |
val content = |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
497 |
Session_Content(loaded_theories, known_theories, keywords, syntax, sources) |
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
498 |
deps + (name -> content) |
54549
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
499 |
} |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
500 |
catch { |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
501 |
case ERROR(msg) => |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
502 |
cat_error(msg, "The error(s) above occurred in session " + |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
503 |
quote(name) + Position.here(info.pos)) |
2a3053472ec3
actually expose errors of cumulative theory dependencies;
wenzelm
parents:
54514
diff
changeset
|
504 |
} |
48423
0ccf143a2a69
maintain set of source digests, including relevant parts of session entry;
wenzelm
parents:
48422
diff
changeset
|
505 |
})) |
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
506 |
|
52439
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
507 |
def session_dependencies( |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
508 |
options: Options, |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
509 |
inlined_files: Boolean, |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
510 |
dirs: List[Path], |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
511 |
sessions: List[String]): Deps = |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
512 |
{ |
48791 | 513 |
val (_, tree) = |
52439
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
514 |
find_sessions(options, dirs.map((false, _))).selection(false, false, Nil, sessions) |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
515 |
dependencies(Ignore_Progress, inlined_files, false, false, tree) |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
516 |
} |
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
517 |
|
52439
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
518 |
def session_content( |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
519 |
options: Options, |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
520 |
inlined_files: Boolean, |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
521 |
dirs: List[Path], |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
522 |
session: String): Session_Content = |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
523 |
{ |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
524 |
session_dependencies(options, inlined_files, dirs, List(session))(session) |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
525 |
} |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
526 |
|
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
527 |
def outer_syntax(options: Options, session: String): Outer_Syntax = |
4cf3f6153eb8
improved "isabelle keywords" and "isabelle update_keywords" based on Isabelle/Scala, without requiring to build sessions first;
wenzelm
parents:
52115
diff
changeset
|
528 |
session_content(options, false, Nil, session).syntax |
48710
5b51ccdc8623
prefer static Build.session_content for loaded theories -- discontinued incremental protocol;
wenzelm
parents:
48708
diff
changeset
|
529 |
|
48422
9613780a805b
determine source dependencies, relatively to preloaded theories;
wenzelm
parents:
48421
diff
changeset
|
530 |
|
48424 | 531 |
/* jobs */ |
48341 | 532 |
|
52114 | 533 |
private class Job(progress: Progress, |
50845 | 534 |
name: String, val info: Session_Info, output: Path, do_output: Boolean, |
51220 | 535 |
verbose: Boolean, browser_info: Path, command_timings: List[Properties.T]) |
48418 | 536 |
{ |
48674 | 537 |
def output_path: Option[Path] = if (do_output) Some(output) else None |
538 |
||
539 |
private val parent = info.parent.getOrElse("") |
|
48418 | 540 |
|
56428
1acf2d76ac23
more standard Isabelle_System.tmp_file and tmp_dir operations, in accordance to ML version;
wenzelm
parents:
56393
diff
changeset
|
541 |
private val args_file = Isabelle_System.tmp_file("args") |
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
542 |
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
|
543 |
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
|
544 |
else |
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
545 |
{ |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
546 |
val theories = info.theories.map(x => (x._2, x._3)) |
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
547 |
import XML.Encode._ |
51218
6425a0d3b7ac
support for build passing timings from Scala to ML;
wenzelm
parents:
51045
diff
changeset
|
548 |
pair(list(properties), pair(bool, pair(Options.encode, pair(bool, pair(Path.encode, |
56533
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
549 |
pair(list(pair(Path.encode, Path.encode)), pair(string, pair(string, pair(string, |
cd8b6d849b6a
explicit 'document_files' in session ROOT specifications;
wenzelm
parents:
56464
diff
changeset
|
550 |
list(pair(Options.encode, list(Path.encode))))))))))))( |
51220 | 551 |
(command_timings, (do_output, (info.options, (verbose, (browser_info, |
56801
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
wenzelm
parents:
56782
diff
changeset
|
552 |
(info.document_files, (parent, (info.chapter, (name, theories)))))))))) |
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
553 |
})) |
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
554 |
|
48674 | 555 |
private val env = |
48698
2585042b1a30
pass Isabelle/Scala system options into ML process of Isar tty or build jobs;
wenzelm
parents:
48684
diff
changeset
|
556 |
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
|
557 |
(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
|
558 |
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
|
559 |
|
48674 | 560 |
private val script = |
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
561 |
if (is_pure(name)) { |
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
562 |
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
|
563 |
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
|
564 |
} |
48418 | 565 |
else { |
566 |
""" |
|
567 |
. "$ISABELLE_HOME/lib/scripts/timestart.bash" |
|
568 |
""" + |
|
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
569 |
(if (do_output) |
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
570 |
""" |
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
571 |
"$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
|
572 |
""" |
48418 | 573 |
else |
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
574 |
""" |
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
575 |
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
|
576 |
""") + |
48418 | 577 |
""" |
578 |
RC="$?" |
|
579 |
||
580 |
. "$ISABELLE_HOME/lib/scripts/timestop.bash" |
|
581 |
||
582 |
if [ "$RC" -eq 0 ]; then |
|
583 |
echo "Finished $TARGET ($TIMES_REPORT)" >&2 |
|
584 |
fi |
|
585 |
||
586 |
exit "$RC" |
|
587 |
""" |
|
588 |
} |
|
48674 | 589 |
|
590 |
private val (thread, result) = |
|
50845 | 591 |
Simple_Thread.future("build") { |
592 |
Isabelle_System.bash_env(info.dir.file, env, script, |
|
51962
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
593 |
progress_stdout = (line: String) => |
50847 | 594 |
Library.try_unprefix("\floading_theory = ", line) match { |
595 |
case Some(theory) => progress.theory(name, theory) |
|
596 |
case None => |
|
51962
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
597 |
}, |
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
598 |
progress_limit = |
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
599 |
info.options.int("process_output_limit") match { |
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
600 |
case 0 => None |
016cb7d8f297
limit build process output, to avoid bombing Isabelle/Scala process by ill-behaved jobs (e.g. Containers in AFP/9025435b29cf);
wenzelm
parents:
51663
diff
changeset
|
601 |
case m => Some(m * 1000000L) |
56871
d06ff36b4fa7
expose interrupts more like ML version, but not in managed bash processes of Build;
wenzelm
parents:
56861
diff
changeset
|
602 |
}, |
d06ff36b4fa7
expose interrupts more like ML version, but not in managed bash processes of Build;
wenzelm
parents:
56861
diff
changeset
|
603 |
strict = false) |
50845 | 604 |
} |
48674 | 605 |
|
606 |
def terminate: Unit = thread.interrupt |
|
607 |
def is_finished: Boolean = result.is_finished |
|
608 |
||
56779 | 609 |
@volatile private var was_timeout = false |
610 |
private val timeout_request: Option[Event_Timer.Request] = |
|
611 |
{ |
|
612 |
val timeout = info.options.seconds("timeout") |
|
613 |
if (timeout > Time.zero) |
|
614 |
Some(Event_Timer.request(Time.now() + timeout) { terminate; was_timeout = true }) |
|
48674 | 615 |
else None |
56779 | 616 |
} |
48674 | 617 |
|
50845 | 618 |
def join: Isabelle_System.Bash_Result = |
619 |
{ |
|
620 |
val res = result.join |
|
621 |
||
48674 | 622 |
args_file.delete |
56779 | 623 |
timeout_request.foreach(_.cancel) |
48674 | 624 |
|
56667
65e84b0ef974
more abstract Exn.Interrupt and POSIX return code;
wenzelm
parents:
56533
diff
changeset
|
625 |
if (res.rc == Exn.Interrupt.return_code) { |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56780
diff
changeset
|
626 |
if (was_timeout) res.add_err(Output.error_text("Timeout")).set_rc(1) |
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56780
diff
changeset
|
627 |
else res.add_err(Output.error_text("Interrupt")) |
52063
fd533ac64390
timeout counts as regular error, with rc = 1 (cf. special Exn.Interrupt vs. regular TimeLimit.TimeOut in Isabelle/ML);
wenzelm
parents:
51987
diff
changeset
|
628 |
} |
50845 | 629 |
else res |
48674 | 630 |
} |
48364 | 631 |
} |
632 |
||
48424 | 633 |
|
51045
630c0895d9d1
more efficient inlined properties, especially relevant for voluminous tasks trace;
wenzelm
parents:
50982
diff
changeset
|
634 |
/* inlined properties (YXML) */ |
50946
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
635 |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
636 |
object Props |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
637 |
{ |
51045
630c0895d9d1
more efficient inlined properties, especially relevant for voluminous tasks trace;
wenzelm
parents:
50982
diff
changeset
|
638 |
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
|
639 |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
640 |
def parse_lines(prefix: String, lines: List[String]): List[Properties.T] = |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
641 |
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
|
642 |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
643 |
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
|
644 |
lines.find(_.startsWith(prefix)).map(line => parse(line.substring(prefix.length))) |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
645 |
} |
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
646 |
|
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
647 |
|
50777 | 648 |
/* log files */ |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
649 |
|
48505 | 650 |
private val LOG = Path.explode("log") |
651 |
private def log(name: String): Path = LOG + Path.basic(name) |
|
652 |
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
|
653 |
|
50982 | 654 |
private val SESSION_NAME = "\fSession.name = " |
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
655 |
|
50946
8ad3e376f63e
tuned signature (again) -- keep Properties more generic;
wenzelm
parents:
50893
diff
changeset
|
656 |
|
50975 | 657 |
sealed case class Log_Info( |
51220 | 658 |
name: String, |
659 |
stats: List[Properties.T], |
|
660 |
tasks: List[Properties.T], |
|
661 |
command_timings: List[Properties.T], |
|
662 |
session_timing: Properties.T) |
|
50777 | 663 |
|
51220 | 664 |
def parse_log(full_stats: Boolean, text: String): Log_Info = |
50777 | 665 |
{ |
666 |
val lines = split_lines(text) |
|
51223 | 667 |
val xml_cache = new XML.Cache() |
668 |
def parse_lines(prfx: String): List[Properties.T] = |
|
51663 | 669 |
Props.parse_lines(prfx, lines).map(xml_cache.props(_)) |
51223 | 670 |
|
50982 | 671 |
val name = |
672 |
lines.find(_.startsWith(SESSION_NAME)).map(_.substring(SESSION_NAME.length)) getOrElse "" |
|
51223 | 673 |
val stats = if (full_stats) parse_lines("\fML_statistics = ") else Nil |
674 |
val tasks = if (full_stats) parse_lines("\ftask_statistics = ") else Nil |
|
675 |
val command_timings = parse_lines("\fcommand_timing = ") |
|
51220 | 676 |
val session_timing = Props.find_parse_line("\fTiming = ", lines) getOrElse Nil |
677 |
Log_Info(name, stats, tasks, command_timings, session_timing) |
|
50777 | 678 |
} |
679 |
||
680 |
||
681 |
/* sources and heaps */ |
|
682 |
||
48505 | 683 |
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
|
684 |
digests.map(_.toString).sorted.mkString("sources: ", " ", "") |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
685 |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
686 |
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
|
687 |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
688 |
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
|
689 |
{ |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
690 |
"heap: " + |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
691 |
(heap match { |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
692 |
case Some(path) => |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
693 |
val file = path.file |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
694 |
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
|
695 |
else "-" |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
696 |
case None => "-" |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
697 |
}) |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
698 |
} |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
699 |
|
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
700 |
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
|
701 |
if (path.is_file) { |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
702 |
val stream = new GZIPInputStream (new BufferedInputStream(new FileInputStream(path.file))) |
50203 | 703 |
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
|
704 |
val (s, h1, h2) = |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
705 |
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
|
706 |
finally { reader.close } |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
707 |
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
|
708 |
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
|
709 |
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
|
710 |
else None |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
711 |
} |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
712 |
else None |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
713 |
|
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
714 |
|
52114 | 715 |
/* build_results */ |
48424 | 716 |
|
52114 | 717 |
def build_results( |
50404
898cac1dad5e
avoid startup within GUI thread -- it is only required later for dialog;
wenzelm
parents:
50367
diff
changeset
|
718 |
options: Options, |
52115 | 719 |
progress: Progress = Ignore_Progress, |
49131 | 720 |
requirements: Boolean = false, |
48509 | 721 |
all_sessions: Boolean = false, |
48511
37999ee01156
remove old output heaps, to ensure that result is valid wrt. check_stamps;
wenzelm
parents:
48509
diff
changeset
|
722 |
build_heap: Boolean = false, |
48595 | 723 |
clean_build: Boolean = false, |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
724 |
more_dirs: List[(Boolean, Path)] = Nil, |
48509 | 725 |
session_groups: List[String] = Nil, |
726 |
max_jobs: Int = 1, |
|
48903 | 727 |
list_files: Boolean = false, |
48509 | 728 |
no_build: Boolean = false, |
729 |
system_mode: Boolean = false, |
|
730 |
verbose: Boolean = false, |
|
52114 | 731 |
sessions: List[String] = Nil): Map[String, Int] = |
48341 | 732 |
{ |
51220 | 733 |
/* session tree and dependencies */ |
734 |
||
49131 | 735 |
val full_tree = find_sessions(options, more_dirs) |
736 |
val (selected, selected_tree) = |
|
737 |
full_tree.selection(requirements, all_sessions, session_groups, sessions) |
|
738 |
||
50366 | 739 |
val deps = dependencies(progress, true, verbose, list_files, selected_tree) |
48368 | 740 |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
741 |
def make_stamp(name: String): String = |
49131 | 742 |
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
|
743 |
|
51220 | 744 |
|
745 |
/* persistent information */ |
|
746 |
||
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
747 |
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
|
748 |
if (system_mode) { |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
749 |
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
|
750 |
(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
|
751 |
} |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
752 |
else { |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
753 |
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
|
754 |
(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
|
755 |
Path.explode("$ISABELLE_BROWSER_INFO")) |
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
756 |
} |
48363 | 757 |
|
51221 | 758 |
def find_log(name: String): Option[(Path, Path)] = |
759 |
input_dirs.find(dir => (dir + log(name)).is_file).map(dir => (dir, dir + log(name))) |
|
51220 | 760 |
|
761 |
||
762 |
/* queue with scheduling information */ |
|
763 |
||
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
|
764 |
def load_timings(name: String): (List[Properties.T], Double) = |
51221 | 765 |
{ |
766 |
val (path, text) = |
|
767 |
find_log(name + ".gz") match { |
|
768 |
case Some((_, path)) => (path, File.read_gzip(path)) |
|
769 |
case None => |
|
770 |
find_log(name) match { |
|
771 |
case Some((_, path)) => (path, File.read(path)) |
|
772 |
case None => (Path.current, "") |
|
773 |
} |
|
774 |
} |
|
51244
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
775 |
|
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
776 |
def ignore_error(msg: String): (List[Properties.T], Double) = |
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
777 |
{ |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56780
diff
changeset
|
778 |
Output.warning("Ignoring bad log file: " + path + (if (msg == "") "" else "\n" + msg)) |
51244
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
779 |
(Nil, 0.0) |
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
780 |
} |
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
781 |
|
51221 | 782 |
try { |
783 |
val info = parse_log(false, text) |
|
784 |
val session_timing = Markup.Elapsed.unapply(info.session_timing) getOrElse 0.0 |
|
785 |
(info.command_timings, session_timing) |
|
51220 | 786 |
} |
51221 | 787 |
catch { |
51244
d8ca566b22b3
more robust load_timings: ignore XML.Decode errors as well;
wenzelm
parents:
51230
diff
changeset
|
788 |
case ERROR(msg) => ignore_error(msg) |
51986
5fdca5bfc0b4
more robust load_timings: ignore JVM errors such as java.lang.OutOfMemoryError;
wenzelm
parents:
51983
diff
changeset
|
789 |
case exn: java.lang.Error => ignore_error(Exn.message(exn)) |
51987 | 790 |
case _: XML.Error => ignore_error("") |
51221 | 791 |
} |
792 |
} |
|
51220 | 793 |
|
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
|
794 |
val queue = Queue(selected_tree, load_timings) |
51220 | 795 |
|
796 |
||
797 |
/* main build process */ |
|
798 |
||
48373 | 799 |
// 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
|
800 |
Isabelle_System.mkdirs(output_dir + LOG) |
48373 | 801 |
|
48595 | 802 |
// optional cleanup |
803 |
if (clean_build) { |
|
49131 | 804 |
for (name <- full_tree.graph.all_succs(selected)) { |
48595 | 805 |
val files = |
806 |
List(Path.basic(name), log(name), log_gz(name)).map(output_dir + _).filter(_.is_file) |
|
50366 | 807 |
if (!files.isEmpty) progress.echo("Cleaning " + name + " ...") |
808 |
if (!files.forall(p => p.file.delete)) progress.echo(name + " FAILED to delete") |
|
48595 | 809 |
} |
810 |
} |
|
811 |
||
48425 | 812 |
// scheduler loop |
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
813 |
case class Result(current: Boolean, 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
|
814 |
|
56837
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
815 |
def sleep() |
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
816 |
{ |
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
817 |
try { Thread.sleep(500) } |
56861 | 818 |
catch { case Exn.Interrupt() => Exn.Interrupt.impose() } |
56837
5a598f1eecfd
more robust interrupt handling for Scala_Console, which uses JVM Thread.interrupt instead of POSIX SIGINT;
wenzelm
parents:
56831
diff
changeset
|
819 |
} |
50366 | 820 |
|
48425 | 821 |
@tailrec def loop( |
48676
3ef82491cdd6
clarified Session_Tree (with proper integrity check) vs. Queue (with provision for alternative ordering);
wenzelm
parents:
48675
diff
changeset
|
822 |
pending: Queue, |
48674 | 823 |
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
|
824 |
results: Map[String, Result]): Map[String, Result] = |
48425 | 825 |
{ |
826 |
if (pending.is_empty) results |
|
51253 | 827 |
else { |
828 |
if (progress.stopped) |
|
829 |
for ((_, (_, job)) <- running) job.terminate |
|
830 |
||
48674 | 831 |
running.find({ case (_, (_, job)) => job.is_finished }) match { |
832 |
case Some((name, (parent_heap, job))) => |
|
50367 | 833 |
//{{{ finish job |
48424 | 834 |
|
50845 | 835 |
val res = job.join |
836 |
progress.echo(res.err) |
|
48373 | 837 |
|
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
838 |
val heap = |
50845 | 839 |
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
|
840 |
(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
|
841 |
|
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
842 |
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
|
843 |
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
|
844 |
File.write_gzip(output_dir + log_gz(name), |
51983
32692ce4c61a
more frugal line termination, to cope with huge log files (see also 016cb7d8f297);
wenzelm
parents:
51962
diff
changeset
|
845 |
Library.terminate_lines(sources :: parent_heap :: heap :: res.out_lines)) |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
846 |
|
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
847 |
heap |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
848 |
} |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
849 |
else { |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
850 |
(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
|
851 |
(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
|
852 |
|
51983
32692ce4c61a
more frugal line termination, to cope with huge log files (see also 016cb7d8f297);
wenzelm
parents:
51962
diff
changeset
|
853 |
File.write(output_dir + log(name), Library.terminate_lines(res.out_lines)) |
50366 | 854 |
progress.echo(name + " FAILED") |
56667
65e84b0ef974
more abstract Exn.Interrupt and POSIX return code;
wenzelm
parents:
56533
diff
changeset
|
855 |
if (res.rc != Exn.Interrupt.return_code) { |
50366 | 856 |
progress.echo("(see also " + (output_dir + log(name)).file.toString + ")") |
50845 | 857 |
val lines = res.out_lines.filterNot(_.startsWith("\f")) |
50713
dae523e6198b
tuned message -- suppress inlined system information;
wenzelm
parents:
50707
diff
changeset
|
858 |
val tail = lines.drop(lines.length - 20 max 0) |
50366 | 859 |
progress.echo("\n" + cat_lines(tail)) |
48661 | 860 |
} |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
861 |
|
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
862 |
no_heap |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
863 |
} |
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
864 |
loop(pending - name, running - name, |
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
865 |
results + (name -> Result(false, heap, res.rc))) |
50367 | 866 |
//}}} |
48547 | 867 |
case None if (running.size < (max_jobs max 1)) => |
50367 | 868 |
//{{{ check/start next job |
48547 | 869 |
pending.dequeue(running.isDefinedAt(_)) match { |
870 |
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
|
871 |
val parent_result = |
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
872 |
info.parent match { |
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
873 |
case None => Result(true, no_heap, 0) |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
874 |
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
|
875 |
} |
48547 | 876 |
val output = output_dir + Path.basic(name) |
877 |
val do_output = build_heap || queue.is_inner(name) |
|
878 |
||
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
879 |
val (current, heap) = |
48547 | 880 |
{ |
51221 | 881 |
find_log(name + ".gz") match { |
882 |
case Some((dir, path)) => |
|
51220 | 883 |
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
|
884 |
case Some((s, h1, h2)) => |
51221 | 885 |
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
|
886 |
(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
|
887 |
!(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
|
888 |
case None => (false, no_heap) |
48547 | 889 |
} |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
890 |
case None => (false, no_heap) |
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
891 |
} |
48547 | 892 |
} |
48639
675988e64bf9
store parent heap stamp as well -- needs to be propagated through the build hierarchy;
wenzelm
parents:
48626
diff
changeset
|
893 |
val all_current = current && parent_result.current |
48528
784c6f63d79c
proper all_current, which regards parent status as well;
wenzelm
parents:
48511
diff
changeset
|
894 |
|
48547 | 895 |
if (all_current) |
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
896 |
loop(pending - name, running, results + (name -> Result(true, heap, 0))) |
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
897 |
else if (no_build) { |
50366 | 898 |
if (verbose) progress.echo("Skipping " + name + " ...") |
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
899 |
loop(pending - name, running, results + (name -> Result(false, heap, 1))) |
48678
ff27af15530c
queue ordering by descending outdegree and timeout;
wenzelm
parents:
48676
diff
changeset
|
900 |
} |
51253 | 901 |
else if (parent_result.rc == 0 && !progress.stopped) { |
50366 | 902 |
progress.echo((if (do_output) "Building " else "Running ") + name + " ...") |
51220 | 903 |
val job = |
904 |
new Job(progress, name, info, output, do_output, verbose, browser_info, |
|
905 |
queue.command_timings(name)) |
|
48674 | 906 |
loop(pending, running + (name -> (parent_result.heap, job)), results) |
48547 | 907 |
} |
908 |
else { |
|
50366 | 909 |
progress.echo(name + " CANCELLED") |
51399
6ac3c29a300e
discontinued "isabelle usedir" option -r (reset session path);
wenzelm
parents:
51397
diff
changeset
|
910 |
loop(pending - name, running, results + (name -> Result(false, heap, 1))) |
48547 | 911 |
} |
912 |
case None => sleep(); loop(pending, running, results) |
|
48425 | 913 |
} |
50367 | 914 |
///}}} |
48425 | 915 |
case None => sleep(); loop(pending, running, results) |
48373 | 916 |
} |
51253 | 917 |
} |
48425 | 918 |
} |
919 |
||
51220 | 920 |
|
921 |
/* build results */ |
|
922 |
||
48583 | 923 |
val results = |
924 |
if (deps.is_empty) { |
|
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56780
diff
changeset
|
925 |
progress.echo(Output.warning_text("Nothing to build")) |
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
926 |
Map.empty[String, Result] |
48583 | 927 |
} |
928 |
else loop(queue, Map.empty, Map.empty) |
|
929 |
||
51418
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
930 |
|
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
931 |
/* global browser info */ |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
932 |
|
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
933 |
if (!no_build) { |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
934 |
val browser_chapters = |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
935 |
(for { |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
936 |
(name, result) <- results.iterator |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
937 |
if result.rc == 0 |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
938 |
info = full_tree(name) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
939 |
if info.options.bool("browser_info") |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
940 |
} yield (info.chapter, (name, info.description))).toList.groupBy(_._1). |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
941 |
map({ case (chapter, es) => (chapter, es.map(_._2)) }).filterNot(_._2.isEmpty) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
942 |
|
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
943 |
for ((chapter, entries) <- browser_chapters) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
944 |
Present.update_chapter_index(browser_info, chapter, entries) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
945 |
|
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
946 |
if (!browser_chapters.isEmpty && !(browser_info + Path.explode("index.html")).is_file) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
947 |
{ |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
948 |
Isabelle_System.mkdirs(browser_info) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
949 |
File.copy(Path.explode("~~/lib/logo/isabelle.gif"), |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
950 |
browser_info + Path.explode("isabelle.gif")) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
951 |
File.write(browser_info + Path.explode("index.html"), |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
952 |
File.read(Path.explode("~~/lib/html/library_index_header.template")) + |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
953 |
File.read(Path.explode("~~/lib/html/library_index_content.template")) + |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
954 |
File.read(Path.explode("~~/lib/html/library_index_footer.template"))) |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
955 |
} |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
956 |
} |
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
957 |
|
7b8ce8403340
more accurate handling of global browser info at the very end (without races), subject to no_build and info.browser_info;
wenzelm
parents:
51402
diff
changeset
|
958 |
|
52114 | 959 |
/* results */ |
960 |
||
961 |
results.map({ case (name, result) => (name, result.rc) }) |
|
962 |
} |
|
963 |
||
964 |
||
965 |
/* build */ |
|
50707
5b2bf7611662
maintain session index on Scala side, for more determistic results;
wenzelm
parents:
50686
diff
changeset
|
966 |
|
52114 | 967 |
def build( |
968 |
options: Options, |
|
52115 | 969 |
progress: Progress = Ignore_Progress, |
52114 | 970 |
requirements: Boolean = false, |
971 |
all_sessions: Boolean = false, |
|
972 |
build_heap: Boolean = false, |
|
973 |
clean_build: Boolean = false, |
|
974 |
more_dirs: List[(Boolean, Path)] = Nil, |
|
975 |
session_groups: List[String] = Nil, |
|
976 |
max_jobs: Int = 1, |
|
977 |
list_files: Boolean = false, |
|
978 |
no_build: Boolean = false, |
|
979 |
system_mode: Boolean = false, |
|
980 |
verbose: Boolean = false, |
|
981 |
sessions: List[String] = Nil): Int = |
|
982 |
{ |
|
983 |
val results = |
|
52115 | 984 |
build_results(options, progress, requirements, all_sessions, |
52114 | 985 |
build_heap, clean_build, more_dirs, session_groups, max_jobs, list_files, no_build, |
986 |
system_mode, verbose, sessions) |
|
987 |
||
988 |
val rc = (0 /: results)({ case (rc1, (_, rc2)) => rc1 max rc2 }) |
|
48504
21dfd6c04482
actually check source vs. target stamps, based on information from log files;
wenzelm
parents:
48494
diff
changeset
|
989 |
if (rc != 0 && (verbose || !no_build)) { |
48552 | 990 |
val unfinished = |
52114 | 991 |
(for ((name, r) <- results.iterator if r != 0) yield name).toList.sorted |
50366 | 992 |
progress.echo("Unfinished session(s): " + commas(unfinished)) |
48473 | 993 |
} |
994 |
rc |
|
48341 | 995 |
} |
996 |
||
997 |
||
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
998 |
/* command line entry point */ |
48341 | 999 |
|
1000 |
def main(args: Array[String]) |
|
1001 |
{ |
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1002 |
Command_Line.tool { |
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1003 |
args.toList match { |
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1004 |
case |
49131 | 1005 |
Properties.Value.Boolean(requirements) :: |
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1006 |
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
|
1007 |
Properties.Value.Boolean(build_heap) :: |
48595 | 1008 |
Properties.Value.Boolean(clean_build) :: |
48425 | 1009 |
Properties.Value.Int(max_jobs) :: |
48903 | 1010 |
Properties.Value.Boolean(list_files) :: |
48469 | 1011 |
Properties.Value.Boolean(no_build) :: |
48447
ef600ce4559c
added system build mode: produce output in ISABELLE_HOME;
wenzelm
parents:
48425
diff
changeset
|
1012 |
Properties.Value.Boolean(system_mode) :: |
48425 | 1013 |
Properties.Value.Boolean(verbose) :: |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
1014 |
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
|
1015 |
val options = (Options.init() /: build_options)(_ + _) |
52114 | 1016 |
val more_dirs = |
48737
f3bbb9ca57d6
added build option -D: include session directory and select its sessions;
wenzelm
parents:
48724
diff
changeset
|
1017 |
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
|
1018 |
include_dirs.map(d => (false, Path.explode(d))) |
52114 | 1019 |
val progress = new Console_Progress(verbose) |
51252 | 1020 |
progress.interrupt_handler { |
52115 | 1021 |
build(options, progress, requirements, all_sessions, |
52114 | 1022 |
build_heap, clean_build, more_dirs, session_groups, max_jobs, list_files, no_build, |
51252 | 1023 |
system_mode, verbose, sessions) |
1024 |
} |
|
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1025 |
case _ => error("Bad arguments:\n" + cat_lines(args)) |
48341 | 1026 |
} |
48346
e2382bede914
more general support for Isabelle/Scala command line tools;
wenzelm
parents:
48344
diff
changeset
|
1027 |
} |
48341 | 1028 |
} |
48276 | 1029 |
} |
1030 |