author | haftmann |
Fri, 19 Aug 2022 05:49:16 +0000 | |
changeset 75882 | 96d5fa32f0f7 |
parent 75743 | f97f7ab7ca56 |
child 75920 | 27bf2533f4a4 |
permissions | -rw-r--r-- |
69012 | 1 |
/* Title: Pure/PIDE/headless.scala |
67054 | 2 |
Author: Makarius |
3 |
||
69012 | 4 |
Headless PIDE session and resources from file-system. |
67054 | 5 |
*/ |
6 |
||
7 |
package isabelle |
|
8 |
||
9 |
||
67925 | 10 |
import java.io.{File => JFile} |
11 |
||
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
12 |
import scala.annotation.tailrec |
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
13 |
import scala.collection.mutable |
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
14 |
|
67925 | 15 |
|
75393 | 16 |
object Headless { |
69012 | 17 |
/** session **/ |
67061
2efa25302f34
synchronous session start (similar to isabelle.vscode.Server);
wenzelm
parents:
67059
diff
changeset
|
18 |
|
68916 | 19 |
private def stable_snapshot( |
75393 | 20 |
state: Document.State, |
21 |
version: Document.Version, |
|
22 |
name: Document.Node.Name |
|
23 |
): Document.Snapshot = { |
|
68916 | 24 |
val snapshot = state.snapshot(name) |
25 |
assert(version.id == snapshot.version.id) |
|
26 |
snapshot |
|
27 |
} |
|
28 |
||
69013 | 29 |
class Use_Theories_Result private[Headless]( |
67883 | 30 |
val state: Document.State, |
67889 | 31 |
val version: Document.Version, |
68925 | 32 |
val nodes: List[(Document.Node.Name, Document_Status.Node_Status)], |
75393 | 33 |
val nodes_committed: List[(Document.Node.Name, Document_Status.Node_Status)] |
34 |
) { |
|
35 |
def nodes_pending: List[(Document.Node.Name, Document_Status.Node_Status)] = { |
|
69032
90bb4cabe1e8
clarified errors: no result from forced session.stop, check pending theories;
wenzelm
parents:
69013
diff
changeset
|
36 |
val committed = nodes_committed.iterator.map(_._1).toSet |
90bb4cabe1e8
clarified errors: no result from forced session.stop, check pending theories;
wenzelm
parents:
69013
diff
changeset
|
37 |
nodes.filter(p => !committed(p._1)) |
90bb4cabe1e8
clarified errors: no result from forced session.stop, check pending theories;
wenzelm
parents:
69013
diff
changeset
|
38 |
} |
90bb4cabe1e8
clarified errors: no result from forced session.stop, check pending theories;
wenzelm
parents:
69013
diff
changeset
|
39 |
|
68925 | 40 |
def snapshot(name: Document.Node.Name): Document.Snapshot = |
41 |
stable_snapshot(state, version, name) |
|
42 |
||
43 |
def ok: Boolean = |
|
44 |
(nodes.iterator ++ nodes_committed.iterator).forall({ case (_, st) => st.ok }) |
|
67879 | 45 |
} |
46 |
||
69520 | 47 |
class Session private[Headless]( |
48 |
session_name: String, |
|
49 |
_session_options: => Options, |
|
75393 | 50 |
override val resources: Resources) |
51 |
extends isabelle.Session(_session_options, resources) { |
|
69520 | 52 |
session => |
68694
03e104be99af
added check_delay / check_limit for more robust treatment of structurally broken theory sources (or genuine non-termination);
wenzelm
parents:
68365
diff
changeset
|
53 |
|
03e104be99af
added check_delay / check_limit for more robust treatment of structurally broken theory sources (or genuine non-termination);
wenzelm
parents:
68365
diff
changeset
|
54 |
|
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
55 |
private def loaded_theory(name: Document.Node.Name): Boolean = |
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
56 |
resources.session_base.loaded_theory(name.theory) |
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
57 |
|
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
58 |
|
69520 | 59 |
/* options */ |
60 |
||
70787 | 61 |
override def consolidate_delay: Time = session_options.seconds("headless_consolidate_delay") |
62 |
override def prune_delay: Time = session_options.seconds("headless_prune_delay") |
|
63 |
||
69520 | 64 |
def default_check_delay: Time = session_options.seconds("headless_check_delay") |
65 |
def default_check_limit: Int = session_options.int("headless_check_limit") |
|
66 |
def default_nodes_status_delay: Time = session_options.seconds("headless_nodes_status_delay") |
|
67 |
def default_watchdog_timeout: Time = session_options.seconds("headless_watchdog_timeout") |
|
68 |
def default_commit_cleanup_delay: Time = session_options.seconds("headless_commit_cleanup_delay") |
|
67063 | 69 |
|
68922 | 70 |
|
71 |
/* temporary directory */ |
|
72 |
||
67925 | 73 |
val tmp_dir: JFile = Isabelle_System.tmp_dir("server_session") |
67946 | 74 |
val tmp_dir_name: String = File.path(tmp_dir).implode |
67925 | 75 |
|
68923 | 76 |
def master_directory(master_dir: String): String = |
77 |
proper_string(master_dir) getOrElse tmp_dir_name |
|
78 |
||
67945 | 79 |
override def toString: String = session_name |
80 |
||
75393 | 81 |
override def stop(): Process_Result = { |
67925 | 82 |
try { super.stop() } |
83 |
finally { Isabelle_System.rm_tree(tmp_dir) } |
|
84 |
} |
|
85 |
||
67936 | 86 |
|
87 |
/* theories */ |
|
88 |
||
75393 | 89 |
private object Load_State { |
70872 | 90 |
def finished: Load_State = Load_State(Nil, Nil, 0) |
91 |
||
92 |
def count_file(name: Document.Node.Name): Long = |
|
70873 | 93 |
if (loaded_theory(name)) 0 else name.path.file.length |
70872 | 94 |
} |
95 |
||
96 |
private case class Load_State( |
|
75393 | 97 |
pending: List[Document.Node.Name], |
98 |
rest: List[Document.Node.Name], |
|
99 |
load_limit: Long |
|
100 |
) { |
|
70872 | 101 |
def next( |
102 |
dep_graph: Document.Node.Name.Graph[Unit], |
|
75393 | 103 |
finished: Document.Node.Name => Boolean |
104 |
): (List[Document.Node.Name], Load_State) = { |
|
105 |
def load_requirements( |
|
106 |
pending1: List[Document.Node.Name], |
|
107 |
rest1: List[Document.Node.Name] |
|
108 |
) : (List[Document.Node.Name], Load_State) = { |
|
72065
11dc8929832d
clarified order --- proper sorting of requirements;
wenzelm
parents:
71726
diff
changeset
|
109 |
val load_theories = dep_graph.all_preds_rev(pending1).filterNot(finished) |
70872 | 110 |
(load_theories, Load_State(pending1, rest1, load_limit)) |
111 |
} |
|
112 |
||
113 |
if (!pending.forall(finished)) (Nil, this) |
|
114 |
else if (rest.isEmpty) (Nil, Load_State.finished) |
|
115 |
else if (load_limit == 0) load_requirements(rest, Nil) |
|
116 |
else { |
|
117 |
val reachable = |
|
118 |
dep_graph.reachable_limit(load_limit, Load_State.count_file, dep_graph.imm_preds, rest) |
|
119 |
val (pending1, rest1) = rest.partition(reachable) |
|
120 |
load_requirements(pending1, rest1) |
|
121 |
} |
|
122 |
} |
|
123 |
} |
|
124 |
||
68914 | 125 |
private sealed case class Use_Theories_State( |
70697 | 126 |
dep_graph: Document.Node.Name.Graph[Unit], |
70765 | 127 |
load_state: Load_State, |
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
128 |
watchdog_timeout: Time, |
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
129 |
commit: Option[(Document.Snapshot, Document_Status.Node_Status) => Unit], |
68914 | 130 |
last_update: Time = Time.now(), |
131 |
nodes_status: Document_Status.Nodes_Status = Document_Status.Nodes_Status.empty, |
|
68925 | 132 |
already_committed: Map[Document.Node.Name, Document_Status.Node_Status] = Map.empty, |
75393 | 133 |
result: Option[Exn.Result[Use_Theories_Result]] = None |
134 |
) { |
|
68914 | 135 |
def update(new_nodes_status: Document_Status.Nodes_Status): Use_Theories_State = |
136 |
copy(last_update = Time.now(), nodes_status = new_nodes_status) |
|
137 |
||
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
138 |
def watchdog: Boolean = |
68914 | 139 |
watchdog_timeout > Time.zero && Time.now() - last_update > watchdog_timeout |
140 |
||
70644
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
141 |
def finished_result: Boolean = result.isDefined |
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
142 |
|
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
143 |
def join_result: Option[(Exn.Result[Use_Theories_Result], Use_Theories_State)] = |
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
144 |
if (finished_result) Some((result.get, this)) else None |
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
145 |
|
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
146 |
def cancel_result: Use_Theories_State = |
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
147 |
if (finished_result) this else copy(result = Some(Exn.Exn(Exn.Interrupt()))) |
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
148 |
|
75393 | 149 |
def clean_theories: (List[Document.Node.Name], Use_Theories_State) = { |
150 |
@tailrec def frontier( |
|
151 |
base: List[Document.Node.Name], |
|
152 |
front: Set[Document.Node.Name] |
|
153 |
) : Set[Document.Node.Name] = { |
|
70698 | 154 |
val add = base.filter(name => dep_graph.imm_succs(name).forall(front)) |
155 |
if (add.isEmpty) front |
|
156 |
else { |
|
157 |
val preds = add.map(dep_graph.imm_preds) |
|
73359 | 158 |
val base1 = |
159 |
preds.tail.foldLeft(preds.head)(_ ++ _).toList.filter(already_committed.keySet) |
|
70698 | 160 |
frontier(base1, front ++ add) |
161 |
} |
|
162 |
} |
|
163 |
||
70763
5fae55752c70
tuned messages (again) -- avoid confusion wrt. total remaining size;
wenzelm
parents:
70710
diff
changeset
|
164 |
if (already_committed.isEmpty) (Nil, this) |
70698 | 165 |
else { |
70705 | 166 |
val base = |
167 |
(for { |
|
168 |
(name, (_, (_, succs))) <- dep_graph.iterator |
|
169 |
if succs.isEmpty && already_committed.isDefinedAt(name) |
|
170 |
} yield name).toList |
|
171 |
val clean = frontier(base, Set.empty) |
|
70763
5fae55752c70
tuned messages (again) -- avoid confusion wrt. total remaining size;
wenzelm
parents:
70710
diff
changeset
|
172 |
if (clean.isEmpty) (Nil, this) |
70698 | 173 |
else { |
70763
5fae55752c70
tuned messages (again) -- avoid confusion wrt. total remaining size;
wenzelm
parents:
70710
diff
changeset
|
174 |
(dep_graph.topological_order.filter(clean), |
70699 | 175 |
copy(dep_graph = dep_graph.exclude(clean))) |
70698 | 176 |
} |
177 |
} |
|
178 |
} |
|
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
179 |
|
75393 | 180 |
def check( |
181 |
state: Document.State, |
|
182 |
version: Document.Version, |
|
183 |
beyond_limit: Boolean |
|
184 |
) : (List[Document.Node.Name], Use_Theories_State) = { |
|
69035 | 185 |
val already_committed1 = |
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
186 |
commit match { |
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
187 |
case None => already_committed |
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
188 |
case Some(commit_fn) => |
73359 | 189 |
dep_graph.topological_order.foldLeft(already_committed) { |
190 |
case (committed, name) => |
|
191 |
def parents_committed: Boolean = |
|
192 |
version.nodes(name).header.imports.forall(parent => |
|
193 |
loaded_theory(parent) || committed.isDefinedAt(parent)) |
|
194 |
if (!committed.isDefinedAt(name) && parents_committed && |
|
75393 | 195 |
state.node_consolidated(version, name)) { |
73359 | 196 |
val snapshot = stable_snapshot(state, version, name) |
197 |
val status = Document_Status.Node_Status.make(state, version, name) |
|
198 |
commit_fn(snapshot, status) |
|
199 |
committed + (name -> status) |
|
200 |
} |
|
201 |
else committed |
|
202 |
} |
|
68916 | 203 |
} |
204 |
||
70657 | 205 |
def finished_theory(name: Document.Node.Name): Boolean = |
206 |
loaded_theory(name) || |
|
70704 | 207 |
(if (commit.isDefined) already_committed1.isDefinedAt(name) |
208 |
else state.node_consolidated(version, name)) |
|
70657 | 209 |
|
70644
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
210 |
val result1 = |
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
211 |
if (!finished_result && |
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
212 |
(beyond_limit || watchdog || |
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
213 |
dep_graph.keys_iterator.forall(name => |
75393 | 214 |
finished_theory(name) || nodes_status.quasi_consolidated(name)))) { |
70644
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
215 |
val nodes = |
70657 | 216 |
(for { |
217 |
name <- dep_graph.keys_iterator |
|
218 |
if !loaded_theory(name) |
|
75742 | 219 |
} yield name -> Document_Status.Node_Status.make(state, version, name)).toList |
70644
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
220 |
val nodes_committed = |
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
221 |
(for { |
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
222 |
name <- dep_graph.keys_iterator |
70644
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
223 |
status <- already_committed1.get(name) |
75742 | 224 |
} yield name -> status).toList |
70644
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
225 |
Some(Exn.Res(new Use_Theories_Result(state, version, nodes, nodes_committed))) |
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
226 |
} |
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
227 |
else result |
68925 | 228 |
|
71601 | 229 |
val (load_theories, load_state1) = load_state.next(dep_graph, finished_theory) |
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
230 |
|
70796
2739631ac368
discontinued pointless dump_checkpoint and share_common_data -- superseded by base logic image in Isabelle/MMT;
wenzelm
parents:
70795
diff
changeset
|
231 |
(load_theories, |
70765 | 232 |
copy(already_committed = already_committed1, result = result1, load_state = load_state1)) |
68916 | 233 |
} |
68914 | 234 |
} |
235 |
||
67064
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
236 |
def use_theories( |
67940
b4e80f062fbf
clarified signature -- eliminated somewhat pointless positions;
wenzelm
parents:
67939
diff
changeset
|
237 |
theories: List[String], |
67064
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
238 |
qualifier: String = Sessions.DRAFT, |
67881 | 239 |
master_dir: String = "", |
69920 | 240 |
unicode_symbols: Boolean = false, |
68943 | 241 |
check_delay: Time = default_check_delay, |
69520 | 242 |
check_limit: Int = default_check_limit, |
68947 | 243 |
watchdog_timeout: Time = default_watchdog_timeout, |
68943 | 244 |
nodes_status_delay: Time = default_nodes_status_delay, |
69458 | 245 |
id: UUID.T = UUID.random(), |
68916 | 246 |
// commit: must not block, must not fail |
247 |
commit: Option[(Document.Snapshot, Document_Status.Node_Status) => Unit] = None, |
|
68981 | 248 |
commit_cleanup_delay: Time = default_commit_cleanup_delay, |
75393 | 249 |
progress: Progress = new Progress |
250 |
): Use_Theories_Result = { |
|
251 |
val dependencies = { |
|
68894
1dbdad1b57a5
more robust: load_theories after consumer is installed;
wenzelm
parents:
68888
diff
changeset
|
252 |
val import_names = |
68923 | 253 |
theories.map(thy => |
254 |
resources.import_name(qualifier, master_directory(master_dir), thy) -> Position.none) |
|
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
255 |
resources.dependencies(import_names, progress = progress).check_errors |
68894
1dbdad1b57a5
more robust: load_theories after consumer is installed;
wenzelm
parents:
68888
diff
changeset
|
256 |
} |
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
257 |
val dep_theories = dependencies.theories |
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
258 |
val dep_theories_set = dep_theories.toSet |
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
259 |
val dep_files = |
72816
ea4f86914cb2
support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents:
72799
diff
changeset
|
260 |
for (path <- dependencies.loaded_files) |
ea4f86914cb2
support for PIDE markup for auxiliary files ("blobs");
wenzelm
parents:
72799
diff
changeset
|
261 |
yield Document.Node.Name(resources.append("", path)) |
67064
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
262 |
|
75393 | 263 |
val use_theories_state = { |
70797 | 264 |
val dep_graph = dependencies.theory_graph |
265 |
||
266 |
val maximals = dep_graph.maximals |
|
267 |
val rest = |
|
268 |
if (maximals.isEmpty || maximals.tail.isEmpty) maximals |
|
269 |
else { |
|
70800 | 270 |
val depth = dep_graph.node_depth(Load_State.count_file) |
70797 | 271 |
maximals.sortBy(node => - depth(node)) |
272 |
} |
|
70800 | 273 |
val load_limit = |
70801 | 274 |
if (commit.isDefined) (session_options.real("headless_load_limit") * 1024 * 1024).round |
70800 | 275 |
else 0 |
70798 | 276 |
val load_state = Load_State(Nil, rest, load_limit) |
70797 | 277 |
|
278 |
Synchronized(Use_Theories_State(dep_graph, load_state, watchdog_timeout, commit)) |
|
279 |
} |
|
67064
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
280 |
|
75393 | 281 |
def check_state(beyond_limit: Boolean = false): Unit = { |
70775
97d3485028b6
more sequential access to Session.manager.global_state: avoid minor divergence of tip version;
wenzelm
parents:
70774
diff
changeset
|
282 |
val state = session.get_state() |
70797 | 283 |
for { |
284 |
version <- state.stable_tip_version |
|
285 |
load_theories = use_theories_state.change_result(_.check(state, version, beyond_limit)) |
|
286 |
if load_theories.nonEmpty |
|
287 |
} resources.load_theories(session, id, load_theories, dep_files, unicode_symbols, progress) |
|
67064
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
288 |
} |
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
289 |
|
75393 | 290 |
val check_progress = { |
68694
03e104be99af
added check_delay / check_limit for more robust treatment of structurally broken theory sources (or genuine non-termination);
wenzelm
parents:
68365
diff
changeset
|
291 |
var check_count = 0 |
75393 | 292 |
Event_Timer.request(Time.now(), repeat = Some(check_delay)) { |
293 |
if (progress.stopped) use_theories_state.change(_.cancel_result) |
|
294 |
else { |
|
295 |
check_count += 1 |
|
296 |
check_state(check_limit > 0 && check_count > check_limit) |
|
68694
03e104be99af
added check_delay / check_limit for more robust treatment of structurally broken theory sources (or genuine non-termination);
wenzelm
parents:
68365
diff
changeset
|
297 |
} |
75393 | 298 |
} |
68694
03e104be99af
added check_delay / check_limit for more robust treatment of structurally broken theory sources (or genuine non-termination);
wenzelm
parents:
68365
diff
changeset
|
299 |
} |
67894
fee080c4045f
more robust check_state loop, even without session activity (e.g. idempotent use_theories);
wenzelm
parents:
67893
diff
changeset
|
300 |
|
75393 | 301 |
val consumer = { |
68906 | 302 |
val delay_nodes_status = |
71704 | 303 |
Delay.first(nodes_status_delay max Time.zero) { |
69818
60d0ee8f2ddb
more robust: avoid potentially unrelated snapshot for the sake of is_suppressed;
wenzelm
parents:
69817
diff
changeset
|
304 |
progress.nodes_status(use_theories_state.value.nodes_status) |
68906 | 305 |
} |
68770
add44e2b8cb0
optional notification of nodes_status (via progress);
wenzelm
parents:
68758
diff
changeset
|
306 |
|
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
307 |
val delay_commit_clean = |
71704 | 308 |
Delay.first(commit_cleanup_delay max Time.zero) { |
70763
5fae55752c70
tuned messages (again) -- avoid confusion wrt. total remaining size;
wenzelm
parents:
70710
diff
changeset
|
309 |
val clean_theories = use_theories_state.change_result(_.clean_theories) |
70702 | 310 |
if (clean_theories.nonEmpty) { |
70770 | 311 |
progress.echo("Removing " + clean_theories.length + " theories ...") |
70702 | 312 |
resources.clean_theories(session, id, clean_theories) |
313 |
} |
|
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
314 |
} |
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
315 |
|
75406 | 316 |
isabelle.Session.Consumer[isabelle.Session.Commands_Changed](getClass.getName) { |
75742 | 317 |
changed => |
68770
add44e2b8cb0
optional notification of nodes_status (via progress);
wenzelm
parents:
68758
diff
changeset
|
318 |
if (changed.nodes.exists(dep_theories_set)) { |
add44e2b8cb0
optional notification of nodes_status (via progress);
wenzelm
parents:
68758
diff
changeset
|
319 |
val snapshot = session.snapshot() |
add44e2b8cb0
optional notification of nodes_status (via progress);
wenzelm
parents:
68758
diff
changeset
|
320 |
val state = snapshot.state |
add44e2b8cb0
optional notification of nodes_status (via progress);
wenzelm
parents:
68758
diff
changeset
|
321 |
val version = snapshot.version |
add44e2b8cb0
optional notification of nodes_status (via progress);
wenzelm
parents:
68758
diff
changeset
|
322 |
|
68957 | 323 |
val theory_progress = |
75394 | 324 |
use_theories_state.change_result { st => |
75393 | 325 |
val domain = |
326 |
if (st.nodes_status.is_empty) dep_theories_set |
|
327 |
else changed.nodes.iterator.filter(dep_theories_set).toSet |
|
68899 | 328 |
|
75393 | 329 |
val (nodes_status_changed, nodes_status1) = |
330 |
st.nodes_status.update(resources, state, version, |
|
331 |
domain = Some(domain), trim = changed.assignment) |
|
68899 | 332 |
|
75393 | 333 |
if (nodes_status_delay >= Time.zero && nodes_status_changed) { |
334 |
delay_nodes_status.invoke() |
|
335 |
} |
|
68883
3653b3ad729e
clarified Thy_Resources.Session.use_theories: "terminated" node status is sufficient;
wenzelm
parents:
68771
diff
changeset
|
336 |
|
75393 | 337 |
val theory_progress = |
338 |
(for { |
|
339 |
(name, node_status) <- nodes_status1.present.iterator |
|
340 |
if changed.nodes.contains(name) && !st.already_committed.isDefinedAt(name) |
|
341 |
p1 = node_status.percentage |
|
75742 | 342 |
if p1 > 0 && !st.nodes_status.get(name).map(_.percentage).contains(p1) |
75393 | 343 |
} yield Progress.Theory(name.theory, percentage = Some(p1))).toList |
68903 | 344 |
|
75393 | 345 |
(theory_progress, st.update(nodes_status1)) |
75394 | 346 |
} |
68330 | 347 |
|
71601 | 348 |
theory_progress.foreach(progress.theory) |
68903 | 349 |
|
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
350 |
check_state() |
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
351 |
|
68981 | 352 |
if (commit.isDefined && commit_cleanup_delay > Time.zero) { |
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
353 |
if (use_theories_state.value.finished_result) |
73367 | 354 |
delay_commit_clean.revoke() |
355 |
else delay_commit_clean.invoke() |
|
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
356 |
} |
68330 | 357 |
} |
67064
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
358 |
} |
68906 | 359 |
} |
67064
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
360 |
|
67892 | 361 |
try { |
362 |
session.commands_changed += consumer |
|
70653
f7c5b30fc432
load theories in stages, to reduce ML heap requirements;
wenzelm
parents:
70649
diff
changeset
|
363 |
check_state() |
70644
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
364 |
use_theories_state.guarded_access(_.join_result) |
73367 | 365 |
check_progress.cancel() |
67892 | 366 |
} |
367 |
finally { |
|
68907 | 368 |
session.commands_changed -= consumer |
67892 | 369 |
resources.unload_theories(session, id, dep_theories) |
370 |
} |
|
67884
43af581d7d8e
unload_theories after consolidation -- reset node_required;
wenzelm
parents:
67883
diff
changeset
|
371 |
|
70644
b23a6dfcfd57
clarified state variable: avoid extra mutability via Promise;
wenzelm
parents:
70640
diff
changeset
|
372 |
Exn.release(use_theories_state.guarded_access(_.join_result)) |
67064
fb487246ef4f
synchronous use_theories, based on consolidated_state;
wenzelm
parents:
67063
diff
changeset
|
373 |
} |
67936 | 374 |
|
67939 | 375 |
def purge_theories( |
68915 | 376 |
theories: List[String], |
377 |
qualifier: String = Sessions.DRAFT, |
|
378 |
master_dir: String = "", |
|
75393 | 379 |
all: Boolean = false |
380 |
): (List[Document.Node.Name], List[Document.Node.Name]) = { |
|
68923 | 381 |
val nodes = |
382 |
if (all) None |
|
383 |
else Some(theories.map(resources.import_name(qualifier, master_directory(master_dir), _))) |
|
75743 | 384 |
resources.purge_theories(nodes) |
68915 | 385 |
} |
67063 | 386 |
} |
387 |
||
67061
2efa25302f34
synchronous session start (similar to isabelle.vscode.Server);
wenzelm
parents:
67059
diff
changeset
|
388 |
|
67054 | 389 |
|
69012 | 390 |
/** resources **/ |
68922 | 391 |
|
75393 | 392 |
object Resources { |
71599 | 393 |
def apply(options: Options, base_info: Sessions.Base_Info, log: Logger = No_Logger): Resources = |
394 |
new Resources(options, base_info, log = log) |
|
69536 | 395 |
|
396 |
def make( |
|
397 |
options: Options, |
|
398 |
session_name: String, |
|
399 |
session_dirs: List[Path] = Nil, |
|
400 |
include_sessions: List[String] = Nil, |
|
71726
a5fda30edae2
clarified signature: more uniform treatment of stopped/interrupted state;
wenzelm
parents:
71704
diff
changeset
|
401 |
progress: Progress = new Progress, |
75393 | 402 |
log: Logger = No_Logger |
403 |
): Resources = { |
|
69536 | 404 |
val base_info = |
405 |
Sessions.base_info(options, session_name, dirs = session_dirs, |
|
406 |
include_sessions = include_sessions, progress = progress) |
|
71599 | 407 |
apply(options, base_info, log = log) |
69536 | 408 |
} |
409 |
||
69012 | 410 |
final class Theory private[Headless]( |
411 |
val node_name: Document.Node.Name, |
|
412 |
val node_header: Document.Node.Header, |
|
413 |
val text: String, |
|
75393 | 414 |
val node_required: Boolean |
415 |
) { |
|
69012 | 416 |
override def toString: String = node_name.toString |
68922 | 417 |
|
69012 | 418 |
def node_perspective: Document.Node.Perspective_Text = |
419 |
Document.Node.Perspective(node_required, Text.Perspective.empty, Document.Node.Overlays.empty) |
|
68922 | 420 |
|
69012 | 421 |
def make_edits(text_edits: List[Text.Edit]): List[Document.Edit_Text] = |
422 |
List(node_name -> Document.Node.Deps(node_header), |
|
423 |
node_name -> Document.Node.Edits(text_edits), |
|
424 |
node_name -> node_perspective) |
|
68922 | 425 |
|
75393 | 426 |
def node_edits(old: Option[Theory]): List[Document.Edit_Text] = { |
69012 | 427 |
val (text_edits, old_required) = |
428 |
if (old.isEmpty) (Text.Edit.inserts(0, text), false) |
|
429 |
else (Text.Edit.replace(0, old.get.text, text), old.get.node_required) |
|
67887
a4d5342898b1
unload_theories: actually observe required state;
wenzelm
parents:
67885
diff
changeset
|
430 |
|
69012 | 431 |
if (text_edits.isEmpty && node_required == old_required) Nil |
432 |
else make_edits(text_edits) |
|
433 |
} |
|
67887
a4d5342898b1
unload_theories: actually observe required state;
wenzelm
parents:
67885
diff
changeset
|
434 |
|
69012 | 435 |
def purge_edits: List[Document.Edit_Text] = |
436 |
make_edits(Text.Edit.removes(0, text)) |
|
67936 | 437 |
|
69012 | 438 |
def required(required: Boolean): Theory = |
439 |
if (required == node_required) this |
|
440 |
else new Theory(node_name, node_header, text, required) |
|
67936 | 441 |
} |
442 |
||
69012 | 443 |
sealed case class State( |
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
444 |
blobs: Map[Document.Node.Name, Document.Blob] = Map.empty, |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
445 |
theories: Map[Document.Node.Name, Theory] = Map.empty, |
75393 | 446 |
required: Multi_Map[Document.Node.Name, UUID.T] = Multi_Map.empty |
447 |
) { |
|
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
448 |
/* blobs */ |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
449 |
|
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
450 |
def doc_blobs: Document.Blobs = Document.Blobs(blobs) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
451 |
|
75393 | 452 |
def update_blobs(names: List[Document.Node.Name]): (Document.Blobs, State) = { |
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
453 |
val new_blobs = |
75394 | 454 |
names.flatMap { name => |
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
455 |
val bytes = Bytes.read(name.path) |
75393 | 456 |
def new_blob: Document.Blob = { |
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
457 |
val text = bytes.text |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
458 |
Document.Blob(bytes, text, Symbol.Text_Chunk(text), changed = true) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
459 |
} |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
460 |
blobs.get(name) match { |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
461 |
case Some(blob) => if (blob.bytes == bytes) None else Some(name -> new_blob) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
462 |
case None => Some(name -> new_blob) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
463 |
} |
75394 | 464 |
} |
73359 | 465 |
val blobs1 = new_blobs.foldLeft(blobs)(_ + _) |
466 |
val blobs2 = new_blobs.foldLeft(blobs) { case (map, (a, b)) => map + (a -> b.unchanged) } |
|
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
467 |
(Document.Blobs(blobs1), copy(blobs = blobs2)) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
468 |
} |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
469 |
|
75393 | 470 |
def blob_edits( |
471 |
name: Document.Node.Name, |
|
472 |
old_blob: Option[Document.Blob] |
|
473 |
) : List[Document.Edit_Text] = { |
|
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
474 |
val blob = blobs.getOrElse(name, error("Missing blob " + quote(name.toString))) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
475 |
val text_edits = |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
476 |
old_blob match { |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
477 |
case None => List(Text.Edit.insert(0, blob.source)) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
478 |
case Some(blob0) => Text.Edit.replace(0, blob0.source, blob.source) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
479 |
} |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
480 |
if (text_edits.isEmpty) Nil |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
481 |
else List(name -> Document.Node.Blob(blob), name -> Document.Node.Edits(text_edits)) |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
482 |
} |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
483 |
|
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
484 |
|
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
485 |
/* theories */ |
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
486 |
|
70674
29bb1ebb188f
clarified signature: proper Document.Node.Ordering conforming to equality (e.g. required in situations where theory names are ambiguous due to overlapping session directories);
wenzelm
parents:
70657
diff
changeset
|
487 |
lazy val theory_graph: Document.Node.Name.Graph[Unit] = |
29bb1ebb188f
clarified signature: proper Document.Node.Ordering conforming to equality (e.g. required in situations where theory names are ambiguous due to overlapping session directories);
wenzelm
parents:
70657
diff
changeset
|
488 |
Document.Node.Name.make_graph( |
69012 | 489 |
for ((name, theory) <- theories.toList) |
71601 | 490 |
yield ((name, ()), theory.node_header.imports.filter(theories.isDefinedAt))) |
67056 | 491 |
|
69012 | 492 |
def is_required(name: Document.Node.Name): Boolean = required.isDefinedAt(name) |
493 |
||
69458 | 494 |
def insert_required(id: UUID.T, names: List[Document.Node.Name]): State = |
73359 | 495 |
copy(required = names.foldLeft(required)(_.insert(_, id))) |
69012 | 496 |
|
69458 | 497 |
def remove_required(id: UUID.T, names: List[Document.Node.Name]): State = |
73359 | 498 |
copy(required = names.foldLeft(required)(_.remove(_, id))) |
68958 | 499 |
|
69012 | 500 |
def update_theories(update: List[(Document.Node.Name, Theory)]): State = |
501 |
copy(theories = |
|
73359 | 502 |
update.foldLeft(theories) { |
503 |
case (thys, (name, thy)) => |
|
504 |
thys.get(name) match { |
|
505 |
case Some(thy1) if thy1 == thy => thys |
|
506 |
case _ => thys + (name -> thy) |
|
507 |
} |
|
508 |
}) |
|
69012 | 509 |
|
75393 | 510 |
def remove_theories(remove: List[Document.Node.Name]): State = { |
73120
c3589f2dff31
more informative errors: simplify diagnosis of spurious failures reported by users;
wenzelm
parents:
72816
diff
changeset
|
511 |
require(remove.forall(name => !is_required(name)), "attempt to remove required nodes") |
69012 | 512 |
copy(theories = theories -- remove) |
513 |
} |
|
514 |
||
75393 | 515 |
def unload_theories( |
516 |
id: UUID.T, |
|
517 |
theories: List[Document.Node.Name] |
|
518 |
) : (List[Document.Edit_Text], State) = { |
|
70649 | 519 |
val st1 = remove_required(id, theories) |
67893 | 520 |
val theory_edits = |
69012 | 521 |
for { |
70649 | 522 |
node_name <- theories |
69012 | 523 |
theory <- st1.theories.get(node_name) |
524 |
} |
|
67893 | 525 |
yield { |
526 |
val theory1 = theory.required(st1.is_required(node_name)) |
|
69012 | 527 |
val edits = theory1.node_edits(Some(theory)) |
67893 | 528 |
(edits, (node_name, theory1)) |
529 |
} |
|
70783 | 530 |
(theory_edits.flatMap(_._1), st1.update_theories(theory_edits.map(_._2))) |
69012 | 531 |
} |
532 |
||
75393 | 533 |
def purge_theories( |
534 |
nodes: Option[List[Document.Node.Name]] |
|
535 |
) : ((List[Document.Node.Name], List[Document.Node.Name], List[Document.Edit_Text]), State) = { |
|
69012 | 536 |
val all_nodes = theory_graph.topological_order |
71601 | 537 |
val purge = nodes.getOrElse(all_nodes).filterNot(is_required).toSet |
69012 | 538 |
|
539 |
val retain = theory_graph.all_preds(all_nodes.filterNot(purge)).toSet |
|
540 |
val (retained, purged) = all_nodes.partition(retain) |
|
70783 | 541 |
val purge_edits = purged.flatMap(name => theories(name).purge_edits) |
69012 | 542 |
|
70783 | 543 |
((purged, retained, purge_edits), remove_theories(purged)) |
69012 | 544 |
} |
545 |
} |
|
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
546 |
} |
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
547 |
|
69536 | 548 |
class Resources private[Headless]( |
71599 | 549 |
val options: Options, |
69536 | 550 |
val session_base_info: Sessions.Base_Info, |
551 |
log: Logger = No_Logger) |
|
75393 | 552 |
extends isabelle.Resources(session_base_info.sessions_structure, session_base_info.check.base, log = log) { |
69012 | 553 |
resources => |
554 |
||
71600 | 555 |
val store: Sessions.Store = Sessions.store(options) |
556 |
||
69536 | 557 |
|
558 |
/* session */ |
|
559 |
||
75393 | 560 |
def start_session( |
561 |
print_mode: List[String] = Nil, |
|
562 |
progress: Progress = new Progress |
|
563 |
): Session = { |
|
69536 | 564 |
val session = new Session(session_base_info.session, options, resources) |
565 |
||
566 |
progress.echo("Starting session " + session_base_info.session + " ...") |
|
73802 | 567 |
Isabelle_Process.start(session, options, session_base_info.sessions_structure, store, |
73367 | 568 |
logic = session_base_info.session, modes = print_mode).await_startup() |
69536 | 569 |
|
71604 | 570 |
session |
69536 | 571 |
} |
572 |
||
573 |
||
574 |
/* theories */ |
|
575 |
||
69012 | 576 |
private val state = Synchronized(Resources.State()) |
577 |
||
578 |
def load_theories( |
|
579 |
session: Session, |
|
69458 | 580 |
id: UUID.T, |
70649 | 581 |
theories: List[Document.Node.Name], |
582 |
files: List[Document.Node.Name], |
|
69920 | 583 |
unicode_symbols: Boolean, |
75393 | 584 |
progress: Progress |
585 |
): Unit = { |
|
69012 | 586 |
val loaded_theories = |
70649 | 587 |
for (node_name <- theories) |
69012 | 588 |
yield { |
589 |
val path = node_name.path |
|
590 |
if (!node_name.is_theory) error("Not a theory file: " + path) |
|
591 |
||
592 |
progress.expose_interrupt() |
|
69920 | 593 |
val text0 = File.read(path) |
594 |
val text = if (unicode_symbols) Symbol.decode(text0) else text0 |
|
72772 | 595 |
val node_header = resources.check_thy(node_name, Scan.char_reader(text)) |
69012 | 596 |
new Resources.Theory(node_name, node_header, text, true) |
68936
90c08c7bab9c
continuously clean frontier of already committed theories: much less resource requirements;
wenzelm
parents:
68935
diff
changeset
|
597 |
} |
69012 | 598 |
|
599 |
val loaded = loaded_theories.length |
|
600 |
if (loaded > 1) progress.echo("Loading " + loaded + " theories ...") |
|
601 |
||
75394 | 602 |
state.change { st => |
75393 | 603 |
val (doc_blobs1, st1) = st.insert_required(id, theories).update_blobs(files) |
604 |
val theory_edits = |
|
605 |
for (theory <- loaded_theories) |
|
606 |
yield { |
|
607 |
val node_name = theory.node_name |
|
608 |
val theory1 = theory.required(st1.is_required(node_name)) |
|
609 |
val edits = theory1.node_edits(st1.theories.get(node_name)) |
|
610 |
(edits, (node_name, theory1)) |
|
611 |
} |
|
612 |
val file_edits = |
|
613 |
for { node_name <- files if doc_blobs1.changed(node_name) } |
|
614 |
yield st1.blob_edits(node_name, st.blobs.get(node_name)) |
|
69562
636b3c03a61a
include loaded_files as doc_blobs (without purging);
wenzelm
parents:
69538
diff
changeset
|
615 |
|
75393 | 616 |
session.update(doc_blobs1, theory_edits.flatMap(_._1) ::: file_edits.flatten) |
617 |
st1.update_theories(theory_edits.map(_._2)) |
|
75394 | 618 |
} |
69012 | 619 |
} |
67936 | 620 |
|
75393 | 621 |
def unload_theories(session: Session, id: UUID.T, theories: List[Document.Node.Name]): Unit = { |
75394 | 622 |
state.change { st => |
75743 | 623 |
val (edits, st1) = st.unload_theories(id, theories) |
70783 | 624 |
session.update(st.doc_blobs, edits) |
625 |
st1 |
|
75394 | 626 |
} |
69012 | 627 |
} |
628 |
||
75393 | 629 |
def clean_theories(session: Session, id: UUID.T, theories: List[Document.Node.Name]): Unit = { |
75394 | 630 |
state.change { st => |
75743 | 631 |
val (edits1, st1) = st.unload_theories(id, theories) |
632 |
val ((_, _, edits2), st2) = st1.purge_theories(None) |
|
70783 | 633 |
session.update(st.doc_blobs, edits1 ::: edits2) |
634 |
st2 |
|
75394 | 635 |
} |
69012 | 636 |
} |
637 |
||
75393 | 638 |
def purge_theories( |
639 |
nodes: Option[List[Document.Node.Name]] |
|
640 |
) : (List[Document.Node.Name], List[Document.Node.Name]) = { |
|
75394 | 641 |
state.change_result { st => |
75743 | 642 |
val ((purged, retained, _), st1) = st.purge_theories(nodes) |
70783 | 643 |
((purged, retained), st1) |
75394 | 644 |
} |
69012 | 645 |
} |
67936 | 646 |
} |
67054 | 647 |
} |