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