author | wenzelm |
Wed, 28 Aug 2019 22:59:49 +0200 | |
changeset 70625 | 1ae987cc052f |
parent 70284 | 3e17c3a5fd39 |
child 70661 | 9c4809ec28ef |
permissions | -rw-r--r-- |
56210 | 1 |
/* Title: Pure/PIDE/session.scala |
36676 | 2 |
Author: Makarius |
57923 | 3 |
Options: :folding=explicit: |
36676 | 4 |
|
56210 | 5 |
PIDE editor session, potentially with running prover process. |
36676 | 6 |
*/ |
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
7 |
|
34871
e596a0b71f3c
incorporate "proofdocument" part into main Isabelle/Pure.jar -- except for html_panel.scala, which depends on external library (Lobo/Cobra browser);
wenzelm
parents:
34859
diff
changeset
|
8 |
package isabelle |
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
9 |
|
44733
329320fc88df
buffer prover messages to prevent overloading of session_actor input channel -- which is critical due to synchronous messages wrt. GUI thread;
wenzelm
parents:
44732
diff
changeset
|
10 |
|
46771
06a9b24c4a36
explicit syslog_limit reduces danger of low-level message flooding;
wenzelm
parents:
46739
diff
changeset
|
11 |
import scala.collection.immutable.Queue |
69640
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
12 |
import scala.annotation.tailrec |
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
13 |
|
34815
6bae73cd8e33
unified Command and Command_State, eliminated separate Accumulator;
wenzelm
parents:
34813
diff
changeset
|
14 |
|
34791 | 15 |
object Session |
16 |
{ |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
17 |
/* outlets */ |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
18 |
|
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
19 |
object Consumer |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
20 |
{ |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
21 |
def apply[A](name: String)(consume: A => Unit): Consumer[A] = |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
22 |
new Consumer[A](name, consume) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
23 |
} |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
24 |
final class Consumer[-A] private(val name: String, val consume: A => Unit) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
25 |
|
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
26 |
class Outlet[A](dispatcher: Consumer_Thread[() => Unit]) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
27 |
{ |
61590 | 28 |
private val consumers = Synchronized[List[Consumer[A]]](Nil) |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
29 |
|
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
30 |
def += (c: Consumer[A]) { consumers.change(Library.update(c)) } |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
31 |
def -= (c: Consumer[A]) { consumers.change(Library.remove(c)) } |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
32 |
|
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
33 |
def post(a: A) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
34 |
{ |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
35 |
for (c <- consumers.value.iterator) { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
36 |
dispatcher.send(() => |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
37 |
try { c.consume(a) } |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
38 |
catch { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
39 |
case exn: Throwable => |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56775
diff
changeset
|
40 |
Output.error_message("Consumer failed: " + quote(c.name) + "\n" + Exn.message(exn)) |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
41 |
}) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
42 |
} |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
43 |
} |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
44 |
} |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
45 |
|
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
46 |
|
56315 | 47 |
/* change */ |
48 |
||
49 |
sealed case class Change( |
|
50 |
previous: Document.Version, |
|
59077
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
wenzelm
parents:
58928
diff
changeset
|
51 |
syntax_changed: List[Document.Node.Name], |
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
52 |
deps_changed: Boolean, |
56315 | 53 |
doc_edits: List[Document.Edit_Command], |
68381
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
54 |
consolidate: List[Document.Node.Name], |
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
55 |
share_common_data: Boolean, |
56315 | 56 |
version: Document.Version) |
57 |
||
57976
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
58 |
case object Change_Flush |
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
59 |
|
56315 | 60 |
|
34813
f0107bc96961
more explicit modeling of Command and Command_State as Session.Entity;
wenzelm
parents:
34810
diff
changeset
|
61 |
/* events */ |
f0107bc96961
more explicit modeling of Command and Command_State as Session.Entity;
wenzelm
parents:
34810
diff
changeset
|
62 |
|
43716 | 63 |
//{{{ |
50697
82e9178e6a98
improved Monitor_Dockable, based on ML_Statistics operations;
wenzelm
parents:
50566
diff
changeset
|
64 |
case class Statistics(props: Properties.T) |
50117 | 65 |
case class Global_Options(options: Options) |
44805 | 66 |
case object Caret_Focus |
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
67 |
case class Raw_Edits( |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
68 |
doc_blobs: Document.Blobs, edits: List[Document.Edit_Text], share_common_data: Boolean) |
52531 | 69 |
case class Dialog_Result(id: Document_ID.Generic, serial: Long, result: String) |
59364 | 70 |
case class Build_Theories(id: String, master_dir: Path, theories: List[(Options, List[Path])]) |
47027
fc3bb6c02a3c
explicit propagation of assignment event, even if changed command set is empty;
wenzelm
parents:
46944
diff
changeset
|
71 |
case class Commands_Changed( |
fc3bb6c02a3c
explicit propagation of assignment event, even if changed command set is empty;
wenzelm
parents:
46944
diff
changeset
|
72 |
assignment: Boolean, nodes: Set[Document.Node.Name], commands: Set[Command]) |
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
73 |
|
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
74 |
sealed abstract class Phase |
65206 | 75 |
{ |
76 |
def print: String = |
|
77 |
this match { |
|
65317 | 78 |
case Terminated(result) => if (result.ok) "finished" else "failed" |
65206 | 79 |
case _ => Word.lowercase(this.toString) |
80 |
} |
|
81 |
} |
|
65208
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
82 |
case object Inactive extends Phase // stable |
39701 | 83 |
case object Startup extends Phase // transient |
65208
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
84 |
case object Ready extends Phase // metastable |
39701 | 85 |
case object Shutdown extends Phase // transient |
65317 | 86 |
case class Terminated(result: Process_Result) extends Phase // stable |
43716 | 87 |
//}}} |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
88 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
89 |
|
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
90 |
/* syslog */ |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
91 |
|
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
92 |
private[Session] class Syslog(limit: Int) |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
93 |
{ |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
94 |
private var queue = Queue.empty[XML.Elem] |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
95 |
private var length = 0 |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
96 |
|
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
97 |
def += (msg: XML.Elem): Unit = synchronized { |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
98 |
queue = queue.enqueue(msg) |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
99 |
length += 1 |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
100 |
if (length > limit) queue = queue.dequeue._2 |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
101 |
} |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
102 |
|
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
103 |
def content: String = synchronized { |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
104 |
cat_lines(queue.iterator.map(XML.content)) + |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
105 |
(if (length > limit) "\n(A total of " + length + " messages...)" else "") |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
106 |
} |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
107 |
} |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
108 |
|
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
109 |
|
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
110 |
/* protocol handlers */ |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
111 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
112 |
abstract class Protocol_Handler |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
113 |
{ |
65219 | 114 |
def init(session: Session): Unit = {} |
115 |
def exit(): Unit = {} |
|
116 |
val functions: List[(String, Prover.Protocol_Output => Boolean)] |
|
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
117 |
} |
34791 | 118 |
} |
119 |
||
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
120 |
|
69492 | 121 |
class Session(_session_options: => Options, val resources: Resources) extends Document.Session |
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
122 |
{ |
65214 | 123 |
session => |
124 |
||
68169 | 125 |
val xml_cache: XML.Cache = XML.make_cache() |
68168 | 126 |
val xz_cache: XZ.Cache = XZ.make_cache() |
65218 | 127 |
|
65214 | 128 |
|
47653 | 129 |
/* global flags */ |
130 |
||
131 |
@volatile var timing: Boolean = false |
|
132 |
@volatile var verbose: Boolean = false |
|
133 |
||
134 |
||
65264
7e6ecd04b5fe
dynamic session_options for tuning parameters and initial prover options;
wenzelm
parents:
65223
diff
changeset
|
135 |
/* dynamic session options */ |
49288 | 136 |
|
69492 | 137 |
def session_options: Options = _session_options |
138 |
||
65264
7e6ecd04b5fe
dynamic session_options for tuning parameters and initial prover options;
wenzelm
parents:
65223
diff
changeset
|
139 |
def output_delay: Time = session_options.seconds("editor_output_delay") |
66379
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
wenzelm
parents:
66094
diff
changeset
|
140 |
def consolidate_delay: Time = session_options.seconds("editor_consolidate_delay") |
65264
7e6ecd04b5fe
dynamic session_options for tuning parameters and initial prover options;
wenzelm
parents:
65223
diff
changeset
|
141 |
def prune_delay: Time = session_options.seconds("editor_prune_delay") |
7e6ecd04b5fe
dynamic session_options for tuning parameters and initial prover options;
wenzelm
parents:
65223
diff
changeset
|
142 |
def prune_size: Int = session_options.int("editor_prune_size") |
7e6ecd04b5fe
dynamic session_options for tuning parameters and initial prover options;
wenzelm
parents:
65223
diff
changeset
|
143 |
def syslog_limit: Int = session_options.int("editor_syslog_limit") |
7e6ecd04b5fe
dynamic session_options for tuning parameters and initial prover options;
wenzelm
parents:
65223
diff
changeset
|
144 |
def reparse_limit: Int = session_options.int("editor_reparse_limit") |
37849 | 145 |
|
146 |
||
66094 | 147 |
/* dispatcher */ |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
148 |
|
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
149 |
private val dispatcher = |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
150 |
Consumer_Thread.fork[() => Unit]("Session.dispatcher", daemon = true) { case e => e(); true } |
34809 | 151 |
|
66094 | 152 |
def assert_dispatcher[A](body: => A): A = |
153 |
{ |
|
154 |
assert(dispatcher.check_thread) |
|
155 |
body |
|
156 |
} |
|
157 |
||
158 |
def require_dispatcher[A](body: => A): A = |
|
159 |
{ |
|
160 |
require(dispatcher.check_thread) |
|
161 |
body |
|
162 |
} |
|
163 |
||
164 |
def send_dispatcher(body: => Unit): Unit = |
|
165 |
{ |
|
166 |
if (dispatcher.check_thread) body |
|
167 |
else dispatcher.send(() => body) |
|
168 |
} |
|
169 |
||
170 |
def send_wait_dispatcher(body: => Unit): Unit = |
|
171 |
{ |
|
172 |
if (dispatcher.check_thread) body |
|
173 |
else dispatcher.send_wait(() => body) |
|
174 |
} |
|
175 |
||
176 |
||
177 |
/* outlets */ |
|
178 |
||
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
179 |
val statistics = new Session.Outlet[Session.Statistics](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
180 |
val global_options = new Session.Outlet[Session.Global_Options](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
181 |
val caret_focus = new Session.Outlet[Session.Caret_Focus.type](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
182 |
val raw_edits = new Session.Outlet[Session.Raw_Edits](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
183 |
val commands_changed = new Session.Outlet[Session.Commands_Changed](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
184 |
val phase_changed = new Session.Outlet[Session.Phase](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
185 |
val syslog_messages = new Session.Outlet[Prover.Output](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
186 |
val raw_output_messages = new Session.Outlet[Prover.Output](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
187 |
val trace_events = new Session.Outlet[Simplifier_Trace.Event.type](dispatcher) |
60900 | 188 |
val debugger_updates = new Session.Outlet[Debugger.Update.type](dispatcher) |
34809 | 189 |
|
60749 | 190 |
val all_messages = new Session.Outlet[Prover.Message](dispatcher) // potential bottle-neck! |
34809 | 191 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
192 |
|
56799 | 193 |
/** main protocol manager **/ |
45635
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
194 |
|
56799 | 195 |
/* internal messages */ |
45635
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
196 |
|
62556
c115e69f457f
more abstract Session.start, without prover command-line;
wenzelm
parents:
62545
diff
changeset
|
197 |
private case class Start(start_prover: Prover.Receiver => Prover) |
56799 | 198 |
private case object Stop |
199 |
private case class Cancel_Exec(exec_id: Document_ID.Exec) |
|
200 |
private case class Protocol_Command(name: String, args: List[String]) |
|
201 |
private case class Update_Options(options: Options) |
|
66379
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
wenzelm
parents:
66094
diff
changeset
|
202 |
private case object Consolidate_Execution |
56799 | 203 |
private case object Prune_History |
45635
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
204 |
|
38841
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38722
diff
changeset
|
205 |
|
65208
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
206 |
/* phase */ |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
207 |
|
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
208 |
private def post_phase(new_phase: Session.Phase): Session.Phase = |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
209 |
{ |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
210 |
phase_changed.post(new_phase) |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
211 |
new_phase |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
212 |
} |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
213 |
private val _phase = Synchronized[Session.Phase](Session.Inactive) |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
214 |
private def phase_=(new_phase: Session.Phase): Unit = _phase.change(_ => post_phase(new_phase)) |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
215 |
|
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
216 |
def phase = _phase.value |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
217 |
def is_ready: Boolean = phase == Session.Ready |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
218 |
|
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
219 |
|
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
220 |
/* global state */ |
43644 | 221 |
|
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
222 |
private val syslog = new Session.Syslog(syslog_limit) |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
223 |
def syslog_content(): String = syslog.content |
39626
a5d0bcfb95a3
manage persistent syslog via Session, not Isabelle_Process;
wenzelm
parents:
39625
diff
changeset
|
224 |
|
56690 | 225 |
private val global_state = Synchronized(Document.State.init) |
56687 | 226 |
def current_state(): Document.State = global_state.value |
46944
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
wenzelm
parents:
46942
diff
changeset
|
227 |
|
63584
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
wenzelm
parents:
62556
diff
changeset
|
228 |
def recent_syntax(name: Document.Node.Name): Outer_Syntax = |
60934 | 229 |
global_state.value.recent_finished.version.get_finished.nodes(name).syntax getOrElse |
66720 | 230 |
resources.session_base.overall_syntax |
34816
d33312514220
maintain generic session entities -- cover commands, states, etc. (but not yet documents);
wenzelm
parents:
34815
diff
changeset
|
231 |
|
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
232 |
|
56799 | 233 |
/* pipelined change parsing */ |
234 |
||
235 |
private case class Text_Edits( |
|
236 |
previous: Future[Document.Version], |
|
237 |
doc_blobs: Document.Blobs, |
|
238 |
text_edits: List[Document.Edit_Text], |
|
68381
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
239 |
consolidate: List[Document.Node.Name], |
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
240 |
share_common_data: Boolean, |
56799 | 241 |
version_result: Promise[Document.Version]) |
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
242 |
|
56799 | 243 |
private val change_parser = Consumer_Thread.fork[Text_Edits]("change_parser", daemon = true) |
244 |
{ |
|
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
245 |
case Text_Edits(previous, doc_blobs, text_edits, consolidate, share_common_data, version_result) => |
56799 | 246 |
val prev = previous.get_finished |
247 |
val change = |
|
248 |
Timing.timeit("parse_change", timing) { |
|
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
249 |
resources.parse_change( |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
250 |
reparse_limit, prev, doc_blobs, text_edits, consolidate, share_common_data) |
56799 | 251 |
} |
252 |
version_result.fulfill(change.version) |
|
253 |
manager.send(change) |
|
254 |
true |
|
255 |
} |
|
41534 | 256 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
257 |
|
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
258 |
/* buffered changes */ |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
259 |
|
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
260 |
private object change_buffer |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
261 |
{ |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
262 |
private var assignment: Boolean = false |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
263 |
private var nodes: Set[Document.Node.Name] = Set.empty |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
264 |
private var commands: Set[Command] = Set.empty |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
265 |
|
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
266 |
def flush(): Unit = synchronized { |
59319 | 267 |
if (assignment || nodes.nonEmpty || commands.nonEmpty) |
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
268 |
commands_changed.post(Session.Commands_Changed(assignment, nodes, commands)) |
68381
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
269 |
if (nodes.nonEmpty) consolidation.update(nodes) |
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
270 |
assignment = false |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
271 |
nodes = Set.empty |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
272 |
commands = Set.empty |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
273 |
} |
61556 | 274 |
private val delay_flush = Standard_Thread.delay_first(output_delay) { flush() } |
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
275 |
|
70284
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
276 |
def invoke(assign: Boolean, edited_nodes: List[Document.Node.Name], cmds: List[Command]): Unit = |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
277 |
synchronized { |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
278 |
assignment |= assign |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
279 |
for (node <- edited_nodes) { |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
280 |
nodes += node |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
281 |
} |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
282 |
for (command <- cmds) { |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
283 |
nodes += command.node_name |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
284 |
command.blobs_names.foreach(nodes += _) |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
285 |
commands += command |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
286 |
} |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
287 |
delay_flush.invoke() |
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
288 |
} |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
289 |
|
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
290 |
def shutdown() |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
291 |
{ |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
292 |
delay_flush.revoke() |
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
293 |
flush() |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
294 |
} |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
295 |
} |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
296 |
|
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
297 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
298 |
/* postponed changes */ |
44733
329320fc88df
buffer prover messages to prevent overloading of session_actor input channel -- which is critical due to synchronous messages wrt. GUI thread;
wenzelm
parents:
44732
diff
changeset
|
299 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
300 |
private object postponed_changes |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
301 |
{ |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
302 |
private var postponed: List[Session.Change] = Nil |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
303 |
|
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
304 |
def store(change: Session.Change): Unit = synchronized { postponed ::= change } |
56705
937826d702d5
simplified commands_changed_buffer (in contrast to a8331fb5c959): rely on better performance of Consumer_Thread/Mailbox and more direct Timer (like session_actor.receiver);
wenzelm
parents:
56704
diff
changeset
|
305 |
|
57976
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
306 |
def flush(state: Document.State): List[Session.Change] = synchronized { |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
307 |
val (assigned, unassigned) = postponed.partition(change => state.is_assigned(change.previous)) |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
308 |
postponed = unassigned |
57976
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
309 |
assigned.reverse |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
310 |
} |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
311 |
} |
44733
329320fc88df
buffer prover messages to prevent overloading of session_actor input channel -- which is critical due to synchronous messages wrt. GUI thread;
wenzelm
parents:
44732
diff
changeset
|
312 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
313 |
|
68381
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
314 |
/* node consolidation */ |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
315 |
|
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
316 |
private object consolidation |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
317 |
{ |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
318 |
private val delay = |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
319 |
Standard_Thread.delay_first(consolidate_delay) { manager.send(Consolidate_Execution) } |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
320 |
|
68807
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
321 |
private val init_state: Option[Set[Document.Node.Name]] = Some(Set.empty) |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
322 |
private val state = Synchronized(init_state) |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
323 |
|
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
324 |
def exit() |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
325 |
{ |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
326 |
delay.revoke() |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
327 |
state.change(_ => None) |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
328 |
} |
68381
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
329 |
|
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
330 |
def update(new_nodes: Set[Document.Node.Name] = Set.empty) |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
331 |
{ |
68807
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
332 |
val active = |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
333 |
state.change_result(st => |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
334 |
(st.isDefined, st.map(nodes => if (nodes.isEmpty) new_nodes else nodes ++ new_nodes))) |
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
335 |
if (active) delay.invoke() |
68381
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
336 |
} |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
337 |
|
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
338 |
def flush(): Set[Document.Node.Name] = |
68807
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
339 |
state.change_result(st => if (st.isDefined) (st.get, init_state) else (Set.empty, None)) |
68381
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
340 |
} |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
341 |
|
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
342 |
|
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
343 |
/* prover process */ |
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
344 |
|
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
345 |
private object prover |
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
346 |
{ |
61590 | 347 |
private val variable = Synchronized[Option[Prover]](None) |
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
348 |
|
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
349 |
def defined: Boolean = variable.value.isDefined |
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
350 |
def get: Prover = variable.value.get |
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
351 |
def set(p: Prover) { variable.change(_ => Some(p)) } |
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
352 |
def reset { variable.change(_ => None) } |
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
353 |
def await_reset() { variable.guarded_access({ case None => Some((), None) case _ => None }) } |
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
354 |
} |
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
355 |
|
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
356 |
|
69488
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
357 |
/* file formats */ |
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
358 |
|
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
359 |
lazy val file_formats: File_Format.Session = |
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
360 |
resources.file_formats.start_session(session) |
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
361 |
|
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
362 |
|
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59364
diff
changeset
|
363 |
/* protocol handlers */ |
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59364
diff
changeset
|
364 |
|
65215 | 365 |
private val protocol_handlers = Protocol_Handlers.init(session) |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59364
diff
changeset
|
366 |
|
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59364
diff
changeset
|
367 |
def get_protocol_handler(name: String): Option[Session.Protocol_Handler] = |
65214 | 368 |
protocol_handlers.get(name) |
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59364
diff
changeset
|
369 |
|
65315 | 370 |
def init_protocol_handler(handler: Session.Protocol_Handler): Unit = |
371 |
protocol_handlers.init(handler) |
|
65214 | 372 |
|
65315 | 373 |
def init_protocol_handler(name: String): Unit = |
374 |
protocol_handlers.init(name) |
|
59366
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59364
diff
changeset
|
375 |
|
e94df7f6b608
clarified build_theories: proper protocol handler;
wenzelm
parents:
59364
diff
changeset
|
376 |
|
65222
fb8253564483
more robust debugger initialization, e.g. required for GUI components before actual session startup;
wenzelm
parents:
65221
diff
changeset
|
377 |
/* debugger */ |
fb8253564483
more robust debugger initialization, e.g. required for GUI components before actual session startup;
wenzelm
parents:
65221
diff
changeset
|
378 |
|
fb8253564483
more robust debugger initialization, e.g. required for GUI components before actual session startup;
wenzelm
parents:
65221
diff
changeset
|
379 |
private val debugger_handler = new Debugger.Handler(this) |
65315 | 380 |
init_protocol_handler(debugger_handler) |
65222
fb8253564483
more robust debugger initialization, e.g. required for GUI components before actual session startup;
wenzelm
parents:
65221
diff
changeset
|
381 |
|
fb8253564483
more robust debugger initialization, e.g. required for GUI components before actual session startup;
wenzelm
parents:
65221
diff
changeset
|
382 |
def debugger: Debugger = debugger_handler.debugger |
fb8253564483
more robust debugger initialization, e.g. required for GUI components before actual session startup;
wenzelm
parents:
65221
diff
changeset
|
383 |
|
fb8253564483
more robust debugger initialization, e.g. required for GUI components before actual session startup;
wenzelm
parents:
65221
diff
changeset
|
384 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
385 |
/* manager thread */ |
44733
329320fc88df
buffer prover messages to prevent overloading of session_actor input channel -- which is critical due to synchronous messages wrt. GUI thread;
wenzelm
parents:
44732
diff
changeset
|
386 |
|
62115
57895801cb57
prune old versions more often, to reduce overall heap requirements;
wenzelm
parents:
62050
diff
changeset
|
387 |
private val delay_prune = |
57895801cb57
prune old versions more often, to reduce overall heap requirements;
wenzelm
parents:
62050
diff
changeset
|
388 |
Standard_Thread.delay_first(prune_delay) { manager.send(Prune_History) } |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
389 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
390 |
private val manager: Consumer_Thread[Any] = |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
391 |
{ |
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
392 |
/* raw edits */ |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
393 |
|
68336
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
wenzelm
parents:
68293
diff
changeset
|
394 |
def handle_raw_edits( |
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
wenzelm
parents:
68293
diff
changeset
|
395 |
doc_blobs: Document.Blobs = Document.Blobs.empty, |
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
wenzelm
parents:
68293
diff
changeset
|
396 |
edits: List[Document.Edit_Text] = Nil, |
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
397 |
consolidate: List[Document.Node.Name] = Nil, |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
398 |
share_common_data: Boolean = false) |
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
399 |
//{{{ |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
400 |
{ |
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
401 |
require(prover.defined) |
56712 | 402 |
|
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
403 |
prover.get.discontinue_execution() |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
404 |
|
56687 | 405 |
val previous = global_state.value.history.tip.version |
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
406 |
val version = Future.promise[Document.Version] |
56711 | 407 |
global_state.change(_.continue_history(previous, edits, version)) |
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
408 |
|
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
409 |
raw_edits.post(Session.Raw_Edits(doc_blobs, edits, share_common_data)) |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
410 |
change_parser.send( |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
411 |
Text_Edits(previous, doc_blobs, edits, consolidate, share_common_data, version)) |
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
412 |
} |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
413 |
//}}} |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
414 |
|
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
415 |
|
43716 | 416 |
/* resulting changes */ |
34809 | 417 |
|
56315 | 418 |
def handle_change(change: Session.Change) |
38221 | 419 |
//{{{ |
34809 | 420 |
{ |
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
421 |
require(prover.defined) |
56712 | 422 |
|
44383 | 423 |
def id_command(command: Command) |
43720 | 424 |
{ |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
425 |
for { |
57842
8e4ae2db1849
more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents:
57651
diff
changeset
|
426 |
(name, digest) <- command.blobs_defined |
56687 | 427 |
if !global_state.value.defined_blob(digest) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
428 |
} { |
57842
8e4ae2db1849
more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents:
57651
diff
changeset
|
429 |
change.version.nodes(name).get_blob match { |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
430 |
case Some(blob) => |
56687 | 431 |
global_state.change(_.define_blob(digest)) |
56335
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents:
56316
diff
changeset
|
432 |
prover.get.define_blob(digest, blob.bytes) |
55783 | 433 |
case None => |
57842
8e4ae2db1849
more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
wenzelm
parents:
57651
diff
changeset
|
434 |
Output.error_message("Missing blob " + quote(name.toString)) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
435 |
} |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
436 |
} |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
437 |
|
56687 | 438 |
if (!global_state.value.defined_command(command.id)) { |
439 |
global_state.change(_.define_command(command)) |
|
44644
317e4962dd0f
clarified define_command: store name as structural information;
wenzelm
parents:
44616
diff
changeset
|
440 |
prover.get.define_command(command) |
43720 | 441 |
} |
442 |
} |
|
68293 | 443 |
for { (_, edit) <- change.doc_edits } { |
444 |
edit.foreach({ case (c1, c2) => c1.foreach(id_command); c2.foreach(id_command) }) |
|
44383 | 445 |
} |
43722 | 446 |
|
56687 | 447 |
val assignment = global_state.value.the_assignment(change.previous).check_finished |
448 |
global_state.change(_.define_version(change.version, assignment)) |
|
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
449 |
|
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
450 |
if (change.share_common_data) { |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
451 |
prover.get.protocol_command("ML_Heap.share_common_data") |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
452 |
} |
68336
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
wenzelm
parents:
68293
diff
changeset
|
453 |
prover.get.update(change.previous.id, change.version.id, change.doc_edits, change.consolidate) |
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
454 |
resources.commit(change) |
34809 | 455 |
} |
38221 | 456 |
//}}} |
34809 | 457 |
|
458 |
||
46772
be21f050eda4
tuned signature -- emphasize Isabelle_Process Input vs. Output;
wenzelm
parents:
46771
diff
changeset
|
459 |
/* prover output */ |
34809 | 460 |
|
56385 | 461 |
def handle_output(output: Prover.Output) |
38221 | 462 |
//{{{ |
34809 | 463 |
{ |
68103
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
464 |
def bad_output() |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
465 |
{ |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
466 |
if (verbose) |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
467 |
Output.warning("Ignoring bad prover output: " + output.message.toString) |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
468 |
} |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
469 |
|
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
470 |
def change_command(f: Document.State => (Command.State, Document.State)) |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
471 |
{ |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
472 |
try { |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
473 |
val st = global_state.change_result(f) |
70284
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
474 |
change_buffer.invoke(false, Nil, List(st.command)) |
68103
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
475 |
} |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
476 |
catch { case _: Document.State.Fail => bad_output() } |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
477 |
} |
51662
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
478 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
479 |
output match { |
56385 | 480 |
case msg: Prover.Protocol_Output => |
65214 | 481 |
val handled = protocol_handlers.invoke(msg) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
482 |
if (!handled) { |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
483 |
msg.properties match { |
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
484 |
case Markup.Protocol_Handler(name) if prover.defined => |
65315 | 485 |
init_protocol_handler(name) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
486 |
|
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
487 |
case Protocol.Command_Timing(state_id, timing) if prover.defined => |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
488 |
val message = XML.elem(Markup.STATUS, List(XML.Elem(Markup.Timing(timing), Nil))) |
68103
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
489 |
change_command(_.accumulate(state_id, xml_cache.elem(message), xml_cache)) |
46122 | 490 |
|
66873
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66720
diff
changeset
|
491 |
case Protocol.Theory_Timing(_, _) => |
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66720
diff
changeset
|
492 |
// FIXME |
9953ae603a23
provide theory timing information, similar to command timing but always considered relevant;
wenzelm
parents:
66720
diff
changeset
|
493 |
|
68101 | 494 |
case Markup.Export(args) |
495 |
if args.id.isDefined && Value.Long.unapply(args.id.get).isDefined => |
|
68103
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
496 |
val id = Value.Long.unapply(args.id.get).get |
68168 | 497 |
val export = Export.make_entry("", args, msg.bytes, cache = xz_cache) |
498 |
change_command(_.add_export(id, (args.serial, export))) |
|
68088 | 499 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
500 |
case Markup.Assign_Update => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
501 |
msg.text match { |
70284
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
502 |
case Protocol.Assign_Update(id, edited, update) => |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
503 |
try { |
70284
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
504 |
val (edited_nodes, cmds) = |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
505 |
global_state.change_result(_.assign(id, edited, update)) |
3e17c3a5fd39
more thorough assignment, e.g. when "purge" removes commands that were not assigned;
wenzelm
parents:
69640
diff
changeset
|
506 |
change_buffer.invoke(true, edited_nodes, cmds) |
57976
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
507 |
manager.send(Session.Change_Flush) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
508 |
} |
68103
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
509 |
catch { case _: Document.State.Fail => bad_output() } |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
510 |
case _ => bad_output() |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
511 |
} |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
512 |
delay_prune.invoke() |
46122 | 513 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
514 |
case Markup.Removed_Versions => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
515 |
msg.text match { |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
516 |
case Protocol.Removed(removed) => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
517 |
try { |
56687 | 518 |
global_state.change(_.removed_versions(removed)) |
57976
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
519 |
manager.send(Session.Change_Flush) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
520 |
} |
68103
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
521 |
catch { case _: Document.State.Fail => bad_output() } |
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
522 |
case _ => bad_output() |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
523 |
} |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
524 |
|
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
525 |
case Markup.ML_Statistics(props) => |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
526 |
statistics.post(Session.Statistics(props)) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
527 |
|
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
528 |
case Markup.Task_Statistics(props) => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
529 |
// FIXME |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
530 |
|
68103
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
531 |
case _ => bad_output() |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
532 |
} |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
533 |
} |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
534 |
case _ => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
535 |
output.properties match { |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
536 |
case Position.Id(state_id) => |
68103
c5764b8b2a87
more robust (synchronous) management of Export.Entry: Future.fork happens inside the data structure;
wenzelm
parents:
68101
diff
changeset
|
537 |
change_command(_.accumulate(state_id, output.message, xml_cache)) |
56210 | 538 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
539 |
case _ if output.is_init => |
69488
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
540 |
prover.get.options(file_formats.prover_options(session_options)) |
65470 | 541 |
prover.get.session_base(resources) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
542 |
phase = Session.Ready |
65223
844c067bc3d4
more robust startup, despite remaining race condition of debugger.is_active vs. session.is_ready;
wenzelm
parents:
65222
diff
changeset
|
543 |
debugger.ready() |
56210 | 544 |
|
65317 | 545 |
case Markup.Process_Result(result) if output.is_exit => |
69488
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
546 |
file_formats.stop_session |
65317 | 547 |
phase = Session.Terminated(result) |
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
548 |
prover.reset |
56210 | 549 |
|
61376
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
wenzelm
parents:
60934
diff
changeset
|
550 |
case _ => |
93224745477f
output HTML text according to Isabelle/Scala Symbol.Interpretation;
wenzelm
parents:
60934
diff
changeset
|
551 |
raw_output_messages.post(output) |
44661
383c9d758a56
raw message function "assign_execs" avoids full overhead of decoding and caching message body;
wenzelm
parents:
44644
diff
changeset
|
552 |
} |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
553 |
} |
34809 | 554 |
} |
38221 | 555 |
//}}} |
34809 | 556 |
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
557 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
558 |
/* main thread */ |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
559 |
|
56710
8f102c18eab7
more uniform warning/error handling, potentially with propagation to send_wait caller;
wenzelm
parents:
56709
diff
changeset
|
560 |
Consumer_Thread.fork[Any]("Session.manager", daemon = true) |
56709 | 561 |
{ |
562 |
case arg: Any => |
|
563 |
//{{{ |
|
564 |
arg match { |
|
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
565 |
case output: Prover.Output => |
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
566 |
if (output.is_stdout || output.is_stderr) |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
567 |
raw_output_messages.post(output) |
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
568 |
else handle_output(output) |
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
569 |
|
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
570 |
if (output.is_syslog) { |
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
571 |
syslog += output.message |
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
572 |
syslog_messages.post(output) |
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
573 |
} |
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
574 |
|
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
575 |
all_messages.post(output) |
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
576 |
|
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
577 |
case input: Prover.Input => |
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
578 |
all_messages.post(input) |
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
579 |
|
62556
c115e69f457f
more abstract Session.start, without prover command-line;
wenzelm
parents:
62545
diff
changeset
|
580 |
case Start(start_prover) if !prover.defined => |
65207
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
581 |
prover.set(start_prover(manager.send(_))) |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
582 |
|
56709 | 583 |
case Stop => |
68807
e28978310a2a
more robust exit: avoid later Consolidate_Execution with handle_raw_edits (cf. 2fd3a6d6ba2e);
wenzelm
parents:
68382
diff
changeset
|
584 |
consolidation.exit() |
65208
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
585 |
delay_prune.revoke() |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
586 |
if (prover.defined) { |
65219 | 587 |
protocol_handlers.exit() |
56772 | 588 |
global_state.change(_ => Document.State.init) |
56709 | 589 |
prover.get.terminate |
590 |
} |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
591 |
|
66379
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
wenzelm
parents:
66094
diff
changeset
|
592 |
case Consolidate_Execution => |
68381
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
593 |
if (prover.defined) { |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
594 |
val state = global_state.value |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
595 |
state.stable_tip_version match { |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
596 |
case None => consolidation.update() |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
597 |
case Some(version) => |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
598 |
val consolidate = |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
599 |
consolidation.flush().iterator.filter(name => |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
600 |
!resources.session_base.loaded_theory(name) && |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
601 |
!state.node_consolidated(version, name) && |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
602 |
state.node_maybe_consolidated(version, name)).toList |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
603 |
if (consolidate.nonEmpty) handle_raw_edits(consolidate = consolidate) |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
604 |
} |
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
wenzelm
parents:
68336
diff
changeset
|
605 |
} |
66379
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
wenzelm
parents:
66094
diff
changeset
|
606 |
|
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
607 |
case Prune_History => |
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
608 |
if (prover.defined) { |
57976
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
609 |
val old_versions = global_state.change_result(_.remove_versions(prune_size)) |
59319 | 610 |
if (old_versions.nonEmpty) prover.get.remove_versions(old_versions) |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
611 |
} |
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
612 |
|
56709 | 613 |
case Update_Options(options) => |
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
614 |
if (prover.defined && is_ready) { |
69488
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
615 |
prover.get.options(file_formats.prover_options(options)) |
68336
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
wenzelm
parents:
68293
diff
changeset
|
616 |
handle_raw_edits() |
56709 | 617 |
} |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
618 |
global_options.post(Session.Global_Options(options)) |
34809 | 619 |
|
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
620 |
case Cancel_Exec(exec_id) if prover.defined => |
56709 | 621 |
prover.get.cancel_exec(exec_id) |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
622 |
|
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
623 |
case Session.Raw_Edits(doc_blobs, edits, share_common_data) if prover.defined => |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
624 |
handle_raw_edits(doc_blobs = doc_blobs, edits = edits, |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
625 |
share_common_data = share_common_data) |
56709 | 626 |
|
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
627 |
case Session.Dialog_Result(id, serial, result) if prover.defined => |
56709 | 628 |
prover.get.dialog_result(serial, result) |
629 |
handle_output(new Prover.Output(Protocol.Dialog_Result(id, serial, result))) |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
630 |
|
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
631 |
case Protocol_Command(name, args) if prover.defined => |
56709 | 632 |
prover.get.protocol_command(name, args:_*) |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
633 |
|
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
634 |
case change: Session.Change if prover.defined => |
57976
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
635 |
val state = global_state.value |
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
636 |
if (!state.removing_versions && state.is_assigned(change.previous)) |
56709 | 637 |
handle_change(change) |
638 |
else postponed_changes.store(change) |
|
57651
10df45dd14da
less warnings -- ignore potential prover startup/shutdown races;
wenzelm
parents:
56864
diff
changeset
|
639 |
|
57976
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
640 |
case Session.Change_Flush if prover.defined => |
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
641 |
val state = global_state.value |
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
642 |
if (!state.removing_versions) |
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
643 |
postponed_changes.flush(state).foreach(handle_change(_)) |
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
wenzelm
parents:
57867
diff
changeset
|
644 |
|
57651
10df45dd14da
less warnings -- ignore potential prover startup/shutdown races;
wenzelm
parents:
56864
diff
changeset
|
645 |
case bad => |
10df45dd14da
less warnings -- ignore potential prover startup/shutdown races;
wenzelm
parents:
56864
diff
changeset
|
646 |
if (verbose) Output.warning("Ignoring bad message: " + bad.toString) |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
647 |
} |
56709 | 648 |
true |
649 |
//}}} |
|
650 |
} |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
651 |
} |
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
652 |
|
34809 | 653 |
|
56799 | 654 |
/* main operations */ |
655 |
||
656 |
def snapshot(name: Document.Node.Name = Document.Node.Name.empty, |
|
657 |
pending_edits: List[Text.Edit] = Nil): Document.Snapshot = |
|
658 |
global_state.value.snapshot(name, pending_edits) |
|
34809 | 659 |
|
69640
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
660 |
@tailrec final def await_stable_snapshot(): Document.Snapshot = |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
661 |
{ |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
662 |
val snapshot = this.snapshot() |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
663 |
if (snapshot.is_outdated) { |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
664 |
Thread.sleep(output_delay.ms) |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
665 |
await_stable_snapshot() |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
666 |
} |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
667 |
else snapshot |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
668 |
} |
af09cc4792dc
more robust: no assumptions about GUI thread or document model;
wenzelm
parents:
69492
diff
changeset
|
669 |
|
62556
c115e69f457f
more abstract Session.start, without prover command-line;
wenzelm
parents:
62545
diff
changeset
|
670 |
def start(start_prover: Prover.Receiver => Prover) |
65207
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
671 |
{ |
69488
b05c0bb47f6d
support for File_Format.Session, e.g. server process accessible via prover options;
wenzelm
parents:
68807
diff
changeset
|
672 |
file_formats |
65207
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
673 |
_phase.change( |
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
674 |
{ |
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
675 |
case Session.Inactive => |
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
676 |
manager.send(Start(start_prover)) |
65208
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
677 |
post_phase(Session.Startup) |
65207
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
678 |
case phase => error("Cannot start prover in phase " + quote(phase.print)) |
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
679 |
}) |
004bc5968c2a
more strict Session.start: no restart from terminated session;
wenzelm
parents:
65206
diff
changeset
|
680 |
} |
45076 | 681 |
|
65311 | 682 |
def send_stop() |
50117 | 683 |
{ |
65208
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
684 |
val was_ready = |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
685 |
_phase.guarded_access(phase => |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
686 |
phase match { |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
687 |
case Session.Startup | Session.Shutdown => None |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
688 |
case Session.Terminated(_) => Some((false, phase)) |
65317 | 689 |
case Session.Inactive => Some((false, post_phase(Session.Terminated(Process_Result(0))))) |
65208
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
690 |
case Session.Ready => Some((true, post_phase(Session.Shutdown))) |
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
691 |
}) |
65311 | 692 |
if (was_ready) manager.send(Stop) |
693 |
} |
|
694 |
||
65317 | 695 |
def stop(): Process_Result = |
65311 | 696 |
{ |
697 |
send_stop() |
|
56793
d5ab6a8799ce
more synchronized treatment of prover process, which might emit more messages before shutdown and requires manager to accept them;
wenzelm
parents:
56782
diff
changeset
|
698 |
prover.await_reset() |
65208
91c528cd376a
more robust Session.stop: idempotent, avoid conflict with startup;
wenzelm
parents:
65207
diff
changeset
|
699 |
|
56704 | 700 |
change_parser.shutdown() |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
701 |
change_buffer.shutdown() |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
702 |
manager.shutdown() |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
703 |
dispatcher.shutdown() |
65209 | 704 |
|
705 |
phase match { |
|
65317 | 706 |
case Session.Terminated(result) => result |
65209 | 707 |
case phase => error("Bad session phase after shutdown: " + quote(phase.print)) |
708 |
} |
|
50117 | 709 |
} |
38841
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38722
diff
changeset
|
710 |
|
53054
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
711 |
def protocol_command(name: String, args: String*) |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
712 |
{ manager.send(Protocol_Command(name, args.toList)) } |
53054
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
713 |
|
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
714 |
def cancel_exec(exec_id: Document_ID.Exec) |
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
715 |
{ manager.send(Cancel_Exec(exec_id)) } |
52931
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52800
diff
changeset
|
716 |
|
70625
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
717 |
def update( |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
718 |
doc_blobs: Document.Blobs, |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
719 |
edits: List[Document.Edit_Text], |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
720 |
share_common_data: Boolean = false) |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
721 |
{ |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
722 |
if (edits.nonEmpty) manager.send_wait(Session.Raw_Edits(doc_blobs, edits, share_common_data)) |
1ae987cc052f
support for share_common_data after define_command and before actual update: this affects string particles of command tokens;
wenzelm
parents:
70284
diff
changeset
|
723 |
} |
50498 | 724 |
|
52084
573e80625c78
more explicit Session.update_options as source of Global_Options event;
wenzelm
parents:
51818
diff
changeset
|
725 |
def update_options(options: Options) |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
726 |
{ manager.send_wait(Update_Options(options)) } |
52084
573e80625c78
more explicit Session.update_options as source of Global_Options event;
wenzelm
parents:
51818
diff
changeset
|
727 |
|
52531 | 728 |
def dialog_result(id: Document_ID.Generic, serial: Long, result: String) |
56706
f2f53f7046f4
converted main session manager to Consumer_Thread: messages need to be consumed immediately, postponed_changes replaces implicit actor mailbox scanning;
wenzelm
parents:
56705
diff
changeset
|
729 |
{ manager.send(Session.Dialog_Result(id, serial, result)) } |
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
730 |
} |