author | paulson <lp15@cam.ac.uk> |
Sun, 20 May 2018 18:37:34 +0100 | |
changeset 68239 | 0764ee22a4d1 |
parent 68221 | dbef88c2b6c5 |
child 69166 | 5c553c48c0e5 |
permissions | -rw-r--r-- |
64160 | 1 |
/* Title: Pure/Admin/build_history.scala |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
2 |
Author: Makarius |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
3 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
4 |
Build other history versions. |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
5 |
*/ |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
6 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
7 |
package isabelle |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
8 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
9 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
10 |
import java.io.{File => JFile} |
64117 | 11 |
import java.time.format.DateTimeFormatter |
64118 | 12 |
import java.util.Locale |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
13 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
14 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
15 |
object Build_History |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
16 |
{ |
64117 | 17 |
/* log files */ |
18 |
||
65588 | 19 |
val engine = "build_history" |
65596 | 20 |
val log_prefix = engine + "_" |
64119
8094eaa38d4b
inline session ML statistics into main build log;
wenzelm
parents:
64118
diff
changeset
|
21 |
val META_INFO_MARKER = "\fmeta_info = " |
64117 | 22 |
|
23 |
||
64188 | 24 |
/* augment settings */ |
64050 | 25 |
|
64188 | 26 |
def augment_settings( |
27 |
other_isabelle: Other_Isabelle, |
|
28 |
threads: Int, |
|
65843
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
29 |
arch_64: Boolean, |
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
30 |
heap: Int, |
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
31 |
max_heap: Option[Int], |
64188 | 32 |
more_settings: List[String]): String = |
33 |
{ |
|
34 |
val (ml_platform, ml_settings) = |
|
35 |
{ |
|
36 |
val windows_32 = "x86-windows" |
|
37 |
val windows_64 = "x86_64-windows" |
|
38 |
val platform_32 = other_isabelle("getenv -b ISABELLE_PLATFORM32").check.out |
|
39 |
val platform_64 = other_isabelle("getenv -b ISABELLE_PLATFORM64").check.out |
|
40 |
val platform_family = other_isabelle("getenv -b ISABELLE_PLATFORM_FAMILY").check.out |
|
64049 | 41 |
|
64188 | 42 |
val polyml_home = |
43 |
try { Path.explode(other_isabelle("getenv -b ML_HOME").check.out).dir } |
|
44 |
catch { case ERROR(msg) => error("Bad ML_HOME: " + msg) } |
|
64049 | 45 |
|
64188 | 46 |
def ml_home(platform: String): Path = polyml_home + Path.explode(platform) |
64049 | 47 |
|
64188 | 48 |
def err(platform: String): Nothing = |
49 |
error("Platform " + platform + " unavailable on this machine") |
|
64050 | 50 |
|
64188 | 51 |
def check_dir(platform: String): Boolean = |
52 |
platform != "" && ml_home(platform).is_dir |
|
64050 | 53 |
|
64188 | 54 |
val ml_platform = |
55 |
if (Platform.is_windows && arch_64) { |
|
56 |
if (check_dir(windows_64)) windows_64 else err(windows_64) |
|
57 |
} |
|
58 |
else if (Platform.is_windows && !arch_64) { |
|
59 |
if (check_dir(windows_32)) windows_32 |
|
60 |
else platform_32 // x86-cygwin |
|
61 |
} |
|
62 |
else { |
|
63 |
val (platform, platform_name) = |
|
64 |
if (arch_64) (platform_64, "x86_64-" + platform_family) |
|
65 |
else (platform_32, "x86-" + platform_family) |
|
66 |
if (check_dir(platform)) platform else err(platform_name) |
|
67 |
} |
|
64050 | 68 |
|
64188 | 69 |
val ml_options = |
70 |
"--minheap " + heap + (if (max_heap.isDefined) " --maxheap " + max_heap.get else "") + |
|
71 |
" --gcthreads " + threads + |
|
72 |
(if (ml_platform.endsWith("-windows")) " --codepage utf8" else "") |
|
64050 | 73 |
|
64188 | 74 |
(ml_platform, |
75 |
List( |
|
76 |
"ML_HOME=" + File.bash_path(ml_home(ml_platform)), |
|
77 |
"ML_PLATFORM=" + quote(ml_platform), |
|
78 |
"ML_OPTIONS=" + quote(ml_options))) |
|
64050 | 79 |
} |
80 |
||
64188 | 81 |
val thread_settings = |
82 |
List( |
|
83 |
"ISABELLE_JAVA_SYSTEM_OPTIONS=\"$ISABELLE_JAVA_SYSTEM_OPTIONS -Disabelle.threads=" + threads + "\"", |
|
84 |
"ISABELLE_BUILD_OPTIONS=\"threads=" + threads + "\"") |
|
64050 | 85 |
|
64188 | 86 |
val settings = |
87 |
List(ml_settings, thread_settings) ::: |
|
65843
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
88 |
(if (more_settings.isEmpty) Nil else List(more_settings)) |
64050 | 89 |
|
64188 | 90 |
File.append(other_isabelle.etc_settings, "\n" + cat_lines(settings.map(terminate_lines(_)))) |
64050 | 91 |
|
64188 | 92 |
ml_platform |
64049 | 93 |
} |
94 |
||
95 |
||
96 |
||
64050 | 97 |
/** build_history **/ |
64025 | 98 |
|
67047 | 99 |
private val default_user_home = Path.explode("$USER_HOME") |
64025 | 100 |
private val default_rev = "tip" |
64301 | 101 |
private val default_multicore = (1, 1) |
64335 | 102 |
private val default_heap = 1500 |
64025 | 103 |
private val default_isabelle_identifier = "build_history" |
104 |
||
105 |
def build_history( |
|
66861
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
106 |
options: Options, |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
107 |
root: Path, |
67047 | 108 |
user_home: Path = default_user_home, |
64909 | 109 |
progress: Progress = No_Progress, |
64025 | 110 |
rev: String = default_rev, |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
111 |
afp_rev: Option[String] = None, |
66861
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
112 |
afp_partition: Int = 0, |
64025 | 113 |
isabelle_identifier: String = default_isabelle_identifier, |
66867
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
114 |
ml_statistics_step: Int = 1, |
64025 | 115 |
components_base: String = "", |
64026 | 116 |
fresh: Boolean = false, |
64025 | 117 |
nonfree: Boolean = false, |
64052 | 118 |
multicore_base: Boolean = false, |
64301 | 119 |
multicore_list: List[(Int, Int)] = List(default_multicore), |
64030 | 120 |
arch_64: Boolean = false, |
121 |
heap: Int = default_heap, |
|
64036 | 122 |
max_heap: Option[Int] = None, |
65843
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
123 |
init_settings: List[String] = Nil, |
64030 | 124 |
more_settings: List[String] = Nil, |
64026 | 125 |
verbose: Boolean = false, |
64297 | 126 |
build_tags: List[String] = Nil, |
64194
b5ada7dcceaa
integrity test of build_history vs. build_history_base;
wenzelm
parents:
64193
diff
changeset
|
127 |
build_args: List[String] = Nil): List[(Process_Result, Path)] = |
64025 | 128 |
{ |
64031 | 129 |
/* sanity checks */ |
130 |
||
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
131 |
if (File.eq(Path.explode("~~"), root)) |
64046 | 132 |
error("Repository coincides with ISABELLE_HOME=" + Path.explode("~~").expand) |
133 |
||
64301 | 134 |
for ((threads, _) <- multicore_list if threads < 1) |
135 |
error("Bad threads value < 1: " + threads) |
|
136 |
for ((_, processes) <- multicore_list if processes < 1) |
|
137 |
error("Bad processes value < 1: " + processes) |
|
64036 | 138 |
|
64030 | 139 |
if (heap < 100) error("Bad heap value < 100: " + heap) |
140 |
||
64036 | 141 |
if (max_heap.isDefined && max_heap.get < heap) |
142 |
error("Bad max_heap value < heap: " + max_heap.get) |
|
143 |
||
64031 | 144 |
System.getenv("ISABELLE_SETTINGS_PRESENT") match { |
145 |
case null | "" => |
|
146 |
case _ => error("Cannot run build_history within existing Isabelle settings environment") |
|
147 |
} |
|
148 |
||
149 |
||
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
150 |
/* checkout Isabelle + AFP repository */ |
64031 | 151 |
|
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
152 |
def checkout(dir: Path, version: String): String = |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
153 |
{ |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
154 |
val hg = Mercurial.repository(dir) |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
155 |
hg.update(rev = version, clean = true) |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
156 |
progress.echo_if(verbose, hg.log(version, options = "-l1")) |
66866 | 157 |
hg.id(rev = version) |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
158 |
} |
64025 | 159 |
|
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
160 |
val isabelle_version = checkout(root, rev) |
66861
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
161 |
|
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
162 |
val afp_repos = root + Path.explode("AFP") |
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
163 |
val afp_version = afp_rev.map(checkout(afp_repos, _)) |
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
164 |
|
66862 | 165 |
val (afp_build_args, afp_sessions) = |
66861
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
166 |
if (afp_rev.isEmpty) (Nil, Nil) |
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
167 |
else { |
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
168 |
val afp = AFP.init(options, afp_repos) |
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
169 |
(List("-d", "~~/AFP/thys"), afp.partition(afp_partition)) |
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
170 |
} |
64025 | 171 |
|
64051 | 172 |
|
64052 | 173 |
/* main */ |
64043 | 174 |
|
67045 | 175 |
val other_isabelle = |
67047 | 176 |
Other_Isabelle(root, isabelle_identifier = isabelle_identifier, |
177 |
user_home = user_home, progress = progress) |
|
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
178 |
|
64296
544481988e65
explicit identification of builds and correlated build groups;
wenzelm
parents:
64263
diff
changeset
|
179 |
val build_host = Isabelle_System.hostname() |
64117 | 180 |
val build_history_date = Date.now() |
64296
544481988e65
explicit identification of builds and correlated build groups;
wenzelm
parents:
64263
diff
changeset
|
181 |
val build_group_id = build_host + ":" + build_history_date.time.ms |
64117 | 182 |
|
64051 | 183 |
var first_build = true |
64301 | 184 |
for ((threads, processes) <- multicore_list) yield |
64052 | 185 |
{ |
186 |
/* init settings */ |
|
187 |
||
65845
b8ff63149256
proper init_settings, before inspecting ML_HOME etc;
wenzelm
parents:
65844
diff
changeset
|
188 |
other_isabelle.init_settings(components_base, nonfree, init_settings) |
64051 | 189 |
other_isabelle.resolve_components(verbose) |
64117 | 190 |
val ml_platform = |
65845
b8ff63149256
proper init_settings, before inspecting ML_HOME etc;
wenzelm
parents:
65844
diff
changeset
|
191 |
augment_settings(other_isabelle, threads, arch_64, heap, max_heap, more_settings) |
64043 | 192 |
|
68219 | 193 |
val isabelle_output = |
194 |
other_isabelle.isabelle_home_user + Path.explode("heaps") + |
|
195 |
Path.explode(other_isabelle("getenv -b ML_IDENTIFIER").check.out) |
|
64052 | 196 |
val isabelle_output_log = isabelle_output + Path.explode("log") |
197 |
val isabelle_base_log = isabelle_output + Path.explode("../base_log") |
|
198 |
||
64051 | 199 |
if (first_build) { |
200 |
other_isabelle.resolve_components(verbose) |
|
64376
68ace7f3d78f
more thorough cleanup of lib/classes -- it may contain broken Pure.jar or copies of Scala libraries (in historic versions);
wenzelm
parents:
64353
diff
changeset
|
201 |
|
68ace7f3d78f
more thorough cleanup of lib/classes -- it may contain broken Pure.jar or copies of Scala libraries (in historic versions);
wenzelm
parents:
64353
diff
changeset
|
202 |
if (fresh) |
68ace7f3d78f
more thorough cleanup of lib/classes -- it may contain broken Pure.jar or copies of Scala libraries (in historic versions);
wenzelm
parents:
64353
diff
changeset
|
203 |
Isabelle_System.rm_tree(other_isabelle.isabelle_home + Path.explode("lib/classes")) |
64051 | 204 |
other_isabelle.bash( |
205 |
"env PATH=\"" + File.bash_path(Path.explode("~~/lib/dummy_stty").expand) + ":$PATH\" " + |
|
64376
68ace7f3d78f
more thorough cleanup of lib/classes -- it may contain broken Pure.jar or copies of Scala libraries (in historic versions);
wenzelm
parents:
64353
diff
changeset
|
206 |
"bin/isabelle jedit -b", redirect = true, echo = verbose).check |
64052 | 207 |
|
64213 | 208 |
Isabelle_System.rm_tree(isabelle_base_log) |
64051 | 209 |
} |
64025 | 210 |
|
64213 | 211 |
Isabelle_System.rm_tree(isabelle_output) |
64052 | 212 |
Isabelle_System.mkdirs(isabelle_output) |
213 |
||
65909 | 214 |
val log_path = |
215 |
other_isabelle.isabelle_home_user + |
|
216 |
Build_Log.log_subdir(build_history_date) + |
|
217 |
Build_Log.log_filename(Build_History.engine, build_history_date, |
|
218 |
List(build_host, ml_platform, "M" + threads) ::: build_tags) |
|
219 |
||
220 |
Isabelle_System.mkdirs(log_path.dir) |
|
65927
23a1e2fa5c8a
more progress information, for the sake of sporadic dropouts;
wenzelm
parents:
65917
diff
changeset
|
221 |
|
23a1e2fa5c8a
more progress information, for the sake of sporadic dropouts;
wenzelm
parents:
65917
diff
changeset
|
222 |
val build_out = other_isabelle.isabelle_home_user + Path.explode("log/build.out") |
23a1e2fa5c8a
more progress information, for the sake of sporadic dropouts;
wenzelm
parents:
65917
diff
changeset
|
223 |
val build_out_progress = new File_Progress(build_out) |
65909 | 224 |
build_out.file.delete |
225 |
||
64052 | 226 |
|
227 |
/* build */ |
|
228 |
||
229 |
if (multicore_base && !first_build && isabelle_base_log.is_dir) |
|
64189 | 230 |
Isabelle_System.copy_dir(isabelle_base_log, isabelle_output_log) |
64052 | 231 |
|
64117 | 232 |
val build_start = Date.now() |
66862 | 233 |
val build_args1 = List("-v", "-j" + processes) ::: afp_build_args ::: build_args |
64296
544481988e65
explicit identification of builds and correlated build groups;
wenzelm
parents:
64263
diff
changeset
|
234 |
val build_result = |
67045 | 235 |
Other_Isabelle(root, isabelle_identifier = isabelle_identifier, |
67047 | 236 |
user_home = user_home, progress = build_out_progress)( |
67045 | 237 |
"build " + Bash.strings(build_args1 ::: afp_sessions), redirect = true, echo = true, |
238 |
strict = false) |
|
64117 | 239 |
val build_end = Date.now() |
240 |
||
65646 | 241 |
val build_info: Build_Log.Build_Info = |
65999 | 242 |
Build_Log.Log_File(log_path.base_name, build_result.out_lines). |
65646 | 243 |
parse_build_info(ml_statistics = true) |
64296
544481988e65
explicit identification of builds and correlated build groups;
wenzelm
parents:
64263
diff
changeset
|
244 |
|
544481988e65
explicit identification of builds and correlated build groups;
wenzelm
parents:
64263
diff
changeset
|
245 |
|
544481988e65
explicit identification of builds and correlated build groups;
wenzelm
parents:
64263
diff
changeset
|
246 |
/* output log */ |
64120 | 247 |
|
68221 | 248 |
val store = Sessions.store(options + "build_database_server=false") |
65293
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
249 |
|
64117 | 250 |
val meta_info = |
65624 | 251 |
Properties.lines_nonempty(Build_Log.Prop.build_tags.name, build_tags) ::: |
252 |
Properties.lines_nonempty(Build_Log.Prop.build_args.name, build_args1) ::: |
|
64296
544481988e65
explicit identification of builds and correlated build groups;
wenzelm
parents:
64263
diff
changeset
|
253 |
List( |
65591 | 254 |
Build_Log.Prop.build_group_id.name -> build_group_id, |
255 |
Build_Log.Prop.build_id.name -> (build_host + ":" + build_start.time.ms), |
|
256 |
Build_Log.Prop.build_engine.name -> Build_History.engine, |
|
257 |
Build_Log.Prop.build_host.name -> build_host, |
|
258 |
Build_Log.Prop.build_start.name -> Build_Log.print_date(build_start), |
|
259 |
Build_Log.Prop.build_end.name -> Build_Log.print_date(build_end), |
|
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
260 |
Build_Log.Prop.isabelle_version.name -> isabelle_version) ::: |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
261 |
afp_version.map(Build_Log.Prop.afp_version.name -> _).toList |
64117 | 262 |
|
66913 | 263 |
build_out_progress.echo("Reading session build info ...") |
264 |
val session_build_info = |
|
66874
0b8da0fc9563
store theory timings in session in build_log database;
wenzelm
parents:
66871
diff
changeset
|
265 |
build_info.finished_sessions.flatMap(session_name => |
0b8da0fc9563
store theory timings in session in build_log database;
wenzelm
parents:
66871
diff
changeset
|
266 |
{ |
0b8da0fc9563
store theory timings in session in build_log database;
wenzelm
parents:
66871
diff
changeset
|
267 |
val database = isabelle_output + store.database(session_name) |
0b8da0fc9563
store theory timings in session in build_log database;
wenzelm
parents:
66871
diff
changeset
|
268 |
|
66913 | 269 |
if (database.is_file) { |
270 |
using(SQLite.open_database(database))(db => |
|
271 |
{ |
|
272 |
val theory_timings = |
|
273 |
try { |
|
274 |
store.read_theory_timings(db, session_name).map(ps => |
|
275 |
Build_Log.Log_File.print_props(Build_Log.THEORY_TIMING_MARKER, |
|
276 |
(Build_Log.SESSION_NAME, session_name) :: ps)) |
|
277 |
} |
|
278 |
catch { case ERROR(_) => Nil } |
|
66874
0b8da0fc9563
store theory timings in session in build_log database;
wenzelm
parents:
66871
diff
changeset
|
279 |
|
66913 | 280 |
val session_sources = |
281 |
store.read_build(db, session_name).map(_.sources) match { |
|
282 |
case Some(sources) if sources.length == SHA1.digest_length => |
|
283 |
List("Sources " + session_name + " " + sources) |
|
284 |
case _ => Nil |
|
285 |
} |
|
286 |
||
287 |
theory_timings ::: session_sources |
|
288 |
}) |
|
289 |
} |
|
290 |
else Nil |
|
66874
0b8da0fc9563
store theory timings in session in build_log database;
wenzelm
parents:
66871
diff
changeset
|
291 |
}) |
0b8da0fc9563
store theory timings in session in build_log database;
wenzelm
parents:
66871
diff
changeset
|
292 |
|
65927
23a1e2fa5c8a
more progress information, for the sake of sporadic dropouts;
wenzelm
parents:
65917
diff
changeset
|
293 |
build_out_progress.echo("Reading ML statistics ...") |
64119
8094eaa38d4b
inline session ML statistics into main build log;
wenzelm
parents:
64118
diff
changeset
|
294 |
val ml_statistics = |
64120 | 295 |
build_info.finished_sessions.flatMap(session_name => |
296 |
{ |
|
65293
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
297 |
val database = isabelle_output + store.database(session_name) |
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
298 |
val log_gz = isabelle_output + store.log_gz(session_name) |
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
299 |
|
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
300 |
val properties = |
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
301 |
if (database.is_file) { |
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
302 |
using(SQLite.open_database(database))(db => |
65935 | 303 |
store.read_ml_statistics(db, session_name)) |
65293
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
304 |
} |
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
305 |
else if (log_gz.is_file) { |
65318
342efc382558
eliminated somewhat redundant inlined name (despite a7aa17a1f721);
wenzelm
parents:
65296
diff
changeset
|
306 |
Build_Log.Log_File(log_gz).parse_session_info(ml_statistics = true).ml_statistics |
65293
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
307 |
} |
a53a5ae88205
prefer database, but also accept log.gz from historic versions;
wenzelm
parents:
64909
diff
changeset
|
308 |
else Nil |
66867
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
309 |
|
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
310 |
val trimmed_properties = |
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
311 |
if (ml_statistics_step <= 0) Nil |
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
312 |
else if (ml_statistics_step == 1) properties |
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
313 |
else { |
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
314 |
(for { (ps, i) <- properties.iterator.zipWithIndex if i % ml_statistics_step == 0 } |
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
315 |
yield ps).toList |
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
316 |
} |
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
317 |
|
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
318 |
trimmed_properties.map(ps => (Build_Log.SESSION_NAME -> session_name) :: ps) |
64120 | 319 |
}) |
320 |
||
65937 | 321 |
build_out_progress.echo("Reading error messages ...") |
322 |
val session_errors = |
|
323 |
build_info.failed_sessions.flatMap(session_name => |
|
324 |
{ |
|
325 |
val database = isabelle_output + store.database(session_name) |
|
326 |
val errors = |
|
327 |
if (database.is_file) { |
|
328 |
try { |
|
329 |
using(SQLite.open_database(database))(db => store.read_errors(db, session_name)) |
|
330 |
} // column "errors" could be missing |
|
331 |
catch { case _: java.sql.SQLException => Nil } |
|
332 |
} |
|
333 |
else Nil |
|
334 |
errors.map(msg => List(Build_Log.SESSION_NAME -> session_name, Markup.CONTENT -> msg)) |
|
335 |
}) |
|
336 |
||
65927
23a1e2fa5c8a
more progress information, for the sake of sporadic dropouts;
wenzelm
parents:
65917
diff
changeset
|
337 |
build_out_progress.echo("Reading heap sizes ...") |
64120 | 338 |
val heap_sizes = |
339 |
build_info.finished_sessions.flatMap(session_name => |
|
340 |
{ |
|
341 |
val heap = isabelle_output + Path.explode(session_name) |
|
342 |
if (heap.is_file) |
|
343 |
Some("Heap " + session_name + " (" + Value.Long(heap.file.length) + " bytes)") |
|
344 |
else None |
|
345 |
}) |
|
64119
8094eaa38d4b
inline session ML statistics into main build log;
wenzelm
parents:
64118
diff
changeset
|
346 |
|
65927
23a1e2fa5c8a
more progress information, for the sake of sporadic dropouts;
wenzelm
parents:
65917
diff
changeset
|
347 |
build_out_progress.echo("Writing log file " + log_path.ext("xz") + " ...") |
64253 | 348 |
File.write_xz(log_path.ext("xz"), |
64173 | 349 |
terminate_lines( |
64296
544481988e65
explicit identification of builds and correlated build groups;
wenzelm
parents:
64263
diff
changeset
|
350 |
Build_Log.Log_File.print_props(META_INFO_MARKER, meta_info) :: build_result.out_lines ::: |
66913 | 351 |
session_build_info ::: |
64120 | 352 |
ml_statistics.map(Build_Log.Log_File.print_props(Build_Log.ML_STATISTICS_MARKER, _)) ::: |
65937 | 353 |
session_errors.map(Build_Log.Log_File.print_props(Build_Log.ERROR_MESSAGE_MARKER, _)) ::: |
64253 | 354 |
heap_sizes), XZ.options(6)) |
64117 | 355 |
|
64119
8094eaa38d4b
inline session ML statistics into main build log;
wenzelm
parents:
64118
diff
changeset
|
356 |
|
8094eaa38d4b
inline session ML statistics into main build log;
wenzelm
parents:
64118
diff
changeset
|
357 |
/* next build */ |
8094eaa38d4b
inline session ML statistics into main build log;
wenzelm
parents:
64118
diff
changeset
|
358 |
|
64052 | 359 |
if (multicore_base && first_build && isabelle_output_log.is_dir) |
64189 | 360 |
Isabelle_System.copy_dir(isabelle_output_log, isabelle_base_log) |
64052 | 361 |
|
64260 | 362 |
Isabelle_System.rm_tree(isabelle_output) |
363 |
||
64052 | 364 |
first_build = false |
365 |
||
64468
ed8940d6295c
back to more elementary result (see 5f49765a25ec): avoid concurrent use of ssh channel;
wenzelm
parents:
64466
diff
changeset
|
366 |
(build_result, log_path.ext("xz")) |
64051 | 367 |
} |
64025 | 368 |
} |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
369 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
370 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
371 |
/* command line entry point */ |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
372 |
|
64301 | 373 |
private object Multicore |
374 |
{ |
|
375 |
private val Pat1 = """^(\d+)$""".r |
|
376 |
private val Pat2 = """^(\d+)x(\d+)$""".r |
|
377 |
||
378 |
def parse(s: String): (Int, Int) = |
|
379 |
s match { |
|
380 |
case Pat1(Value.Int(x)) => (x, 1) |
|
381 |
case Pat2(Value.Int(x), Value.Int(y)) => (x, y) |
|
382 |
case _ => error("Bad multicore configuration: " + quote(s)) |
|
383 |
} |
|
384 |
} |
|
385 |
||
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
386 |
def main(args: Array[String]) |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
387 |
{ |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
388 |
Command_Line.tool0 { |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
389 |
var afp_rev: Option[String] = None |
64052 | 390 |
var multicore_base = false |
64025 | 391 |
var components_base = "" |
64030 | 392 |
var heap: Option[Int] = None |
64036 | 393 |
var max_heap: Option[Int] = None |
64301 | 394 |
var multicore_list = List(default_multicore) |
64025 | 395 |
var isabelle_identifier = default_isabelle_identifier |
66861
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
396 |
var afp_partition = 0 |
64030 | 397 |
var more_settings: List[String] = Nil |
64026 | 398 |
var fresh = false |
65843
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
399 |
var init_settings: List[String] = Nil |
64030 | 400 |
var arch_64 = false |
64025 | 401 |
var nonfree = false |
65844
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
402 |
var output_file = "" |
64025 | 403 |
var rev = default_rev |
66867
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
404 |
var ml_statistics_step = 1 |
64297 | 405 |
var build_tags = List.empty[String] |
67047 | 406 |
var user_home = default_user_home |
64025 | 407 |
var verbose = false |
65950
34c4cd9abc1a
no exit code from build processes by default, e.g. relevant for non-strict results of remote_build_history;
wenzelm
parents:
65937
diff
changeset
|
408 |
var exit_code = false |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
409 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
410 |
val getopts = Getopts(""" |
67047 | 411 |
Usage: Admin/build_history [OPTIONS] REPOSITORY [ARGS ...] |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
412 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
413 |
Options are: |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
414 |
-A REV include $ISABELLE_HOME/AFP repository at given revision |
64052 | 415 |
-B first multicore build serves as base for scheduling information |
64025 | 416 |
-C DIR base directory for Isabelle components (default: $ISABELLE_HOME_USER/../contrib) |
65843
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
417 |
-H SIZE minimal ML heap in MB (default: """ + default_heap + """ for x86, """ + |
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
418 |
default_heap * 2 + """ for x86_64) |
64301 | 419 |
-M MULTICORE multicore configurations (see below) |
64025 | 420 |
-N NAME alternative ISABELLE_IDENTIFIER (default: """ + default_isabelle_identifier + """) |
66861
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
421 |
-P NUMBER AFP partition number (0, 1, 2, default: 0=unrestricted) |
64036 | 422 |
-U SIZE maximal ML heap in MB (default: unbounded) |
64030 | 423 |
-e TEXT additional text for generated etc/settings |
64026 | 424 |
-f fresh build of Isabelle/Scala components (recommended) |
65843
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
425 |
-i TEXT initial text for generated etc/settings |
64030 | 426 |
-m ARCH processor architecture (32=x86, 64=x86_64, default: x86) |
64025 | 427 |
-n include nonfree components |
65844
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
428 |
-o FILE output file for log names (default: stdout) |
64026 | 429 |
-r REV update to revision (default: """ + default_rev + """) |
66867
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
430 |
-s NUMBER step size for ML statistics (0=none, 1=all, n=step, default: 1) |
64297 | 431 |
-t TAG free-form build tag (multiple occurrences possible) |
67047 | 432 |
-u DIR alternative USER_HOME directory |
64025 | 433 |
-v verbose |
65950
34c4cd9abc1a
no exit code from build processes by default, e.g. relevant for non-strict results of remote_build_history;
wenzelm
parents:
65937
diff
changeset
|
434 |
-x return overall exit code from build processes |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
435 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
436 |
Build Isabelle sessions from the history of another REPOSITORY clone, |
64026 | 437 |
passing ARGS directly to its isabelle build tool. |
64301 | 438 |
|
439 |
Each MULTICORE configuration consists of one or two numbers (default 1): |
|
440 |
THREADS or THREADSxPROCESSES, e.g. -M 1,2,4 or -M 1x4,2x2,4. |
|
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
441 |
""", |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
442 |
"A:" -> (arg => afp_rev = Some(arg)), |
64052 | 443 |
"B" -> (_ => multicore_base = true), |
64025 | 444 |
"C:" -> (arg => components_base = arg), |
64030 | 445 |
"H:" -> (arg => heap = Some(Value.Int.parse(arg))), |
64301 | 446 |
"M:" -> (arg => multicore_list = space_explode(',', arg).map(Multicore.parse(_))), |
64025 | 447 |
"N:" -> (arg => isabelle_identifier = arg), |
66861
f6676691ef8a
partition AFP sessions according to structure, which happens to cut it roughly into equal parts;
wenzelm
parents:
66860
diff
changeset
|
448 |
"P:" -> (arg => afp_partition = Value.Int.parse(arg)), |
64036 | 449 |
"U:" -> (arg => max_heap = Some(Value.Int.parse(arg))), |
64030 | 450 |
"e:" -> (arg => more_settings = more_settings ::: List(arg)), |
64026 | 451 |
"f" -> (_ => fresh = true), |
65843
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
452 |
"i:" -> (arg => init_settings = init_settings ::: List(arg)), |
64030 | 453 |
"m:" -> |
454 |
{ |
|
455 |
case "32" | "x86" => arch_64 = false |
|
456 |
case "64" | "x86_64" => arch_64 = true |
|
457 |
case bad => error("Bad processor architecture: " + quote(bad)) |
|
458 |
}, |
|
64025 | 459 |
"n" -> (_ => nonfree = true), |
65844
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
460 |
"o:" -> (arg => output_file = arg), |
64025 | 461 |
"r:" -> (arg => rev = arg), |
66867
b00d8e1f8ddd
added ml_statistics_step to trim stored properties;
wenzelm
parents:
66866
diff
changeset
|
462 |
"s:" -> (arg => ml_statistics_step = Value.Int.parse(arg)), |
64297 | 463 |
"t:" -> (arg => build_tags = build_tags ::: List(arg)), |
67047 | 464 |
"u:" -> (arg => user_home = Path.explode(arg)), |
65950
34c4cd9abc1a
no exit code from build processes by default, e.g. relevant for non-strict results of remote_build_history;
wenzelm
parents:
65937
diff
changeset
|
465 |
"v" -> (_ => verbose = true), |
34c4cd9abc1a
no exit code from build processes by default, e.g. relevant for non-strict results of remote_build_history;
wenzelm
parents:
65937
diff
changeset
|
466 |
"x" -> (_ => exit_code = true)) |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
467 |
|
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
468 |
val more_args = getopts(args) |
64026 | 469 |
val (root, build_args) = |
470 |
more_args match { |
|
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
471 |
case root :: build_args => (Path.explode(root), build_args) |
64026 | 472 |
case _ => getopts.usage() |
473 |
} |
|
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
474 |
|
64162 | 475 |
val progress = new Console_Progress(stderr = true) |
64346 | 476 |
|
64162 | 477 |
val results = |
67047 | 478 |
build_history(Options.init(), root, user_home = user_home, progress = progress, rev = rev, |
479 |
afp_rev = afp_rev, afp_partition = afp_partition, |
|
480 |
isabelle_identifier = isabelle_identifier, ml_statistics_step = ml_statistics_step, |
|
481 |
components_base = components_base, fresh = fresh, nonfree = nonfree, |
|
482 |
multicore_base = multicore_base, multicore_list = multicore_list, arch_64 = arch_64, |
|
483 |
heap = heap.getOrElse(if (arch_64) default_heap * 2 else default_heap), |
|
65843
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
484 |
max_heap = max_heap, init_settings = init_settings, more_settings = more_settings, |
d547173212d2
proper init_settings for init_component (before generated ML_OPTIONS etc.);
wenzelm
parents:
65646
diff
changeset
|
485 |
verbose = verbose, build_tags = build_tags, build_args = build_args) |
64162 | 486 |
|
65844
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
487 |
if (output_file == "") { |
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
488 |
for ((_, log_path) <- results) |
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
489 |
Output.writeln(log_path.implode, stdout = true) |
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
490 |
} |
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
491 |
else { |
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
492 |
File.write(Path.explode(output_file), |
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
493 |
cat_lines(for ((_, log_path) <- results) yield log_path.implode)) |
76e60a142ca1
support for explicit output file: potentially more robust than stdout;
wenzelm
parents:
65843
diff
changeset
|
494 |
} |
64472
c2191352e908
recovered Output.writeln for remote build_history (cf. ed8940d6295c), in order to have log files copied and removed;
wenzelm
parents:
64468
diff
changeset
|
495 |
|
64194
b5ada7dcceaa
integrity test of build_history vs. build_history_base;
wenzelm
parents:
64193
diff
changeset
|
496 |
val rc = (0 /: results) { case (rc, (res, _)) => rc max res.rc } |
65950
34c4cd9abc1a
no exit code from build processes by default, e.g. relevant for non-strict results of remote_build_history;
wenzelm
parents:
65937
diff
changeset
|
497 |
if (rc != 0 && exit_code) sys.exit(rc) |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
498 |
} |
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
499 |
} |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
500 |
|
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
501 |
|
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
502 |
|
64225 | 503 |
/** remote build_history -- via command-line **/ |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
504 |
|
64225 | 505 |
def remote_build_history( |
64256
c3197aeae90b
simplified SSH.Session: sftp channel is always open and its operations provided by the main interface;
wenzelm
parents:
64253
diff
changeset
|
506 |
ssh: SSH.Session, |
64227 | 507 |
isabelle_repos_self: Path, |
508 |
isabelle_repos_other: Path, |
|
67753
f28aee3ad1e6
uniform setup_repository (pull/clone without update);
wenzelm
parents:
67744
diff
changeset
|
509 |
isabelle_repos_source: String = Isabelle_Cronjob.isabelle_repos_source, |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
510 |
afp_repos_source: String = AFP.repos_source, |
65928
38eb5d633b0b
avoid conflict with generated settings of other_isabelle;
wenzelm
parents:
65927
diff
changeset
|
511 |
isabelle_identifier: String = "remote_build_history", |
64227 | 512 |
self_update: Boolean = false, |
64909 | 513 |
progress: Progress = No_Progress, |
66106
b5333fc056da
always start with fresh clone (with explicitly given rev): more robust on Windows;
wenzelm
parents:
65999
diff
changeset
|
514 |
rev: String = "", |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
515 |
afp_rev: Option[String] = None, |
64227 | 516 |
options: String = "", |
65929
de3adcf6a276
prefer strict result (in contrast to 0f3b0a929c02);
wenzelm
parents:
65928
diff
changeset
|
517 |
args: String = ""): List[(String, Bytes)] = |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
518 |
{ |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
519 |
/* Isabelle self repository */ |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
520 |
|
67754
197366313aaf
self_update implies push_isabelle_home (see also 4c253e84ae62);
wenzelm
parents:
67753
diff
changeset
|
521 |
val self_hg = |
66570 | 522 |
Mercurial.setup_repository(isabelle_repos_source, isabelle_repos_self, ssh = ssh) |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
523 |
|
66877
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
524 |
def execute(cmd: String, args: String, echo: Boolean = false, strict: Boolean = true): Unit = |
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
525 |
ssh.execute( |
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
526 |
Isabelle_System.export_isabelle_identifier(isabelle_identifier) + |
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
527 |
ssh.bash_path(isabelle_repos_self + Path.explode(cmd)) + " " + args, |
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
528 |
progress_stdout = progress.echo_if(echo, _), |
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
529 |
progress_stderr = progress.echo_if(echo, _), |
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
530 |
strict = strict).check |
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
531 |
|
66106
b5333fc056da
always start with fresh clone (with explicitly given rev): more robust on Windows;
wenzelm
parents:
65999
diff
changeset
|
532 |
if (self_update) { |
67754
197366313aaf
self_update implies push_isabelle_home (see also 4c253e84ae62);
wenzelm
parents:
67753
diff
changeset
|
533 |
val hg = Mercurial.repository(Path.explode("~~")) |
67756
d2fe32ebe3c7
clarified self_update: imitate visible directory state on remote side;
wenzelm
parents:
67754
diff
changeset
|
534 |
hg.push(self_hg.root_url, force = true) |
d2fe32ebe3c7
clarified self_update: imitate visible directory state on remote side;
wenzelm
parents:
67754
diff
changeset
|
535 |
self_hg.update(rev = hg.parent(), clean = true) |
67754
197366313aaf
self_update implies push_isabelle_home (see also 4c253e84ae62);
wenzelm
parents:
67753
diff
changeset
|
536 |
|
66877
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
537 |
execute("bin/isabelle", "components -I") |
66878 | 538 |
execute("bin/isabelle", "components -a", echo = true) |
66877
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
539 |
execute("Admin/build", "jars_fresh") |
66106
b5333fc056da
always start with fresh clone (with explicitly given rev): more robust on Windows;
wenzelm
parents:
65999
diff
changeset
|
540 |
} |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
541 |
|
67773 | 542 |
val rev_id = self_hg.id(rev) |
543 |
||
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
544 |
|
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
545 |
/* Isabelle other + AFP repository */ |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
546 |
|
66570 | 547 |
if (Mercurial.is_repository(isabelle_repos_other, ssh = ssh)) { |
66107
8c8e77dbe6fe
more robust: do not touch unrelated directory isabelle_repos_other (i.e. bad argument);
wenzelm
parents:
66106
diff
changeset
|
548 |
ssh.rm_tree(isabelle_repos_other) |
8c8e77dbe6fe
more robust: do not touch unrelated directory isabelle_repos_other (i.e. bad argument);
wenzelm
parents:
66106
diff
changeset
|
549 |
} |
64348
4c253e84ae62
clarified push/pull chain: current ISABELLE_HOME may server as source for changes that are not published on isabelle_repos_source yet (e.g. isabelle-release branch);
wenzelm
parents:
64346
diff
changeset
|
550 |
val other_hg = |
66106
b5333fc056da
always start with fresh clone (with explicitly given rev): more robust on Windows;
wenzelm
parents:
65999
diff
changeset
|
551 |
Mercurial.clone_repository( |
67773 | 552 |
ssh.bash_path(isabelle_repos_self), isabelle_repos_other, rev = rev_id, ssh = ssh) |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
553 |
|
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
554 |
val afp_options = |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
555 |
if (afp_rev.isEmpty) "" |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
556 |
else { |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
557 |
val afp_repos = isabelle_repos_other + Path.explode("AFP") |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
558 |
val afp_hg = Mercurial.setup_repository(afp_repos_source, afp_repos, ssh = ssh) |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
559 |
" -A " + Bash.string(afp_rev.get) |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
560 |
} |
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
561 |
|
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
562 |
|
64256
c3197aeae90b
simplified SSH.Session: sftp channel is always open and its operations provided by the main interface;
wenzelm
parents:
64253
diff
changeset
|
563 |
/* Admin/build_history */ |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
564 |
|
65846
aa6e58dc54d0
prefer explicit output file: potentially more robust than stdout;
wenzelm
parents:
65845
diff
changeset
|
565 |
ssh.with_tmp_dir(tmp_dir => |
aa6e58dc54d0
prefer explicit output file: potentially more robust than stdout;
wenzelm
parents:
65845
diff
changeset
|
566 |
{ |
aa6e58dc54d0
prefer explicit output file: potentially more robust than stdout;
wenzelm
parents:
65845
diff
changeset
|
567 |
val output_file = tmp_dir + Path.explode("output") |
64346 | 568 |
|
66877
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
569 |
execute("Admin/build_history", |
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
570 |
"-o " + ssh.bash_path(output_file) + |
67773 | 571 |
(if (rev == "") "" else " -r " + Bash.string(rev_id)) + " " + |
66860
54ae2cc05325
support for AFP in build_history and remote_build_history;
wenzelm
parents:
66570
diff
changeset
|
572 |
options + afp_options + " " + ssh.bash_path(isabelle_repos_other) + " " + args, |
66877
4f0ccfe1bcb6
uniform execute, with proper isabelle_identifier (notably for "isabelle components -I");
wenzelm
parents:
66876
diff
changeset
|
573 |
echo = true, strict = false) |
64468
ed8940d6295c
back to more elementary result (see 5f49765a25ec): avoid concurrent use of ssh channel;
wenzelm
parents:
64466
diff
changeset
|
574 |
|
65929
de3adcf6a276
prefer strict result (in contrast to 0f3b0a929c02);
wenzelm
parents:
65928
diff
changeset
|
575 |
for (line <- split_lines(ssh.read(output_file))) |
de3adcf6a276
prefer strict result (in contrast to 0f3b0a929c02);
wenzelm
parents:
65928
diff
changeset
|
576 |
yield { |
de3adcf6a276
prefer strict result (in contrast to 0f3b0a929c02);
wenzelm
parents:
65928
diff
changeset
|
577 |
val log = Path.explode(line) |
de3adcf6a276
prefer strict result (in contrast to 0f3b0a929c02);
wenzelm
parents:
65928
diff
changeset
|
578 |
val bytes = ssh.read_bytes(log) |
de3adcf6a276
prefer strict result (in contrast to 0f3b0a929c02);
wenzelm
parents:
65928
diff
changeset
|
579 |
ssh.rm(log) |
65999 | 580 |
(log.base_name, bytes) |
65929
de3adcf6a276
prefer strict result (in contrast to 0f3b0a929c02);
wenzelm
parents:
65928
diff
changeset
|
581 |
} |
65846
aa6e58dc54d0
prefer explicit output file: potentially more robust than stdout;
wenzelm
parents:
65845
diff
changeset
|
582 |
}) |
64223
9d5b9f41df77
remove invocation of build_history: results are reported via stdout;
wenzelm
parents:
64213
diff
changeset
|
583 |
} |
64021
1e23caac8757
basic setup for Admin/build_history -- outside of Isabelle environment;
wenzelm
parents:
diff
changeset
|
584 |
} |