author | wenzelm |
Tue, 29 Apr 2014 13:32:13 +0200 | |
changeset 56782 | 433cf57550fa |
parent 56775 | 59f70b89e5fd |
child 56793 | d5ab6a8799ce |
permissions | -rw-r--r-- |
56210 | 1 |
/* Title: Pure/PIDE/session.scala |
36676 | 2 |
Author: Makarius |
38221 | 3 |
Options: :folding=explicit:collapseFolds=1: |
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 |
|
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
|
11 |
import scala.collection.mutable |
46771
06a9b24c4a36
explicit syslog_limit reduces danger of low-level message flooding;
wenzelm
parents:
46739
diff
changeset
|
12 |
import scala.collection.immutable.Queue |
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 |
{ |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
28 |
private val consumers = Synchronized(List.empty[Consumer[A]]) |
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, |
|
51 |
doc_blobs: Document.Blobs, |
|
52 |
syntax_changed: Boolean, |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
53 |
deps_changed: Boolean, |
56315 | 54 |
doc_edits: List[Document.Edit_Command], |
55 |
version: Document.Version) |
|
56 |
||
57 |
||
34813
f0107bc96961
more explicit modeling of Command and Command_State as Session.Entity;
wenzelm
parents:
34810
diff
changeset
|
58 |
/* events */ |
f0107bc96961
more explicit modeling of Command and Command_State as Session.Entity;
wenzelm
parents:
34810
diff
changeset
|
59 |
|
43716 | 60 |
//{{{ |
50697
82e9178e6a98
improved Monitor_Dockable, based on ML_Statistics operations;
wenzelm
parents:
50566
diff
changeset
|
61 |
case class Statistics(props: Properties.T) |
50117 | 62 |
case class Global_Options(options: Options) |
44805 | 63 |
case object Caret_Focus |
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
64 |
case class Raw_Edits(doc_blobs: Document.Blobs, edits: List[Document.Edit_Text]) |
52531 | 65 |
case class Dialog_Result(id: Document_ID.Generic, serial: Long, result: String) |
47027
fc3bb6c02a3c
explicit propagation of assignment event, even if changed command set is empty;
wenzelm
parents:
46944
diff
changeset
|
66 |
case class Commands_Changed( |
fc3bb6c02a3c
explicit propagation of assignment event, even if changed command set is empty;
wenzelm
parents:
46944
diff
changeset
|
67 |
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
|
68 |
|
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
69 |
sealed abstract class Phase |
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
70 |
case object Inactive extends Phase |
39701 | 71 |
case object Startup extends Phase // transient |
72 |
case object Failed extends Phase |
|
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
73 |
case object Ready extends Phase |
39701 | 74 |
case object Shutdown extends Phase // transient |
43716 | 75 |
//}}} |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
76 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
77 |
|
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
78 |
/* syslog */ |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
79 |
|
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
80 |
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
|
81 |
{ |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
82 |
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
|
83 |
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
|
84 |
|
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
85 |
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
|
86 |
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
|
87 |
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
|
88 |
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
|
89 |
} |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
90 |
|
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
91 |
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
|
92 |
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
|
93 |
(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
|
94 |
} |
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
95 |
} |
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 |
|
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
98 |
|
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
99 |
/* protocol handlers */ |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
100 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
101 |
abstract class Protocol_Handler |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
102 |
{ |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
103 |
def stop(prover: Prover): Unit = {} |
56385 | 104 |
val functions: Map[String, (Prover, Prover.Protocol_Output) => Boolean] |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
105 |
} |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
106 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
107 |
class Protocol_Handlers( |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
108 |
handlers: Map[String, Session.Protocol_Handler] = Map.empty, |
56385 | 109 |
functions: Map[String, Prover.Protocol_Output => Boolean] = Map.empty) |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
110 |
{ |
53054
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
111 |
def get(name: String): Option[Protocol_Handler] = handlers.get(name) |
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
112 |
|
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
113 |
def add(prover: Prover, name: String): Protocol_Handlers = |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
114 |
{ |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
115 |
val (handlers1, functions1) = |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
116 |
handlers.get(name) match { |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
117 |
case Some(old_handler) => |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56775
diff
changeset
|
118 |
Output.warning("Redefining protocol handler: " + name) |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
119 |
old_handler.stop(prover) |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
120 |
(handlers - name, functions -- old_handler.functions.keys) |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
121 |
case None => (handlers, functions) |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
122 |
} |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
123 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
124 |
val (handlers2, functions2) = |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
125 |
try { |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
126 |
val new_handler = Class.forName(name).newInstance.asInstanceOf[Protocol_Handler] |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
127 |
val new_functions = |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
128 |
for ((a, f) <- new_handler.functions.toList) yield |
56385 | 129 |
(a, (msg: Prover.Protocol_Output) => f(prover, msg)) |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
130 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
131 |
val dups = for ((a, _) <- new_functions if functions1.isDefinedAt(a)) yield a |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
132 |
if (!dups.isEmpty) error("Duplicate protocol functions: " + commas_quote(dups)) |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
133 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
134 |
(handlers1 + (name -> new_handler), functions1 ++ new_functions) |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
135 |
} |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
136 |
catch { |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
137 |
case exn: Throwable => |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56775
diff
changeset
|
138 |
Output.error_message( |
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56775
diff
changeset
|
139 |
"Failed to initialize protocol handler: " + quote(name) + "\n" + Exn.message(exn)) |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
140 |
(handlers1, functions1) |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
141 |
} |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
142 |
|
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
143 |
new Protocol_Handlers(handlers2, functions2) |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
144 |
} |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
145 |
|
56385 | 146 |
def invoke(msg: Prover.Protocol_Output): Boolean = |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
147 |
msg.properties match { |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
148 |
case Markup.Function(a) if functions.isDefinedAt(a) => |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
149 |
try { functions(a)(msg) } |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
150 |
catch { |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
151 |
case exn: Throwable => |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56775
diff
changeset
|
152 |
Output.error_message( |
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56775
diff
changeset
|
153 |
"Failed invocation of protocol function: " + quote(a) + "\n" + Exn.message(exn)) |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
154 |
false |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
155 |
} |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
156 |
case _ => false |
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
157 |
} |
52113 | 158 |
|
159 |
def stop(prover: Prover): Protocol_Handlers = |
|
160 |
{ |
|
161 |
for ((_, handler) <- handlers) handler.stop(prover) |
|
162 |
new Protocol_Handlers() |
|
163 |
} |
|
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
164 |
} |
34791 | 165 |
} |
166 |
||
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
167 |
|
56208 | 168 |
class Session(val resources: Resources) |
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
169 |
{ |
47653 | 170 |
/* global flags */ |
171 |
||
172 |
@volatile var timing: Boolean = false |
|
173 |
@volatile var verbose: Boolean = false |
|
174 |
||
175 |
||
49288 | 176 |
/* tuning parameters */ |
177 |
||
178 |
def output_delay: Time = Time.seconds(0.1) // prover output (markup, common messages) |
|
52800
1baa5d19ac44
less aggressive flushing: cope with massive amounts of protocol messages, e.g. from threads_trace;
wenzelm
parents:
52766
diff
changeset
|
179 |
def message_delay: Time = Time.seconds(0.1) // prover input/output messages |
49293
afcccb9bfa3b
prefer tuning parameters as public methods (again) -- to allow overriding in applications;
wenzelm
parents:
49288
diff
changeset
|
180 |
def prune_delay: Time = Time.seconds(60.0) // prune history -- delete old versions |
afcccb9bfa3b
prefer tuning parameters as public methods (again) -- to allow overriding in applications;
wenzelm
parents:
49288
diff
changeset
|
181 |
def prune_size: Int = 0 // size of retained history |
afcccb9bfa3b
prefer tuning parameters as public methods (again) -- to allow overriding in applications;
wenzelm
parents:
49288
diff
changeset
|
182 |
def syslog_limit: Int = 100 |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49523
diff
changeset
|
183 |
def reparse_limit: Int = 0 |
37849 | 184 |
|
185 |
||
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
186 |
/* outlets */ |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
187 |
|
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
188 |
private val dispatcher = |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
189 |
Consumer_Thread.fork[() => Unit]("Session.dispatcher", daemon = true) { case e => e(); true } |
34809 | 190 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
191 |
val statistics = new Session.Outlet[Session.Statistics](dispatcher) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
192 |
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
|
193 |
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
|
194 |
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
|
195 |
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
|
196 |
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
|
197 |
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
|
198 |
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
|
199 |
val all_messages = new Session.Outlet[Prover.Message](dispatcher) // potential bottle-neck |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
200 |
val trace_events = new Session.Outlet[Simplifier_Trace.Event.type](dispatcher) |
34809 | 201 |
|
202 |
||
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
|
203 |
|
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 |
/** pipelined change parsing **/ |
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
205 |
|
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
206 |
private case class Text_Edits( |
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
207 |
previous: Future[Document.Version], |
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
208 |
doc_blobs: Document.Blobs, |
45635
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
209 |
text_edits: List[Document.Edit_Text], |
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
210 |
version_result: Promise[Document.Version]) |
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
211 |
|
56704 | 212 |
private val change_parser = Consumer_Thread.fork[Text_Edits]("change_parser", daemon = true) |
45635
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
213 |
{ |
56704 | 214 |
case Text_Edits(previous, doc_blobs, text_edits, version_result) => |
215 |
val prev = previous.get_finished |
|
216 |
val change = |
|
217 |
Timing.timeit("parse_change", timing) { |
|
218 |
resources.parse_change(reparse_limit, prev, doc_blobs, text_edits) |
|
219 |
} |
|
220 |
version_result.fulfill(change.version) |
|
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
|
221 |
manager.send(change) |
56704 | 222 |
true |
45635
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
223 |
} |
d9cf3520083c
explicit change_parser thread, which avoids undirected Future.fork with its tendency towards hundreds of worker threads;
wenzelm
parents:
45633
diff
changeset
|
224 |
|
38841
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38722
diff
changeset
|
225 |
|
47653 | 226 |
|
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
|
227 |
/** main protocol manager **/ |
34809 | 228 |
|
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
229 |
/* global state */ |
43644 | 230 |
|
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
231 |
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
|
232 |
def syslog_content(): String = syslog.content |
39626
a5d0bcfb95a3
manage persistent syslog via Session, not Isabelle_Process;
wenzelm
parents:
39625
diff
changeset
|
233 |
|
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
234 |
@volatile private var _phase: Session.Phase = Session.Inactive |
39633 | 235 |
private def phase_=(new_phase: Session.Phase) |
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
236 |
{ |
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
237 |
_phase = new_phase |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
238 |
phase_changed.post(new_phase) |
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
239 |
} |
43716 | 240 |
def phase = _phase |
43553 | 241 |
def is_ready: Boolean = phase == Session.Ready |
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39629
diff
changeset
|
242 |
|
56690 | 243 |
private val global_state = Synchronized(Document.State.init) |
56687 | 244 |
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
|
245 |
|
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56387
diff
changeset
|
246 |
def recent_syntax(): Prover.Syntax = |
46944
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
wenzelm
parents:
46942
diff
changeset
|
247 |
{ |
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
wenzelm
parents:
46942
diff
changeset
|
248 |
val version = current_state().recent_finished.version.get_finished |
56394
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
249 |
version.syntax getOrElse resources.base_syntax |
46944
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
wenzelm
parents:
46942
diff
changeset
|
250 |
} |
34816
d33312514220
maintain generic session entities -- cover commands, states, etc. (but not yet documents);
wenzelm
parents:
34815
diff
changeset
|
251 |
|
44960 | 252 |
def snapshot(name: Document.Node.Name = Document.Node.Name.empty, |
253 |
pending_edits: List[Text.Edit] = Nil): Document.Snapshot = |
|
56687 | 254 |
global_state.value.snapshot(name, pending_edits) |
43716 | 255 |
|
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
256 |
|
53054
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
257 |
/* protocol handlers */ |
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
258 |
|
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
259 |
@volatile private var _protocol_handlers = new Session.Protocol_Handlers() |
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
260 |
|
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
261 |
def protocol_handler(name: String): Option[Session.Protocol_Handler] = |
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
262 |
_protocol_handlers.get(name) |
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
263 |
|
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
264 |
|
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
265 |
/* theory files */ |
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
266 |
|
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48422
diff
changeset
|
267 |
def header_edit(name: Document.Node.Name, header: Document.Node.Header): Document.Edit_Text = |
44442
cb18e4f09053
clarified norm_header/header_edit -- disallow update of loaded theories;
wenzelm
parents:
44436
diff
changeset
|
268 |
{ |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48422
diff
changeset
|
269 |
val header1 = |
56208 | 270 |
if (resources.loaded_theories(name.theory)) |
54559 | 271 |
header.error("Cannot update finished theory " + quote(name.theory)) |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48422
diff
changeset
|
272 |
else header |
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48422
diff
changeset
|
273 |
(name, Document.Node.Deps(header1)) |
44442
cb18e4f09053
clarified norm_header/header_edit -- disallow update of loaded theories;
wenzelm
parents:
44436
diff
changeset
|
274 |
} |
cb18e4f09053
clarified norm_header/header_edit -- disallow update of loaded theories;
wenzelm
parents:
44436
diff
changeset
|
275 |
|
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
276 |
|
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
|
277 |
/* internal messages */ |
43651
511df47bcadc
some support for theory files within Isabelle/Scala session;
wenzelm
parents:
43649
diff
changeset
|
278 |
|
56387 | 279 |
private case class Start(name: String, args: List[String]) |
56709 | 280 |
private case object Stop |
52931
ac6648c0c0fb
cancel_query via direct access to the exec_id of the running query process;
wenzelm
parents:
52800
diff
changeset
|
281 |
private case class Cancel_Exec(exec_id: Document_ID.Exec) |
53054
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
282 |
private case class Protocol_Command(name: String, args: List[String]) |
52084
573e80625c78
more explicit Session.update_options as source of Global_Options event;
wenzelm
parents:
51818
diff
changeset
|
283 |
private case class Update_Options(options: Options) |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
284 |
private case object Prune_History |
41534 | 285 |
|
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
|
286 |
|
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
287 |
/* buffered changes */ |
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 |
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
|
290 |
{ |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
291 |
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
|
292 |
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
|
293 |
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
|
294 |
|
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
295 |
def flush(): Unit = synchronized { |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
296 |
if (assignment || !nodes.isEmpty || !commands.isEmpty) |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
297 |
commands_changed.post(Session.Commands_Changed(assignment, nodes, commands)) |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
298 |
assignment = false |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
299 |
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
|
300 |
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
|
301 |
} |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
302 |
private val delay_flush = Simple_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
|
303 |
|
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
304 |
def invoke(assign: Boolean, cmds: List[Command]): Unit = synchronized { |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
305 |
assignment |= assign |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
306 |
for (command <- cmds) { |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
307 |
nodes += command.node_name |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
308 |
commands += command |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
309 |
} |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
310 |
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
|
311 |
} |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
312 |
|
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
313 |
def shutdown() |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
314 |
{ |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
315 |
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
|
316 |
flush() |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
317 |
} |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
318 |
} |
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
319 |
|
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
320 |
|
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
|
321 |
/* 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
|
322 |
|
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
|
323 |
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
|
324 |
{ |
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
|
325 |
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
|
326 |
|
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
|
327 |
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
|
328 |
|
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
|
329 |
def flush(): Unit = synchronized { |
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
|
330 |
val state = global_state.value |
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
|
331 |
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
|
332 |
postponed = unassigned |
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
|
333 |
assigned.reverseIterator.foreach(change => manager.send(change)) |
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
|
334 |
} |
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
|
335 |
} |
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
|
336 |
|
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
|
337 |
|
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
|
338 |
/* 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
|
339 |
|
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
340 |
private val delay_prune = Simple_Thread.delay_first(prune_delay) { manager.send(Prune_History) } |
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
341 |
|
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
|
342 |
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
|
343 |
{ |
56387 | 344 |
var prover: Option[Prover] = None |
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
|
345 |
|
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
|
346 |
|
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
347 |
/* raw edits */ |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
348 |
|
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
349 |
def handle_raw_edits(doc_blobs: Document.Blobs, edits: List[Document.Edit_Text]) |
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
350 |
//{{{ |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
351 |
{ |
56712 | 352 |
require(prover.isDefined) |
353 |
||
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
354 |
prover.get.discontinue_execution() |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
355 |
|
56687 | 356 |
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
|
357 |
val version = Future.promise[Document.Version] |
56711 | 358 |
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
|
359 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
360 |
raw_edits.post(Session.Raw_Edits(doc_blobs, edits)) |
56704 | 361 |
change_parser.send(Text_Edits(previous, doc_blobs, edits, version)) |
52649
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
362 |
} |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
363 |
//}}} |
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
364 |
|
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
wenzelm
parents:
52563
diff
changeset
|
365 |
|
43716 | 366 |
/* resulting changes */ |
34809 | 367 |
|
56315 | 368 |
def handle_change(change: Session.Change) |
38221 | 369 |
//{{{ |
34809 | 370 |
{ |
56712 | 371 |
require(prover.isDefined) |
372 |
||
44383 | 373 |
def id_command(command: Command) |
43720 | 374 |
{ |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
375 |
for { |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
376 |
digest <- command.blobs_digests |
56687 | 377 |
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
|
378 |
} { |
56315 | 379 |
change.doc_blobs.get(digest) match { |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
380 |
case Some(blob) => |
56687 | 381 |
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
|
382 |
prover.get.define_blob(digest, blob.bytes) |
55783 | 383 |
case None => |
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56775
diff
changeset
|
384 |
Output.error_message("Missing blob for SHA1 digest " + digest) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
385 |
} |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
386 |
} |
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54443
diff
changeset
|
387 |
|
56687 | 388 |
if (!global_state.value.defined_command(command.id)) { |
389 |
global_state.change(_.define_command(command)) |
|
44644
317e4962dd0f
clarified define_command: store name as structural information;
wenzelm
parents:
44616
diff
changeset
|
390 |
prover.get.define_command(command) |
43720 | 391 |
} |
392 |
} |
|
56315 | 393 |
change.doc_edits foreach { |
44383 | 394 |
case (_, edit) => |
395 |
edit foreach { case (c1, c2) => c1 foreach id_command; c2 foreach id_command } |
|
396 |
} |
|
43722 | 397 |
|
56687 | 398 |
val assignment = global_state.value.the_assignment(change.previous).check_finished |
399 |
global_state.change(_.define_version(change.version, assignment)) |
|
56315 | 400 |
prover.get.update(change.previous.id, change.version.id, change.doc_edits) |
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
401 |
resources.commit(change) |
34809 | 402 |
} |
38221 | 403 |
//}}} |
34809 | 404 |
|
405 |
||
46772
be21f050eda4
tuned signature -- emphasize Isabelle_Process Input vs. Output;
wenzelm
parents:
46771
diff
changeset
|
406 |
/* prover output */ |
34809 | 407 |
|
56385 | 408 |
def handle_output(output: Prover.Output) |
38221 | 409 |
//{{{ |
34809 | 410 |
{ |
51662
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
411 |
def bad_output() |
43716 | 412 |
{ |
413 |
if (verbose) |
|
56782
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
wenzelm
parents:
56775
diff
changeset
|
414 |
Output.warning("Ignoring bad prover output: " + output.message.toString) |
43716 | 415 |
} |
416 |
||
52531 | 417 |
def accumulate(state_id: Document_ID.Generic, message: XML.Elem) |
51662
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
418 |
{ |
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
419 |
try { |
56687 | 420 |
val st = global_state.change_result(_.accumulate(state_id, message)) |
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
421 |
change_buffer.invoke(false, List(st.command)) |
51662
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
422 |
} |
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
423 |
catch { |
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
424 |
case _: Document.State.Fail => bad_output() |
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
425 |
} |
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
426 |
} |
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
wenzelm
parents:
51083
diff
changeset
|
427 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
428 |
output match { |
56385 | 429 |
case msg: Prover.Protocol_Output => |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
430 |
val handled = _protocol_handlers.invoke(msg) |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
431 |
if (!handled) { |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
432 |
msg.properties match { |
56712 | 433 |
case Markup.Protocol_Handler(name) if prover.isDefined => |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
434 |
_protocol_handlers = _protocol_handlers.add(prover.get, name) |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
435 |
|
56712 | 436 |
case Protocol.Command_Timing(state_id, timing) if prover.isDefined => |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
437 |
val message = XML.elem(Markup.STATUS, List(XML.Elem(Markup.Timing(timing), Nil))) |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
438 |
accumulate(state_id, prover.get.xml_cache.elem(message)) |
46122 | 439 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
440 |
case Markup.Assign_Update => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
441 |
msg.text match { |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
442 |
case Protocol.Assign_Update(id, update) => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
443 |
try { |
56687 | 444 |
val cmds = global_state.change_result(_.assign(id, update)) |
56719
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
wenzelm
parents:
56715
diff
changeset
|
445 |
change_buffer.invoke(true, cmds) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
446 |
} |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
447 |
catch { case _: Document.State.Fail => bad_output() } |
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
|
448 |
postponed_changes.flush() |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
449 |
case _ => bad_output() |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
450 |
} |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
451 |
delay_prune.invoke() |
46122 | 452 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
453 |
case Markup.Removed_Versions => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
454 |
msg.text match { |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
455 |
case Protocol.Removed(removed) => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
456 |
try { |
56687 | 457 |
global_state.change(_.removed_versions(removed)) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
458 |
} |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
459 |
catch { case _: Document.State.Fail => bad_output() } |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
460 |
case _ => bad_output() |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
461 |
} |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
462 |
|
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
463 |
case Markup.ML_Statistics(props) => |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
464 |
statistics.post(Session.Statistics(props)) |
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
465 |
|
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
466 |
case Markup.Task_Statistics(props) => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
467 |
// FIXME |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
468 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
469 |
case _ => bad_output() |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
470 |
} |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
471 |
} |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
472 |
case _ => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
473 |
output.properties match { |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
474 |
case Position.Id(state_id) => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
475 |
accumulate(state_id, output.message) |
56210 | 476 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
477 |
case _ if output.is_init => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
478 |
phase = Session.Ready |
56210 | 479 |
|
54442
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
480 |
case Markup.Return_Code(rc) if output.is_exit => |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
481 |
if (rc == 0) phase = Session.Inactive |
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents:
53054
diff
changeset
|
482 |
else phase = Session.Failed |
56735 | 483 |
prover = None |
56210 | 484 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
485 |
case _ => 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
|
486 |
} |
52111
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents:
52084
diff
changeset
|
487 |
} |
34809 | 488 |
} |
38221 | 489 |
//}}} |
34809 | 490 |
|
34820
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
wenzelm
parents:
34819
diff
changeset
|
491 |
|
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
|
492 |
/* 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
|
493 |
|
56710
8f102c18eab7
more uniform warning/error handling, potentially with propagation to send_wait caller;
wenzelm
parents:
56709
diff
changeset
|
494 |
Consumer_Thread.fork[Any]("Session.manager", daemon = true) |
56709 | 495 |
{ |
496 |
case arg: Any => |
|
497 |
//{{{ |
|
498 |
arg match { |
|
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
499 |
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
|
500 |
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
|
501 |
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
|
502 |
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
|
503 |
|
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
504 |
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
|
505 |
syslog += output.message |
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
506 |
syslog_messages.post(output) |
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
507 |
} |
56775
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
wenzelm
parents:
56772
diff
changeset
|
508 |
|
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
509 |
all_messages.post(output) |
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
510 |
|
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
511 |
case input: Prover.Input => |
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
512 |
all_messages.post(input) |
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
513 |
|
56709 | 514 |
case Start(name, args) if prover.isEmpty => |
515 |
if (phase == Session.Inactive || phase == Session.Failed) { |
|
516 |
phase = Session.Startup |
|
56733
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
wenzelm
parents:
56719
diff
changeset
|
517 |
prover = Some(resources.start_prover(manager.send(_), name, args)) |
56709 | 518 |
} |
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
|
519 |
|
56709 | 520 |
case Stop => |
56712 | 521 |
if (prover.isDefined && is_ready) { |
56709 | 522 |
_protocol_handlers = _protocol_handlers.stop(prover.get) |
56772 | 523 |
global_state.change(_ => Document.State.init) |
56709 | 524 |
phase = Session.Shutdown |
525 |
prover.get.terminate |
|
526 |
} |
|
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
|
527 |
|
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
528 |
case Prune_History => |
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
529 |
if (prover.isDefined) { |
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
530 |
val old_versions = global_state.change_result(_.prune_history(prune_size)) |
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
531 |
if (!old_versions.isEmpty) prover.get.remove_versions(old_versions) |
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
532 |
} |
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
533 |
|
56709 | 534 |
case Update_Options(options) => |
535 |
if (prover.isDefined && is_ready) { |
|
536 |
prover.get.options(options) |
|
537 |
handle_raw_edits(Document.Blobs.empty, Nil) |
|
538 |
} |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
539 |
global_options.post(Session.Global_Options(options)) |
34809 | 540 |
|
56709 | 541 |
case Cancel_Exec(exec_id) if prover.isDefined => |
542 |
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
|
543 |
|
56709 | 544 |
case Session.Raw_Edits(doc_blobs, edits) if prover.isDefined => |
545 |
handle_raw_edits(doc_blobs, edits) |
|
546 |
||
547 |
case Session.Dialog_Result(id, serial, result) if prover.isDefined => |
|
548 |
prover.get.dialog_result(serial, result) |
|
549 |
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
|
550 |
|
56709 | 551 |
case Protocol_Command(name, args) if prover.isDefined => |
552 |
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
|
553 |
|
56709 | 554 |
case change: Session.Change if prover.isDefined => |
555 |
if (global_state.value.is_assigned(change.previous)) |
|
556 |
handle_change(change) |
|
557 |
else postponed_changes.store(change) |
|
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 |
} |
56709 | 559 |
true |
560 |
//}}} |
|
561 |
} |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
562 |
} |
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
diff
changeset
|
563 |
|
34809 | 564 |
|
43716 | 565 |
/* actions */ |
34809 | 566 |
|
56387 | 567 |
def start(name: String, args: List[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
|
568 |
{ manager.send(Start(name, args)) } |
45076 | 569 |
|
50117 | 570 |
def stop() |
571 |
{ |
|
56709 | 572 |
manager.send_wait(Stop) |
56704 | 573 |
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
|
574 |
change_buffer.shutdown() |
56771
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
wenzelm
parents:
56735
diff
changeset
|
575 |
delay_prune.revoke() |
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
|
576 |
manager.shutdown() |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56713
diff
changeset
|
577 |
dispatcher.shutdown() |
50117 | 578 |
} |
38841
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38722
diff
changeset
|
579 |
|
53054
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
wenzelm
parents:
52931
diff
changeset
|
580 |
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
|
581 |
{ 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
|
582 |
|
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
|
583 |
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
|
584 |
{ 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
|
585 |
|
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
586 |
def update(doc_blobs: Document.Blobs, edits: List[Document.Edit_Text]) |
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
|
587 |
{ if (!edits.isEmpty) manager.send_wait(Session.Raw_Edits(doc_blobs, edits)) } |
50498 | 588 |
|
52084
573e80625c78
more explicit Session.update_options as source of Global_Options event;
wenzelm
parents:
51818
diff
changeset
|
589 |
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
|
590 |
{ manager.send_wait(Update_Options(options)) } |
52084
573e80625c78
more explicit Session.update_options as source of Global_Options event;
wenzelm
parents:
51818
diff
changeset
|
591 |
|
52531 | 592 |
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
|
593 |
{ 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
|
594 |
} |