src/Pure/Tools/server.scala
author wenzelm
Sun, 11 Mar 2018 15:08:14 +0100
changeset 67820 e30d6368c7c8
parent 67812 b123c9a007d0
child 67821 82fb12061069
permissions -rw-r--r--
clarified argument formats: explicit Unit, allow XML.Elem as well; tuned messages: prefer single quotes for JSON output;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
     1
/*  Title:      Pure/Tools/server.scala
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
     3
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
     4
Resident Isabelle servers.
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
     5
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
     6
Message formats:
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
     7
  - short message (single line):
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
     8
      NAME ARGUMENT
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
     9
  - long message (multiple lines):
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
    10
      BYTE_LENGTH
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
    11
      NAME ARGUMENT
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    12
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    13
Argument formats:
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    14
  - Unit as empty string
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    15
  - XML.Elem in YXML notation
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    16
  - JSON.T in standard notation
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    17
*/
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    18
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    19
package isabelle
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    20
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    21
67806
bd4c440c8be7 option for console interaction;
wenzelm
parents: 67805
diff changeset
    22
import java.io.{BufferedInputStream, BufferedOutputStream, BufferedReader, BufferedWriter,
bd4c440c8be7 option for console interaction;
wenzelm
parents: 67805
diff changeset
    23
  InputStreamReader, OutputStreamWriter, IOException}
67797
1cfc7541012e Entry.connection: proview password here;
wenzelm
parents: 67796
diff changeset
    24
import java.net.{Socket, SocketException, SocketTimeoutException, ServerSocket, InetAddress}
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    25
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    26
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    27
object Server
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
    28
{
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    29
  /* message argument */
66927
153d7b68e8f8 more formal messages;
wenzelm
parents: 66921
diff changeset
    30
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    31
  object Argument
67794
wenzelm
parents: 67793
diff changeset
    32
  {
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    33
    def split(msg: String): (String, String) =
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    34
    {
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    35
      val name = msg.takeWhile(c => Symbol.is_ascii_letter(c) || Symbol.is_ascii_letdig(c))
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    36
      val argument = msg.substring(name.length).dropWhile(Symbol.is_ascii_blank(_))
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    37
      (name, argument)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    38
    }
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    39
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    40
    def print(arg: Any): String =
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    41
      arg match {
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    42
        case () => ""
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    43
        case t: XML.Elem => YXML.string_of_tree(t)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    44
        case t: JSON.T => JSON.Format(t)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    45
      }
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    46
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    47
    def parse(argument: String): Any =
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    48
      if (argument == "") ()
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    49
      else if (YXML.detect_elem(argument)) YXML.parse_elem(argument)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    50
      else JSON.parse(argument, strict = false)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    51
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    52
    def unapply(argument: String): Option[Any] =
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    53
      try { Some(parse(argument)) }
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    54
      catch { case ERROR(_) => None }
67794
wenzelm
parents: 67793
diff changeset
    55
  }
wenzelm
parents: 67793
diff changeset
    56
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    57
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    58
  /* input command */
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    59
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    60
  object Command
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    61
  {
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    62
    type T = PartialFunction[(Server, Any), Any]
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    63
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    64
    private val table: Map[String, T] =
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    65
      Map(
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    66
        "echo" -> { case (_, t) => t },
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    67
        "help" -> { case (_, ()) => table.keySet.toList.sorted },
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    68
        "shutdown" -> { case (server, ()) => server.close(); () })
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    69
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    70
    def unapply(name: String): Option[T] = table.get(name)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    71
  }
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    72
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    73
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    74
  /* output reply */
66929
c19b17b72777 some concrete commands;
wenzelm
parents: 66927
diff changeset
    75
66927
153d7b68e8f8 more formal messages;
wenzelm
parents: 66921
diff changeset
    76
  object Reply extends Enumeration
153d7b68e8f8 more formal messages;
wenzelm
parents: 66921
diff changeset
    77
  {
67801
8f5f5fbe291b added Reply.NOTE for asynchronous notifications;
wenzelm
parents: 67800
diff changeset
    78
    val OK, ERROR, NOTE = Value
67800
fd30e767d900 more operations;
wenzelm
parents: 67799
diff changeset
    79
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    80
    def unapply(msg: String): Option[(Reply.Value, Any)] =
67800
fd30e767d900 more operations;
wenzelm
parents: 67799
diff changeset
    81
    {
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
    82
      if (msg == "") None
67800
fd30e767d900 more operations;
wenzelm
parents: 67799
diff changeset
    83
      else {
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    84
        val (name, argument) = Argument.split(msg)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    85
        for {
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    86
          reply <-
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    87
            try { Some(withName(name)) }
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    88
            catch { case _: NoSuchElementException => None }
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    89
          arg <- Argument.unapply(argument)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
    90
        } yield (reply, arg)
67800
fd30e767d900 more operations;
wenzelm
parents: 67799
diff changeset
    91
      }
fd30e767d900 more operations;
wenzelm
parents: 67799
diff changeset
    92
    }
66927
153d7b68e8f8 more formal messages;
wenzelm
parents: 66921
diff changeset
    93
  }
153d7b68e8f8 more formal messages;
wenzelm
parents: 66921
diff changeset
    94
153d7b68e8f8 more formal messages;
wenzelm
parents: 66921
diff changeset
    95
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
    96
  /* socket connection */
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
    97
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
    98
  object Connection
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
    99
  {
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   100
    def apply(socket: Socket): Connection =
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   101
      new Connection(socket)
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   102
  }
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   103
67788
34e76587dc94 tuned signature;
wenzelm
parents: 67787
diff changeset
   104
  class Connection private(val socket: Socket)
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   105
  {
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   106
    override def toString: String = socket.toString
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   107
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   108
    def close() { socket.close }
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   109
67805
2d9a265b294e more uniform Bytes.read_line/read_block operations;
wenzelm
parents: 67801
diff changeset
   110
    val in = new BufferedInputStream(socket.getInputStream)
2d9a265b294e more uniform Bytes.read_line/read_block operations;
wenzelm
parents: 67801
diff changeset
   111
    val out = new BufferedOutputStream(socket.getOutputStream)
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   112
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   113
    def read_message(): Option[String] =
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   114
      try {
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   115
        Bytes.read_line(in).map(_.text) match {
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   116
          case Some(Value.Int(n)) =>
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   117
            Bytes.read_block(in, n).map(bytes => Library.trim_line(bytes.text))
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   118
          case res => res
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   119
        }
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   120
      }
67805
2d9a265b294e more uniform Bytes.read_line/read_block operations;
wenzelm
parents: 67801
diff changeset
   121
      catch { case _: SocketException => None }
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   122
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   123
    def write_message(msg: String)
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   124
    {
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   125
      val b = UTF8.bytes(msg)
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   126
      if (b.length > 100 || b.contains(10)) {
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   127
        out.write(UTF8.bytes((b.length + 1).toString))
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   128
        out.write(10)
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   129
      }
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   130
      out.write(b)
67805
2d9a265b294e more uniform Bytes.read_line/read_block operations;
wenzelm
parents: 67801
diff changeset
   131
      out.write(10)
2d9a265b294e more uniform Bytes.read_line/read_block operations;
wenzelm
parents: 67801
diff changeset
   132
      try { out.flush() } catch { case _: SocketException => }
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   133
    }
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   134
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   135
    def reply(r: Server.Reply.Value, arg: Any)
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   136
    {
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   137
      val argument = Argument.print(arg)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   138
      write_message(if (argument == "") r.toString else r.toString + " " + argument)
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   139
    }
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   140
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   141
    def reply_ok(arg: Any) { reply(Server.Reply.OK, arg) }
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   142
    def reply_error(arg: Any) { reply(Server.Reply.ERROR, arg) }
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   143
    def reply_error_message(message: String, more: (String, JSON.T)*): Unit =
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   144
      reply_error(Map("message" -> message) ++ more)
67801
8f5f5fbe291b added Reply.NOTE for asynchronous notifications;
wenzelm
parents: 67800
diff changeset
   145
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   146
    def notify(arg: Any) { reply(Server.Reply.NOTE, arg) }
67801
8f5f5fbe291b added Reply.NOTE for asynchronous notifications;
wenzelm
parents: 67800
diff changeset
   147
    def notify_message(message: String, more: (String, JSON.T)*): Unit =
8f5f5fbe291b added Reply.NOTE for asynchronous notifications;
wenzelm
parents: 67800
diff changeset
   148
      notify(Map("message" -> message) ++ more)
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   149
  }
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   150
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   151
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   152
  /* server info */
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   153
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   154
  sealed case class Info(name: String, port: Int, password: String)
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   155
  {
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   156
    override def toString: String =
67812
b123c9a007d0 tuned output;
wenzelm
parents: 67811
diff changeset
   157
      "server " + print_name_space(name) + "= " + print(port, password)
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   158
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   159
    def connection(): Connection =
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   160
    {
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   161
      val connection = Connection(new Socket(InetAddress.getByName("127.0.0.1"), port))
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   162
      connection.write_message(password)
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   163
      connection
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   164
    }
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   165
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   166
    def active(): Boolean =
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   167
      try {
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   168
        using(connection())(connection =>
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   169
          {
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   170
            connection.socket.setSoTimeout(2000)
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   171
            connection.read_message() == Some(Reply.OK.toString)
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   172
          })
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   173
      }
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   174
      catch {
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   175
        case _: IOException => false
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   176
        case _: SocketException => false
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   177
        case _: SocketTimeoutException => false
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   178
      }
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   179
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   180
    def console()
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   181
    {
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   182
      using(connection())(connection =>
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   183
        {
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   184
          val tty_loop =
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   185
            new TTY_Loop(
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   186
              new BufferedWriter(new OutputStreamWriter(connection.socket.getOutputStream)),
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   187
              new BufferedReader(new InputStreamReader(connection.socket.getInputStream)))
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   188
          tty_loop.join
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   189
        })
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   190
    }
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   191
  }
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   192
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   193
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   194
  /* per-user servers */
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   195
67812
b123c9a007d0 tuned output;
wenzelm
parents: 67811
diff changeset
   196
  def print_name_space(name: String): String =
b123c9a007d0 tuned output;
wenzelm
parents: 67811
diff changeset
   197
    if (name == "") "" else quote(name) + " "
b123c9a007d0 tuned output;
wenzelm
parents: 67811
diff changeset
   198
67787
8335d88195c4 clarified toString operations;
wenzelm
parents: 67786
diff changeset
   199
  def print(port: Int, password: String): String =
8335d88195c4 clarified toString operations;
wenzelm
parents: 67786
diff changeset
   200
    "127.0.0.1:" + port + " (password " + quote(password) + ")"
8335d88195c4 clarified toString operations;
wenzelm
parents: 67786
diff changeset
   201
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   202
  object Data
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   203
  {
66349
66b843e4cff5 clarified database names;
wenzelm
parents: 66348
diff changeset
   204
    val database = Path.explode("$ISABELLE_HOME_USER/servers.db")
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   205
66857
f8f42289c4df tuned signature;
wenzelm
parents: 66353
diff changeset
   206
    val name = SQL.Column.string("name").make_primary_key
66349
66b843e4cff5 clarified database names;
wenzelm
parents: 66348
diff changeset
   207
    val port = SQL.Column.int("port")
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   208
    val password = SQL.Column.string("password")
66349
66b843e4cff5 clarified database names;
wenzelm
parents: 66348
diff changeset
   209
    val table = SQL.Table("isabelle_servers", List(name, port, password))
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   210
  }
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   211
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   212
  def list(db: SQLite.Database): List[Info] =
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   213
    if (db.tables.contains(Data.table.name)) {
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   214
      db.using_statement(Data.table.select())(stmt =>
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   215
        stmt.execute_query().iterator(res =>
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   216
          Info(
66349
66b843e4cff5 clarified database names;
wenzelm
parents: 66348
diff changeset
   217
            res.string(Data.name),
66b843e4cff5 clarified database names;
wenzelm
parents: 66348
diff changeset
   218
            res.int(Data.port),
66b843e4cff5 clarified database names;
wenzelm
parents: 66348
diff changeset
   219
            res.string(Data.password))).toList.sortBy(_.name))
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   220
    }
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   221
    else Nil
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   222
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   223
  def find(db: SQLite.Database, name: String): Option[Info] =
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   224
    list(db).find(server_info => server_info.name == name && server_info.active)
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   225
67811
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   226
  def init(name: String = "", port: Int = 0, existing_server: Boolean = false)
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   227
    : (Info, Option[Server]) =
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   228
  {
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   229
    using(SQLite.open_database(Data.database))(db =>
67799
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   230
      {
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   231
        db.transaction {
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   232
          Isabelle_System.bash("chmod 600 " + File.bash_path(Data.database)).check
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   233
          db.create_table(Data.table)
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   234
          list(db).filterNot(_.active).foreach(server_info =>
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   235
            db.using_statement(Data.table.delete(Data.name.where_equal(server_info.name)))(
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   236
              _.execute))
67799
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   237
        }
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   238
        db.transaction {
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   239
          find(db, name) match {
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   240
            case Some(server_info) => (server_info, None)
67799
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   241
            case None =>
67811
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   242
              if (existing_server) {
67812
b123c9a007d0 tuned output;
wenzelm
parents: 67811
diff changeset
   243
                  error("Isabelle server " + print_name_space(name) + "not running")
67811
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   244
              }
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   245
67799
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   246
              val server = new Server(port)
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   247
              val server_info = Info(name, server.port, server.password)
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   248
67799
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   249
              db.using_statement(Data.table.delete(Data.name.where_equal(name)))(_.execute)
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   250
              db.using_statement(Data.table.insert())(stmt =>
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   251
              {
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   252
                stmt.string(1) = server_info.name
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   253
                stmt.int(2) = server_info.port
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   254
                stmt.string(3) = server_info.password
67799
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   255
                stmt.execute()
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   256
              })
66348
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   257
67799
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   258
              server.start
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   259
              (server_info, Some(server))
67799
f801cb14a0b3 more thorough init: purge inactive entries;
wenzelm
parents: 67798
diff changeset
   260
          }
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   261
        }
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   262
      })
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   263
  }
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   264
67789
77a65c9a849a tuned signature;
wenzelm
parents: 67788
diff changeset
   265
  def exit(name: String = ""): Boolean =
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   266
  {
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   267
    using(SQLite.open_database(Data.database))(db =>
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   268
      db.transaction {
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   269
        find(db, name) match {
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   270
          case Some(server_info) =>
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   271
            using(server_info.connection())(_.write_message("shutdown"))
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   272
            while(server_info.active) { Thread.sleep(50) }
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   273
            true
67785
ad96390ceb5d server commands may access Server;
wenzelm
parents: 67784
diff changeset
   274
          case None => false
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   275
        }
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   276
      })
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   277
  }
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   278
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   279
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   280
  /* Isabelle tool wrapper */
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   281
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   282
  val isabelle_tool =
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   283
    Isabelle_Tool("server", "manage resident Isabelle servers", args =>
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   284
    {
67806
bd4c440c8be7 option for console interaction;
wenzelm
parents: 67805
diff changeset
   285
      var console = false
66348
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   286
      var operation_list = false
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   287
      var name = ""
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   288
      var port = 0
67811
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   289
      var existing_server = false
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   290
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   291
      val getopts =
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   292
        Getopts("""
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   293
Usage: isabelle server [OPTIONS]
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   294
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   295
  Options are:
67806
bd4c440c8be7 option for console interaction;
wenzelm
parents: 67805
diff changeset
   296
    -C           console interaction with specified server
bd4c440c8be7 option for console interaction;
wenzelm
parents: 67805
diff changeset
   297
    -L           list servers only
66348
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   298
    -n NAME      explicit server name
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   299
    -p PORT      explicit server port
67811
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   300
    -s           assume existing server, no implicit startup
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   301
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   302
  Manage resident Isabelle servers.
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   303
""",
67806
bd4c440c8be7 option for console interaction;
wenzelm
parents: 67805
diff changeset
   304
          "C" -> (_ => console = true),
66348
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   305
          "L" -> (_ => operation_list = true),
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   306
          "n:" -> (arg => name = arg),
67811
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   307
          "p:" -> (arg => port = Value.Int.parse(arg)),
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   308
          "s" -> (_ => existing_server = true))
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   309
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   310
      val more_args = getopts(args)
66348
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   311
      if (more_args.nonEmpty) getopts.usage()
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   312
66353
6e114edae18b proper check for active server;
wenzelm
parents: 66352
diff changeset
   313
      if (operation_list) {
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   314
        for {
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   315
          server_info <- using(SQLite.open_database(Data.database))(list(_))
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   316
          if server_info.active
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   317
        } Output.writeln(server_info.toString, stdout = true)
66353
6e114edae18b proper check for active server;
wenzelm
parents: 66352
diff changeset
   318
      }
66348
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   319
      else {
67811
33199d033505 more options: client without implicit server startup;
wenzelm
parents: 67809
diff changeset
   320
        val (server_info, server) = init(name, port = port, existing_server = existing_server)
67807
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   321
        Output.writeln(server_info.toString, stdout = true)
331619e6c8b0 clarified signature;
wenzelm
parents: 67806
diff changeset
   322
        if (console) server_info.console()
67785
ad96390ceb5d server commands may access Server;
wenzelm
parents: 67784
diff changeset
   323
        server.foreach(_.join)
66348
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   324
      }
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   325
    })
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   326
}
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   327
66352
7ed911242266 clarified signature;
wenzelm
parents: 66351
diff changeset
   328
class Server private(_port: Int)
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   329
{
67785
ad96390ceb5d server commands may access Server;
wenzelm
parents: 67784
diff changeset
   330
  server =>
ad96390ceb5d server commands may access Server;
wenzelm
parents: 67784
diff changeset
   331
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   332
  private val server_socket = new ServerSocket(_port, 50, InetAddress.getByName("127.0.0.1"))
67791
acecef5fad58 tuned signature;
wenzelm
parents: 67790
diff changeset
   333
acecef5fad58 tuned signature;
wenzelm
parents: 67790
diff changeset
   334
  def close() { server_socket.close }
acecef5fad58 tuned signature;
wenzelm
parents: 67790
diff changeset
   335
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   336
  def port: Int = server_socket.getLocalPort
67787
8335d88195c4 clarified toString operations;
wenzelm
parents: 67786
diff changeset
   337
  val password: String = Library.UUID()
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   338
67787
8335d88195c4 clarified toString operations;
wenzelm
parents: 67786
diff changeset
   339
  override def toString: String = Server.print(port, password)
66348
a426e826e84c more options;
wenzelm
parents: 66347
diff changeset
   340
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   341
  private def handle(connection: Server.Connection)
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   342
  {
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   343
    connection.read_message() match {
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   344
      case Some(msg) if msg == password =>
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   345
        connection.reply_ok(())
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   346
        var finished = false
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   347
        while (!finished) {
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   348
          connection.read_message() match {
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   349
            case None => finished = true
67801
8f5f5fbe291b added Reply.NOTE for asynchronous notifications;
wenzelm
parents: 67800
diff changeset
   350
            case Some("") =>
8f5f5fbe291b added Reply.NOTE for asynchronous notifications;
wenzelm
parents: 67800
diff changeset
   351
              connection.notify_message("Command 'help' provides list of commands")
67809
a5fa8d854e5e more flexible message formats;
wenzelm
parents: 67807
diff changeset
   352
            case Some(msg) =>
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   353
              val (name, argument) = Server.Argument.split(msg)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   354
              name match {
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   355
                case Server.Command(cmd) =>
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   356
                  argument match {
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   357
                    case Server.Argument(arg) =>
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   358
                      if (cmd.isDefinedAt((server, arg))) {
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   359
                        Exn.capture { cmd((server, arg)) } match {
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   360
                          case Exn.Res(res) => connection.reply_ok(res)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   361
                          case Exn.Exn(ERROR(msg)) => connection.reply_error(msg)
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   362
                          case Exn.Exn(exn) => throw exn
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   363
                        }
66929
c19b17b72777 some concrete commands;
wenzelm
parents: 66927
diff changeset
   364
                      }
c19b17b72777 some concrete commands;
wenzelm
parents: 66927
diff changeset
   365
                      else {
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   366
                        connection.reply_error_message(
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   367
                          "Bad argument for command " + Library.single_quote(name),
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   368
                          "argument" -> argument)
66929
c19b17b72777 some concrete commands;
wenzelm
parents: 66927
diff changeset
   369
                      }
c19b17b72777 some concrete commands;
wenzelm
parents: 66927
diff changeset
   370
                    case _ =>
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   371
                      connection.reply_error_message(
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   372
                        "Malformed argument for command " + Library.single_quote(name),
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   373
                        "argument" -> argument)
66929
c19b17b72777 some concrete commands;
wenzelm
parents: 66927
diff changeset
   374
                  }
67820
e30d6368c7c8 clarified argument formats: explicit Unit, allow XML.Elem as well;
wenzelm
parents: 67812
diff changeset
   375
                case _ => connection.reply_error("Bad command " + Library.single_quote(name))
66921
3d3bd0718ef2 clarified command language;
wenzelm
parents: 66857
diff changeset
   376
              }
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   377
          }
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   378
        }
67796
bb2bbabf3d37 clarified initial protocol;
wenzelm
parents: 67795
diff changeset
   379
      case _ =>
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   380
    }
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   381
  }
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   382
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   383
  private lazy val server_thread: Thread =
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   384
    Standard_Thread.fork("server") {
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   385
      var finished = false
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   386
      while (!finished) {
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   387
        Exn.capture(server_socket.accept) match {
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   388
          case Exn.Res(socket) =>
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   389
            Standard_Thread.fork("server_connection")
67786
be6d69595ca7 clarified socket connection;
wenzelm
parents: 67785
diff changeset
   390
              { using(Server.Connection(socket))(handle(_)) }
66350
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   391
          case Exn.Exn(_) => finished = true
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   392
        }
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   393
      }
66331026a2fc handle server connections;
wenzelm
parents: 66349
diff changeset
   394
    }
67785
ad96390ceb5d server commands may access Server;
wenzelm
parents: 67784
diff changeset
   395
67790
1babcc248be0 clarified server start, notably for invocation within regular Isabelle/Scala process;
wenzelm
parents: 67789
diff changeset
   396
  def start { server_thread }
1babcc248be0 clarified server start, notably for invocation within regular Isabelle/Scala process;
wenzelm
parents: 67789
diff changeset
   397
67791
acecef5fad58 tuned signature;
wenzelm
parents: 67790
diff changeset
   398
  def join { server_thread.join; close() }
66347
23eaab37e4a8 support for resident Isabelle servers;
wenzelm
parents:
diff changeset
   399
}