| author | blanchet | 
| Mon, 08 Sep 2014 15:11:37 +0200 | |
| changeset 58227 | d91f7a80f412 | 
| parent 57979 | fc136831d6ca | 
| child 58928 | 23d0ffd48006 | 
| 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  | 
| 
34777
 
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
 
wenzelm 
parents:  
diff
changeset
 | 
12  | 
|
| 
34815
 
6bae73cd8e33
unified Command and Command_State, eliminated separate Accumulator;
 
wenzelm 
parents: 
34813 
diff
changeset
 | 
13  | 
|
| 34791 | 14  | 
object Session  | 
15  | 
{
 | 
|
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
16  | 
/* outlets */  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
17  | 
|
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
18  | 
object Consumer  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
19  | 
  {
 | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
20  | 
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
 | 
21  | 
new Consumer[A](name, consume)  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
22  | 
}  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
23  | 
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
 | 
24  | 
|
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
25  | 
class Outlet[A](dispatcher: Consumer_Thread[() => Unit])  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
26  | 
  {
 | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
27  | 
private val consumers = Synchronized(List.empty[Consumer[A]])  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
28  | 
|
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
29  | 
    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
 | 
30  | 
    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
 | 
31  | 
|
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
32  | 
def post(a: A)  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
33  | 
    {
 | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
34  | 
      for (c <- consumers.value.iterator) {
 | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
35  | 
dispatcher.send(() =>  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
36  | 
          try { c.consume(a) }
 | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
37  | 
          catch {
 | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
38  | 
case exn: Throwable =>  | 
| 
56782
 
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
 
wenzelm 
parents: 
56775 
diff
changeset
 | 
39  | 
              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
 | 
40  | 
})  | 
| 
 
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  | 
|
| 56315 | 46  | 
/* change */  | 
47  | 
||
48  | 
sealed case class Change(  | 
|
49  | 
previous: Document.Version,  | 
|
50  | 
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
 | 
51  | 
deps_changed: Boolean,  | 
| 56315 | 52  | 
doc_edits: List[Document.Edit_Command],  | 
53  | 
version: Document.Version)  | 
|
54  | 
||
| 
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
 | 
55  | 
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
 | 
56  | 
|
| 56315 | 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  | 
|
| 
52111
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
98  | 
/* protocol handlers */  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
99  | 
|
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
100  | 
abstract class Protocol_Handler  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
101  | 
  {
 | 
| 56864 | 102  | 
    def start(prover: Prover): Unit = {}
 | 
| 
52111
 
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]  | 
| 56864 | 127  | 
new_handler.start(prover)  | 
128  | 
||
| 
52111
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
129  | 
val new_functions =  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
130  | 
for ((a, f) <- new_handler.functions.toList) yield  | 
| 56385 | 131  | 
(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
 | 
132  | 
|
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
133  | 
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
 | 
134  | 
          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
 | 
135  | 
|
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
136  | 
(handlers1 + (name -> new_handler), functions1 ++ new_functions)  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
137  | 
}  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
138  | 
        catch {
 | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
139  | 
case exn: Throwable =>  | 
| 
56782
 
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
 
wenzelm 
parents: 
56775 
diff
changeset
 | 
140  | 
Output.error_message(  | 
| 
 
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
 
wenzelm 
parents: 
56775 
diff
changeset
 | 
141  | 
"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
 | 
142  | 
(handlers1, functions1)  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
143  | 
}  | 
| 
 
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  | 
new Protocol_Handlers(handlers2, functions2)  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
146  | 
}  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
147  | 
|
| 56385 | 148  | 
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
 | 
149  | 
      msg.properties match {
 | 
| 
52111
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
150  | 
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
 | 
151  | 
          try { functions(a)(msg) }
 | 
| 
52111
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
152  | 
          catch {
 | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
153  | 
case exn: Throwable =>  | 
| 
56782
 
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
 
wenzelm 
parents: 
56775 
diff
changeset
 | 
154  | 
Output.error_message(  | 
| 
 
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
 
wenzelm 
parents: 
56775 
diff
changeset
 | 
155  | 
"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
 | 
156  | 
false  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
157  | 
}  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
158  | 
case _ => false  | 
| 
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
159  | 
}  | 
| 52113 | 160  | 
|
161  | 
def stop(prover: Prover): Protocol_Handlers =  | 
|
162  | 
    {
 | 
|
163  | 
for ((_, handler) <- handlers) handler.stop(prover)  | 
|
164  | 
new Protocol_Handlers()  | 
|
165  | 
}  | 
|
| 
52111
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
166  | 
}  | 
| 34791 | 167  | 
}  | 
168  | 
||
| 
34777
 
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
 
wenzelm 
parents:  
diff
changeset
 | 
169  | 
|
| 56208 | 170  | 
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
 | 
171  | 
{
 | 
| 47653 | 172  | 
/* global flags */  | 
173  | 
||
174  | 
@volatile var timing: Boolean = false  | 
|
175  | 
@volatile var verbose: Boolean = false  | 
|
176  | 
||
177  | 
||
| 49288 | 178  | 
/* tuning parameters */  | 
179  | 
||
180  | 
def output_delay: Time = Time.seconds(0.1) // prover output (markup, common messages)  | 
|
| 
57867
 
abae8aff6262
added system option editor_output_delay: lower value might help big sessions under low-memory situations;
 
wenzelm 
parents: 
57866 
diff
changeset
 | 
181  | 
def prune_delay: Time = Time.seconds(60.0) // prune history (delete old versions)  | 
| 
49293
 
afcccb9bfa3b
prefer tuning parameters as public methods (again) -- to allow overriding in applications;
 
wenzelm 
parents: 
49288 
diff
changeset
 | 
182  | 
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
 | 
183  | 
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
 | 
184  | 
def reparse_limit: Int = 0  | 
| 37849 | 185  | 
|
186  | 
||
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
187  | 
/* outlets */  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
188  | 
|
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
189  | 
private val dispatcher =  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
190  | 
    Consumer_Thread.fork[() => Unit]("Session.dispatcher", daemon = true) { case e => e(); true }
 | 
| 34809 | 191  | 
|
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
192  | 
val statistics = new Session.Outlet[Session.Statistics](dispatcher)  | 
| 
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
193  | 
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
 | 
194  | 
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
 | 
195  | 
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
 | 
196  | 
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
 | 
197  | 
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
 | 
198  | 
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
 | 
199  | 
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
 | 
200  | 
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
 | 
201  | 
val trace_events = new Session.Outlet[Simplifier_Trace.Event.type](dispatcher)  | 
| 34809 | 202  | 
|
203  | 
||
| 
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
 | 
204  | 
|
| 56799 | 205  | 
/** 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
 | 
206  | 
|
| 56799 | 207  | 
/* 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
 | 
208  | 
|
| 56799 | 209  | 
private case class Start(name: String, args: List[String])  | 
210  | 
private case object Stop  | 
|
211  | 
private case class Cancel_Exec(exec_id: Document_ID.Exec)  | 
|
212  | 
private case class Protocol_Command(name: String, args: List[String])  | 
|
213  | 
private case class Update_Options(options: Options)  | 
|
214  | 
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
 | 
215  | 
|
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38722 
diff
changeset
 | 
216  | 
|
| 
43651
 
511df47bcadc
some support for theory files within Isabelle/Scala session;
 
wenzelm 
parents: 
43649 
diff
changeset
 | 
217  | 
/* global state */  | 
| 43644 | 218  | 
|
| 
56775
 
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
 
wenzelm 
parents: 
56772 
diff
changeset
 | 
219  | 
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
 | 
220  | 
def syslog_content(): String = syslog.content  | 
| 
39626
 
a5d0bcfb95a3
manage persistent syslog via Session, not Isabelle_Process;
 
wenzelm 
parents: 
39625 
diff
changeset
 | 
221  | 
|
| 
39630
 
44181423183a
explicit Session.Phase indication with associated event bus;
 
wenzelm 
parents: 
39629 
diff
changeset
 | 
222  | 
@volatile private var _phase: Session.Phase = Session.Inactive  | 
| 39633 | 223  | 
private def phase_=(new_phase: Session.Phase)  | 
| 
39630
 
44181423183a
explicit Session.Phase indication with associated event bus;
 
wenzelm 
parents: 
39629 
diff
changeset
 | 
224  | 
  {
 | 
| 
 
44181423183a
explicit Session.Phase indication with associated event bus;
 
wenzelm 
parents: 
39629 
diff
changeset
 | 
225  | 
_phase = new_phase  | 
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
226  | 
phase_changed.post(new_phase)  | 
| 
39630
 
44181423183a
explicit Session.Phase indication with associated event bus;
 
wenzelm 
parents: 
39629 
diff
changeset
 | 
227  | 
}  | 
| 43716 | 228  | 
def phase = _phase  | 
| 43553 | 229  | 
def is_ready: Boolean = phase == Session.Ready  | 
| 
39630
 
44181423183a
explicit Session.Phase indication with associated event bus;
 
wenzelm 
parents: 
39629 
diff
changeset
 | 
230  | 
|
| 56690 | 231  | 
private val global_state = Synchronized(Document.State.init)  | 
| 56687 | 232  | 
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
 | 
233  | 
|
| 
56393
 
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
 
wenzelm 
parents: 
56387 
diff
changeset
 | 
234  | 
def recent_syntax(): Prover.Syntax =  | 
| 
46944
 
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
235  | 
  {
 | 
| 
 
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
236  | 
val version = current_state().recent_finished.version.get_finished  | 
| 
56394
 
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
 
wenzelm 
parents: 
56393 
diff
changeset
 | 
237  | 
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
 | 
238  | 
}  | 
| 
34816
 
d33312514220
maintain generic session entities -- cover commands, states, etc. (but not yet documents);
 
wenzelm 
parents: 
34815 
diff
changeset
 | 
239  | 
|
| 
43651
 
511df47bcadc
some support for theory files within Isabelle/Scala session;
 
wenzelm 
parents: 
43649 
diff
changeset
 | 
240  | 
|
| 
53054
 
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
 
wenzelm 
parents: 
52931 
diff
changeset
 | 
241  | 
/* protocol handlers */  | 
| 
 
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
 
wenzelm 
parents: 
52931 
diff
changeset
 | 
242  | 
|
| 
 
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
 
wenzelm 
parents: 
52931 
diff
changeset
 | 
243  | 
@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
 | 
244  | 
|
| 
 
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
 
wenzelm 
parents: 
52931 
diff
changeset
 | 
245  | 
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
 | 
246  | 
_protocol_handlers.get(name)  | 
| 
 
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
 
wenzelm 
parents: 
52931 
diff
changeset
 | 
247  | 
|
| 
 
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
 
wenzelm 
parents: 
52931 
diff
changeset
 | 
248  | 
|
| 
43651
 
511df47bcadc
some support for theory files within Isabelle/Scala session;
 
wenzelm 
parents: 
43649 
diff
changeset
 | 
249  | 
/* theory files */  | 
| 
 
511df47bcadc
some support for theory files within Isabelle/Scala session;
 
wenzelm 
parents: 
43649 
diff
changeset
 | 
250  | 
|
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48422 
diff
changeset
 | 
251  | 
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
 | 
252  | 
  {
 | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48422 
diff
changeset
 | 
253  | 
val header1 =  | 
| 56208 | 254  | 
if (resources.loaded_theories(name.theory))  | 
| 54559 | 255  | 
        header.error("Cannot update finished theory " + quote(name.theory))
 | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48422 
diff
changeset
 | 
256  | 
else header  | 
| 
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48422 
diff
changeset
 | 
257  | 
(name, Document.Node.Deps(header1))  | 
| 
44442
 
cb18e4f09053
clarified norm_header/header_edit -- disallow update of loaded theories;
 
wenzelm 
parents: 
44436 
diff
changeset
 | 
258  | 
}  | 
| 
 
cb18e4f09053
clarified norm_header/header_edit -- disallow update of loaded theories;
 
wenzelm 
parents: 
44436 
diff
changeset
 | 
259  | 
|
| 
43651
 
511df47bcadc
some support for theory files within Isabelle/Scala session;
 
wenzelm 
parents: 
43649 
diff
changeset
 | 
260  | 
|
| 56799 | 261  | 
/* pipelined change parsing */  | 
262  | 
||
263  | 
private case class Text_Edits(  | 
|
264  | 
previous: Future[Document.Version],  | 
|
265  | 
doc_blobs: Document.Blobs,  | 
|
266  | 
text_edits: List[Document.Edit_Text],  | 
|
267  | 
version_result: Promise[Document.Version])  | 
|
| 
43651
 
511df47bcadc
some support for theory files within Isabelle/Scala session;
 
wenzelm 
parents: 
43649 
diff
changeset
 | 
268  | 
|
| 56799 | 269  | 
  private val change_parser = Consumer_Thread.fork[Text_Edits]("change_parser", daemon = true)
 | 
270  | 
  {
 | 
|
271  | 
case Text_Edits(previous, doc_blobs, text_edits, version_result) =>  | 
|
272  | 
val prev = previous.get_finished  | 
|
273  | 
val change =  | 
|
274  | 
        Timing.timeit("parse_change", timing) {
 | 
|
275  | 
resources.parse_change(reparse_limit, prev, doc_blobs, text_edits)  | 
|
276  | 
}  | 
|
277  | 
version_result.fulfill(change.version)  | 
|
278  | 
manager.send(change)  | 
|
279  | 
true  | 
|
280  | 
}  | 
|
| 41534 | 281  | 
|
| 
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
 | 
282  | 
|
| 
56719
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
283  | 
/* buffered changes */  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
284  | 
|
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
285  | 
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
 | 
286  | 
  {
 | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
287  | 
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
 | 
288  | 
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
 | 
289  | 
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
 | 
290  | 
|
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
291  | 
    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
 | 
292  | 
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
 | 
293  | 
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
 | 
294  | 
assignment = false  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
295  | 
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
 | 
296  | 
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
 | 
297  | 
}  | 
| 
56771
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
298  | 
    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
 | 
299  | 
|
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
300  | 
    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
 | 
301  | 
assignment |= assign  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
302  | 
      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
 | 
303  | 
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
 | 
304  | 
commands += command  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
305  | 
}  | 
| 
56771
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
306  | 
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
 | 
307  | 
}  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
308  | 
|
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
309  | 
def shutdown()  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
310  | 
    {
 | 
| 
56771
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
311  | 
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
 | 
312  | 
flush()  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
313  | 
}  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
314  | 
}  | 
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
315  | 
|
| 
 
80eb2192516a
simplified change_buffer (again, see 937826d702d5): no thread, just timer, rely on asynchronous commands_changed.post;
 
wenzelm 
parents: 
56715 
diff
changeset
 | 
316  | 
|
| 
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
 | 
317  | 
/* 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
 | 
318  | 
|
| 
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
 | 
319  | 
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
 | 
320  | 
  {
 | 
| 
 
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  | 
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
 | 
322  | 
|
| 
 
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  | 
    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
 | 
324  | 
|
| 
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
 | 
325  | 
    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
 | 
326  | 
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
 | 
327  | 
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
 | 
328  | 
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
 | 
329  | 
}  | 
| 
 
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  | 
}  | 
| 
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
 | 
331  | 
|
| 
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
 | 
332  | 
|
| 
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
 | 
333  | 
/* 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
 | 
334  | 
|
| 
 
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
 | 
335  | 
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
 | 
336  | 
  {
 | 
| 
 
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
 | 
337  | 
private val variable = Synchronized(None: Option[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
 | 
338  | 
|
| 
 
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
 | 
339  | 
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
 | 
340  | 
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
 | 
341  | 
    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
 | 
342  | 
    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
 | 
343  | 
    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
 | 
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  | 
|
| 
 
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  | 
|
| 
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
 | 
347  | 
/* 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
 | 
348  | 
|
| 
56771
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
349  | 
  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
 | 
350  | 
|
| 
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
 | 
351  | 
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
 | 
352  | 
  {
 | 
| 
52649
 
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
353  | 
/* raw edits */  | 
| 
 
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
354  | 
|
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
355  | 
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
 | 
356  | 
    //{{{
 | 
| 
 
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
357  | 
    {
 | 
| 
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
 | 
358  | 
require(prover.defined)  | 
| 56712 | 359  | 
|
| 
52649
 
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
360  | 
prover.get.discontinue_execution()  | 
| 
 
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
361  | 
|
| 56687 | 362  | 
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
 | 
363  | 
val version = Future.promise[Document.Version]  | 
| 56711 | 364  | 
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
 | 
365  | 
|
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
366  | 
raw_edits.post(Session.Raw_Edits(doc_blobs, edits))  | 
| 56704 | 367  | 
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
 | 
368  | 
}  | 
| 
 
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
369  | 
//}}}  | 
| 
 
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
370  | 
|
| 
 
f45ab3e8211b
update_options with full update, e.g. required for re-assignment of Command.prints;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
371  | 
|
| 43716 | 372  | 
/* resulting changes */  | 
| 34809 | 373  | 
|
| 56315 | 374  | 
def handle_change(change: Session.Change)  | 
| 38221 | 375  | 
    //{{{
 | 
| 34809 | 376  | 
    {
 | 
| 
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
 | 
377  | 
require(prover.defined)  | 
| 56712 | 378  | 
|
| 44383 | 379  | 
def id_command(command: Command)  | 
| 43720 | 380  | 
      {
 | 
| 
54519
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54443 
diff
changeset
 | 
381  | 
        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
 | 
382  | 
(name, digest) <- command.blobs_defined  | 
| 56687 | 383  | 
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
 | 
384  | 
        } {
 | 
| 
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
 | 
385  | 
          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
 | 
386  | 
case Some(blob) =>  | 
| 56687 | 387  | 
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
 | 
388  | 
prover.get.define_blob(digest, blob.bytes)  | 
| 55783 | 389  | 
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
 | 
390  | 
              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
 | 
391  | 
}  | 
| 
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54443 
diff
changeset
 | 
392  | 
}  | 
| 
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54443 
diff
changeset
 | 
393  | 
|
| 56687 | 394  | 
        if (!global_state.value.defined_command(command.id)) {
 | 
395  | 
global_state.change(_.define_command(command))  | 
|
| 
44644
 
317e4962dd0f
clarified define_command: store name as structural information;
 
wenzelm 
parents: 
44616 
diff
changeset
 | 
396  | 
prover.get.define_command(command)  | 
| 43720 | 397  | 
}  | 
398  | 
}  | 
|
| 56315 | 399  | 
      change.doc_edits foreach {
 | 
| 44383 | 400  | 
case (_, edit) =>  | 
401  | 
          edit foreach { case (c1, c2) => c1 foreach id_command; c2 foreach id_command }
 | 
|
402  | 
}  | 
|
| 43722 | 403  | 
|
| 56687 | 404  | 
val assignment = global_state.value.the_assignment(change.previous).check_finished  | 
405  | 
global_state.change(_.define_version(change.version, assignment))  | 
|
| 56315 | 406  | 
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
 | 
407  | 
resources.commit(change)  | 
| 34809 | 408  | 
}  | 
| 38221 | 409  | 
//}}}  | 
| 34809 | 410  | 
|
411  | 
||
| 
46772
 
be21f050eda4
tuned signature -- emphasize Isabelle_Process Input vs. Output;
 
wenzelm 
parents: 
46771 
diff
changeset
 | 
412  | 
/* prover output */  | 
| 34809 | 413  | 
|
| 56385 | 414  | 
def handle_output(output: Prover.Output)  | 
| 38221 | 415  | 
    //{{{
 | 
| 34809 | 416  | 
    {
 | 
| 
51662
 
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
 
wenzelm 
parents: 
51083 
diff
changeset
 | 
417  | 
def bad_output()  | 
| 43716 | 418  | 
      {
 | 
419  | 
if (verbose)  | 
|
| 
56782
 
433cf57550fa
more systematic Isabelle output, like in classic Isabelle/ML (without markup);
 
wenzelm 
parents: 
56775 
diff
changeset
 | 
420  | 
          Output.warning("Ignoring bad prover output: " + output.message.toString)
 | 
| 43716 | 421  | 
}  | 
422  | 
||
| 52531 | 423  | 
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
 | 
424  | 
      {
 | 
| 
 
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
 
wenzelm 
parents: 
51083 
diff
changeset
 | 
425  | 
        try {
 | 
| 56687 | 426  | 
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
 | 
427  | 
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
 | 
428  | 
}  | 
| 
 
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
 
wenzelm 
parents: 
51083 
diff
changeset
 | 
429  | 
        catch {
 | 
| 
 
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
 
wenzelm 
parents: 
51083 
diff
changeset
 | 
430  | 
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
 | 
431  | 
}  | 
| 
 
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
 
wenzelm 
parents: 
51083 
diff
changeset
 | 
432  | 
}  | 
| 
 
3391a493f39a
just one timing protocol function, with 3 implementations: TTY/PG, PIDE/document, build;
 
wenzelm 
parents: 
51083 
diff
changeset
 | 
433  | 
|
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
434  | 
      output match {
 | 
| 56385 | 435  | 
case msg: Prover.Protocol_Output =>  | 
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
436  | 
val handled = _protocol_handlers.invoke(msg)  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
437  | 
          if (!handled) {
 | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
438  | 
            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
 | 
439  | 
case Markup.Protocol_Handler(name) if prover.defined =>  | 
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
440  | 
_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
 | 
441  | 
|
| 
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
 | 
442  | 
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
 | 
443  | 
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
 | 
444  | 
accumulate(state_id, prover.get.xml_cache.elem(message))  | 
| 46122 | 445  | 
|
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
446  | 
case Markup.Assign_Update =>  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
447  | 
                msg.text match {
 | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
448  | 
case Protocol.Assign_Update(id, update) =>  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
449  | 
                    try {
 | 
| 56687 | 450  | 
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
 | 
451  | 
change_buffer.invoke(true, 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
 | 
452  | 
manager.send(Session.Change_Flush)  | 
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
453  | 
}  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
454  | 
                    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
 | 
455  | 
case _ => bad_output()  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
456  | 
}  | 
| 
56771
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
457  | 
delay_prune.invoke()  | 
| 46122 | 458  | 
|
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
459  | 
case Markup.Removed_Versions =>  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
460  | 
                msg.text match {
 | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
461  | 
case Protocol.Removed(removed) =>  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
462  | 
                    try {
 | 
| 56687 | 463  | 
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
 | 
464  | 
manager.send(Session.Change_Flush)  | 
| 
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  | 
                    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
 | 
467  | 
case _ => bad_output()  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
468  | 
}  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
469  | 
|
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
470  | 
case Markup.ML_Statistics(props) =>  | 
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
471  | 
statistics.post(Session.Statistics(props))  | 
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
472  | 
|
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
473  | 
case Markup.Task_Statistics(props) =>  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
474  | 
// FIXME  | 
| 
52111
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
475  | 
|
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
476  | 
case _ => bad_output()  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
477  | 
}  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
478  | 
}  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
479  | 
case _ =>  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
480  | 
          output.properties match {
 | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
481  | 
case Position.Id(state_id) =>  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
482  | 
accumulate(state_id, output.message)  | 
| 56210 | 483  | 
|
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
484  | 
case _ if output.is_init =>  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
485  | 
phase = Session.Ready  | 
| 56210 | 486  | 
|
| 
54442
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
487  | 
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
 | 
488  | 
if (rc == 0) phase = Session.Inactive  | 
| 
 
c39972ddd672
more specific Protocol_Output: empty message.body, main content via bytes/text;
 
wenzelm 
parents: 
53054 
diff
changeset
 | 
489  | 
else phase = Session.Failed  | 
| 
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
 | 
490  | 
prover.reset  | 
| 56210 | 491  | 
|
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
492  | 
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
 | 
493  | 
}  | 
| 
52111
 
1fd184eaa310
explicit management of Session.Protocol_Handlers, with protocol state and functions;
 
wenzelm 
parents: 
52084 
diff
changeset
 | 
494  | 
}  | 
| 34809 | 495  | 
}  | 
| 38221 | 496  | 
//}}}  | 
| 34809 | 497  | 
|
| 
34820
 
a8ba6cde13e9
basic setup for synchronous / modal (!) prover startup;
 
wenzelm 
parents: 
34819 
diff
changeset
 | 
498  | 
|
| 
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
 | 
499  | 
/* 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
 | 
500  | 
|
| 
56710
 
8f102c18eab7
more uniform warning/error handling, potentially with propagation to send_wait caller;
 
wenzelm 
parents: 
56709 
diff
changeset
 | 
501  | 
    Consumer_Thread.fork[Any]("Session.manager", daemon = true)
 | 
| 56709 | 502  | 
    {
 | 
503  | 
case arg: Any =>  | 
|
504  | 
        //{{{
 | 
|
505  | 
        arg match {
 | 
|
| 
56733
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
506  | 
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
 | 
507  | 
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
 | 
508  | 
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
 | 
509  | 
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
 | 
510  | 
|
| 
56733
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
511  | 
            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
 | 
512  | 
syslog += output.message  | 
| 
56733
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
513  | 
syslog_messages.post(output)  | 
| 
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
514  | 
}  | 
| 
56775
 
59f70b89e5fd
improved syslog performance -- avoid denial-of-service e.g. with threads_trace = 5 and active Syslog dockable;
 
wenzelm 
parents: 
56772 
diff
changeset
 | 
515  | 
|
| 
56733
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
516  | 
all_messages.post(output)  | 
| 
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
517  | 
|
| 
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
518  | 
case input: Prover.Input =>  | 
| 
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
519  | 
all_messages.post(input)  | 
| 
 
f7700146678d
manager is direct receiver of prover output -- discontinued old performance tuning (329320fc88df, 1baa5d19ac44);
 
wenzelm 
parents: 
56719 
diff
changeset
 | 
520  | 
|
| 
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
 | 
521  | 
case Start(name, args) if !prover.defined =>  | 
| 56709 | 522  | 
            if (phase == Session.Inactive || phase == Session.Failed) {
 | 
523  | 
phase = Session.Startup  | 
|
| 
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
 | 
524  | 
prover.set(resources.start_prover(manager.send(_), name, args))  | 
| 56709 | 525  | 
}  | 
| 
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
 | 
526  | 
|
| 56709 | 527  | 
case 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
 | 
528  | 
            if (prover.defined && is_ready) {
 | 
| 56709 | 529  | 
_protocol_handlers = _protocol_handlers.stop(prover.get)  | 
| 56772 | 530  | 
global_state.change(_ => Document.State.init)  | 
| 56709 | 531  | 
phase = Session.Shutdown  | 
532  | 
prover.get.terminate  | 
|
533  | 
}  | 
|
| 
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
 | 
534  | 
|
| 
56771
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
535  | 
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
 | 
536  | 
            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
 | 
537  | 
val old_versions = global_state.change_result(_.remove_versions(prune_size))  | 
| 
56771
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
538  | 
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
 | 
539  | 
}  | 
| 
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
540  | 
|
| 56709 | 541  | 
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
 | 
542  | 
            if (prover.defined && is_ready) {
 | 
| 56709 | 543  | 
prover.get.options(options)  | 
544  | 
handle_raw_edits(Document.Blobs.empty, Nil)  | 
|
545  | 
}  | 
|
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
546  | 
global_options.post(Session.Global_Options(options))  | 
| 34809 | 547  | 
|
| 
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  | 
case Cancel_Exec(exec_id) if prover.defined =>  | 
| 56709 | 549  | 
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
 | 
550  | 
|
| 
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
 | 
551  | 
case Session.Raw_Edits(doc_blobs, edits) if prover.defined =>  | 
| 56709 | 552  | 
handle_raw_edits(doc_blobs, edits)  | 
553  | 
||
| 
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
 | 
554  | 
case Session.Dialog_Result(id, serial, result) if prover.defined =>  | 
| 56709 | 555  | 
prover.get.dialog_result(serial, result)  | 
556  | 
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
 | 
557  | 
|
| 
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
 | 
558  | 
case Protocol_Command(name, args) if prover.defined =>  | 
| 56709 | 559  | 
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
 | 
560  | 
|
| 
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
 | 
561  | 
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
 | 
562  | 
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
 | 
563  | 
if (!state.removing_versions && state.is_assigned(change.previous))  | 
| 56709 | 564  | 
handle_change(change)  | 
565  | 
else postponed_changes.store(change)  | 
|
| 
57651
 
10df45dd14da
less warnings -- ignore potential prover startup/shutdown races;
 
wenzelm 
parents: 
56864 
diff
changeset
 | 
566  | 
|
| 
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
 | 
567  | 
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
 | 
568  | 
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
 | 
569  | 
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
 | 
570  | 
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
 | 
571  | 
|
| 
57651
 
10df45dd14da
less warnings -- ignore potential prover startup/shutdown races;
 
wenzelm 
parents: 
56864 
diff
changeset
 | 
572  | 
case bad =>  | 
| 
 
10df45dd14da
less warnings -- ignore potential prover startup/shutdown races;
 
wenzelm 
parents: 
56864 
diff
changeset
 | 
573  | 
            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
 | 
574  | 
}  | 
| 56709 | 575  | 
true  | 
576  | 
//}}}  | 
|
577  | 
}  | 
|
| 
34777
 
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
 
wenzelm 
parents:  
diff
changeset
 | 
578  | 
}  | 
| 
 
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
 
wenzelm 
parents:  
diff
changeset
 | 
579  | 
|
| 34809 | 580  | 
|
| 56799 | 581  | 
/* main operations */  | 
582  | 
||
583  | 
def snapshot(name: Document.Node.Name = Document.Node.Name.empty,  | 
|
584  | 
pending_edits: List[Text.Edit] = Nil): Document.Snapshot =  | 
|
585  | 
global_state.value.snapshot(name, pending_edits)  | 
|
| 34809 | 586  | 
|
| 56387 | 587  | 
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
 | 
588  | 
  { manager.send(Start(name, args)) }
 | 
| 45076 | 589  | 
|
| 50117 | 590  | 
def stop()  | 
591  | 
  {
 | 
|
| 56709 | 592  | 
manager.send_wait(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
 | 
593  | 
prover.await_reset()  | 
| 56704 | 594  | 
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
 | 
595  | 
change_buffer.shutdown()  | 
| 
56771
 
28d62a5b07e8
more systematic delay_first discipline for change_buffer and prune_history;
 
wenzelm 
parents: 
56735 
diff
changeset
 | 
596  | 
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
 | 
597  | 
manager.shutdown()  | 
| 
56715
 
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
 
wenzelm 
parents: 
56713 
diff
changeset
 | 
598  | 
dispatcher.shutdown()  | 
| 50117 | 599  | 
}  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38722 
diff
changeset
 | 
600  | 
|
| 
53054
 
8365d7fca3de
public access for protocol handlers and protocol commands -- to be used within reason;
 
wenzelm 
parents: 
52931 
diff
changeset
 | 
601  | 
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
 | 
602  | 
  { 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
 | 
603  | 
|
| 
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
 | 
604  | 
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
 | 
605  | 
  { 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
 | 
606  | 
|
| 
54521
 
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
 
wenzelm 
parents: 
54519 
diff
changeset
 | 
607  | 
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
 | 
608  | 
  { if (!edits.isEmpty) manager.send_wait(Session.Raw_Edits(doc_blobs, edits)) }
 | 
| 50498 | 609  | 
|
| 
52084
 
573e80625c78
more explicit Session.update_options as source of Global_Options event;
 
wenzelm 
parents: 
51818 
diff
changeset
 | 
610  | 
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
 | 
611  | 
  { manager.send_wait(Update_Options(options)) }
 | 
| 
52084
 
573e80625c78
more explicit Session.update_options as source of Global_Options event;
 
wenzelm 
parents: 
51818 
diff
changeset
 | 
612  | 
|
| 52531 | 613  | 
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
 | 
614  | 
  { 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
 | 
615  | 
}  |