src/HOL/Tools/atp_manager.ML
author wenzelm
Tue, 14 Oct 2008 15:45:44 +0200
changeset 28589 581b2ab9827a
parent 28586 d238b83ba3fc
child 28595 67e3945b53f1
permissions -rw-r--r--
adding preferences is now permissive, no error handling here; tuned messages;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
     1
(*  Title:      HOL/Tools/atp_manager.ML
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
     2
    ID:         $Id$
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
     3
    Author:     Fabian Immler, TU Muenchen
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
     4
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
     5
ATP threads are registered here.
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
     6
Threads with the same birth-time are seen as one group.
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
     7
All threads of a group are killed when one thread of it has been successful,
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
     8
or after a certain time,
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
     9
or when the maximum number of threads exceeds; then the oldest thread is killed.
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    10
*)
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    11
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    12
signature ATP_MANAGER =
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    13
sig
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    14
  val get_atps: unit -> string
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    15
  val set_atps: string -> unit
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    16
  val get_max_atps: unit -> int
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    17
  val set_max_atps: int -> unit
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    18
  val get_timeout: unit -> int
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    19
  val set_timeout: int -> unit
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    20
  val kill: unit -> unit
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    21
  val info: unit -> unit
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
    22
  val atp_thread: (unit -> 'a option) -> ('a -> string) -> Thread.thread
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
    23
  val add_prover: string -> (int -> Proof.state -> Thread.thread) -> theory -> theory
28484
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
    24
  val print_provers: theory -> unit
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
    25
  val sledgehammer: string list -> Proof.state -> unit
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    26
end;
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    27
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    28
structure AtpManager: ATP_MANAGER =
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    29
struct
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    30
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    31
(** preferences **)
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    32
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    33
local
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    34
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    35
val atps = ref "e";
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    36
val max_atps = ref 5;   (* ~1 means infinite number of atps *)
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    37
val timeout = ref 60;
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    38
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    39
in
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    40
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    41
fun get_atps () = CRITICAL (fn () => ! atps);
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    42
fun set_atps str = CRITICAL (fn () => atps := str);
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    43
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    44
fun get_max_atps () = CRITICAL (fn () => ! max_atps);
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    45
fun set_max_atps number = CRITICAL (fn () => max_atps := number);
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    46
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    47
fun get_timeout () = CRITICAL (fn () => ! timeout);
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    48
fun set_timeout time = CRITICAL (fn () => timeout := time);
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    49
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    50
val _ =
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    51
  ProofGeneralPgip.add_preference "Proof"
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    52
    (Preferences.string_pref atps
28589
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
    53
      "ATP: provers" "Default automatic provers (separated by whitespace)");
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    54
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    55
val _ = ProofGeneralPgip.add_preference "Proof"
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    56
    (Preferences.int_pref max_atps
28589
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
    57
      "ATP: maximum number" "How many provers may run in parallel");
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    58
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    59
val _ = ProofGeneralPgip.add_preference "Proof"
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    60
    (Preferences.int_pref timeout
28589
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
    61
      "ATP: timeout" "ATPs will be interrupted after this time (in seconds)");
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    62
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    63
end;
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    64
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    65
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    66
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    67
(** thread management **)
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    68
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    69
(* data structures over threads *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    70
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    71
structure ThreadHeap = HeapFun
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    72
(
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    73
  type elem = Time.time * Thread.thread;
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    74
  fun ord ((a, _), (b, _)) = Time.compare (a, b);
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    75
)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    76
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    77
val lookup_thread = AList.lookup Thread.equal;
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    78
val delete_thread = AList.delete Thread.equal;
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    79
val update_thread = AList.update Thread.equal;
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    80
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    81
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    82
(* state of thread manager *)
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    83
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    84
datatype T = State of
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    85
 {timeout_heap: ThreadHeap.T,
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    86
  oldest_heap: ThreadHeap.T,
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    87
  active: (Thread.thread * (Time.time * Time.time * string)) list,
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    88
  cancelling: (Thread.thread * (Time.time * Time.time * string)) list};
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    89
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    90
fun make_state timeout_heap oldest_heap active cancelling =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    91
  State {timeout_heap = timeout_heap, oldest_heap = oldest_heap,
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    92
    active = active, cancelling = cancelling};
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    93
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    94
val state = Synchronized.var "atp_manager" (make_state ThreadHeap.empty ThreadHeap.empty [] []);
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
    95
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    96
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
    97
(* the managing thread *)
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    98
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
    99
(*watches over running threads and interrupts them if required*)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   100
val managing_thread = ref (NONE: Thread.thread option);
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   101
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   102
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   103
(* unregister thread from thread manager -- move to cancelling *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   104
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   105
fun unregister success message thread = Synchronized.change_result state
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   106
  (fn State {timeout_heap, oldest_heap, active, cancelling} =>
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   107
    let
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   108
      val info = lookup_thread active thread
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   109
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   110
      (* get birthtime of unregistering thread if successful - for group-killing*)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   111
      val birthtime = case info of NONE => Time.zeroTime
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   112
        | SOME (tb, _, _) => if success then tb else Time.zeroTime
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   113
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   114
      (* move unregistering thread to cancelling *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   115
      val active' = delete_thread thread active
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   116
      val cancelling' = case info of NONE => cancelling
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   117
        | SOME (tb, _, desc) => update_thread (thread, (tb, Time.now (), desc)) cancelling
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   118
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   119
      (* move all threads of the same group to cancelling *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   120
      val group_threads = active |> map_filter (fn (th, (tb, _, desc)) =>
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   121
          if tb = birthtime then SOME (th, (tb, Time.now (), desc)) else NONE)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   122
      val active'' = filter_out (fn (_, (tb, _, _)) => tb = birthtime) active'
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   123
      val cancelling'' = append group_threads cancelling'
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   124
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   125
      (* message for user *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   126
      val message' = case info of NONE => ""
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   127
        | SOME (_, _, desc) => "Sledgehammer: " ^ desc ^ "\n" ^ message ^
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   128
          (if null group_threads then ""
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   129
           else "\nInterrupted " ^ string_of_int (length group_threads - 1) ^ " other group members")
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   130
    in (message', make_state timeout_heap oldest_heap active'' cancelling'') end);
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   131
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   132
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   133
(* start a watching thread which runs forever -- only one may exist *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   134
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   135
fun check_thread_manager () = CRITICAL (fn () =>
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   136
  if (case ! managing_thread of SOME thread => Thread.isActive thread | NONE => false)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   137
  then () else managing_thread := SOME (SimpleThread.fork false (fn () =>
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
   138
    let
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   139
      val min_wait_time = Time.fromMilliseconds 300
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   140
      val max_wait_time = Time.fromSeconds 10
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   141
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   142
      (* wait for next thread to cancel, or maximum*)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   143
      fun time_limit (State {timeout_heap, ...}) =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   144
        (case try ThreadHeap.min timeout_heap of
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   145
          NONE => SOME (Time.+ (Time.now (), max_wait_time))
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   146
        | SOME (time, _) => SOME time)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   147
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   148
      (* action: cancel find threads whose timeout is reached, and interrupt cancelling threads *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   149
      fun action (State {timeout_heap, oldest_heap, active, cancelling}) =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   150
        let val (timeout_threads, timeout_heap') =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   151
          ThreadHeap.upto (Time.now (), Thread.self ()) timeout_heap
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   152
        in
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   153
          if null timeout_threads andalso null cancelling then NONE
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   154
          else
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   155
            let
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   156
              val _ = List.app (SimpleThread.interrupt o #1) cancelling
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   157
              val cancelling' = filter (Thread.isActive o #1) cancelling
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   158
              val state' = make_state timeout_heap' oldest_heap active cancelling'
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   159
            in SOME (map #2 timeout_threads, state') end
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   160
        end
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   161
    in
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   162
      while true do
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   163
       ((* cancel threads found by action *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   164
        Synchronized.timed_access state time_limit action
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   165
        |> these
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   166
        |> List.app (priority o unregister false "Interrupted (reached timeout)");
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
   167
        (* give threads time to respond to interrupt *)
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
   168
        OS.Process.sleep min_wait_time)
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   169
    end)));
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   170
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   171
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   172
(* thread is registered here by sledgehammer *)
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   173
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   174
fun register birthtime deadtime (thread, desc) =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   175
 (check_thread_manager ();
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   176
  Synchronized.change state (fn State {timeout_heap, oldest_heap, active, cancelling} =>
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   177
    let
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   178
      val timeout_heap' = ThreadHeap.insert (deadtime, thread) timeout_heap
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   179
      val oldest_heap' = ThreadHeap.insert (birthtime, thread) oldest_heap
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   180
      val active' = update_thread (thread, (birthtime, deadtime, desc)) active
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   181
    in make_state timeout_heap' oldest_heap' active' cancelling end));
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   182
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   183
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   184
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   185
(** user commands **)
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   186
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   187
(* kill: move all threads to cancelling *)
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   188
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   189
fun kill () = Synchronized.change state
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   190
  (fn State {timeout_heap, oldest_heap, active, cancelling} =>
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   191
    let val formerly_active = map (fn (th, (tb, _, desc)) => (th, (tb, Time.now (), desc))) active
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   192
    in make_state timeout_heap oldest_heap [] (formerly_active @ cancelling) end);
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   193
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   194
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   195
(* info: information on running threads *)
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   196
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   197
fun info () =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   198
  let
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   199
    val State {timeout_heap, oldest_heap, active, cancelling} = Synchronized.value state
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
   200
    fun running_info (_, (birth_time, dead_time, desc)) = "Running: "
28589
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   201
        ^ (string_of_int o Time.toSeconds) (Time.- (Time.now (), birth_time))
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   202
        ^ " s  --  "
28589
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   203
        ^ (string_of_int o Time.toSeconds) (Time.- (dead_time, Time.now ()))
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
   204
        ^ " s to live:\n" ^ desc
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
   205
    fun cancelling_info (_, (_, dead_time, desc)) = "Trying to interrupt thread since "
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   206
        ^ (string_of_int o Time.toSeconds) (Time.- (Time.now (), dead_time))
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
   207
        ^ " s:\n" ^ desc
28589
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   208
    val running =
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   209
      if null active then "No ATPs running."
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   210
      else space_implode "\n\n" ("Running ATPs:" :: map running_info active)
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   211
    val interrupting =
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   212
      if null cancelling then ""
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   213
      else space_implode "\n\n"
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   214
        ("Trying to interrupt the following ATPs:" :: map cancelling_info cancelling)
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   215
  in writeln (running ^ "\n" ^ interrupting) end;
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   216
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   217
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   218
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   219
(** The Sledgehammer **)
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   220
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   221
(* named provers *)
28484
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
   222
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   223
fun err_dup_prover name = error ("Duplicate prover: " ^ quote name);
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   224
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   225
structure Provers = TheoryDataFun
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   226
(
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   227
  type T = ((int -> Proof.state -> Thread.thread) * stamp) Symtab.table
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   228
  val empty = Symtab.empty
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   229
  val copy = I
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   230
  val extend = I
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   231
  fun merge _ tabs : T = Symtab.merge (eq_snd op =) tabs
28589
581b2ab9827a adding preferences is now permissive, no error handling here;
wenzelm
parents: 28586
diff changeset
   232
    handle Symtab.DUP dup => err_dup_prover dup
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   233
);
28484
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
   234
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   235
fun add_prover name prover_fn thy =
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   236
  Provers.map (Symtab.update_new (name, (prover_fn, stamp ()))) thy
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   237
    handle Symtab.DUP dup => err_dup_prover dup;
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   238
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   239
fun print_provers thy = Pretty.writeln
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   240
  (Pretty.strs ("external provers:" :: sort_strings (Symtab.keys (Provers.get thy))));
28571
47d88239658d ** Update from Fabian **
wenzelm
parents: 28543
diff changeset
   241
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   242
fun prover_desc state subgoal name =
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   243
  let val (ctxt, (_, goal)) = Proof.get_goal state in
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   244
    "external prover " ^ quote name ^ " for subgoal " ^ string_of_int subgoal ^ ":\n" ^
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   245
      Syntax.string_of_term ctxt (Thm.term_of (Thm.cprem_of goal subgoal))
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   246
  end;
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   247
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   248
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   249
(* thread wrapping an atp-call *)
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   250
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   251
fun atp_thread call_prover produce_answer =
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   252
  SimpleThread.fork true (fn () =>
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   253
    let
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   254
      val result = call_prover ()
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   255
      val message = case result of NONE => "Failed."
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   256
          | SOME result => "Try this command: " ^ produce_answer result
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   257
    in priority (unregister (is_some result) message (Thread.self ()))
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   258
    end handle Interrupt => ());
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   259
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   260
fun run_prover state subgoal name =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   261
  (case Symtab.lookup (Provers.get (Proof.theory_of state)) name of
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   262
    NONE => (warning ("Unknown external prover: " ^ quote name); NONE)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   263
  | SOME (prover_fn, _) => SOME (prover_fn subgoal state, prover_desc state subgoal name));
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   264
28484
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
   265
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   266
(* kill excessive atp threads *)
28484
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
   267
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   268
local
28484
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
   269
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   270
fun excessive_atps active =
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   271
  let val max = get_max_atps ()
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   272
  in length active > max andalso max > ~1 end;
28484
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
   273
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   274
fun kill_oldest () =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   275
  let exception Unchanged in
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   276
    Synchronized.change_result state (fn State {timeout_heap, oldest_heap, active, cancelling} =>
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   277
        if ThreadHeap.is_empty oldest_heap orelse not (excessive_atps active)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   278
        then raise Unchanged
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   279
        else
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   280
          let val ((_, oldest_thread), oldest_heap') = ThreadHeap.min_elem oldest_heap
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   281
          in (oldest_thread, make_state timeout_heap oldest_heap' active cancelling) end)
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   282
      |> (priority o unregister false "Interrupted (maximum number of ATPs exceeded)")
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   283
    handle Unchanged => ()
28484
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
   284
  end;
4ed9239b09c1 misc simplifcation and tuning;
wenzelm
parents: 28478
diff changeset
   285
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   286
in
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   287
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   288
fun kill_excessive () =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   289
  let val State {active, ...} = Synchronized.value state
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   290
  in if excessive_atps active then (kill_oldest (); kill_excessive ()) else () end;
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   291
28477
9339d4dcec8b version of sledgehammer using threads instead of processes, misc cleanup;
wenzelm
parents:
diff changeset
   292
end;
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   293
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   294
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   295
(* sledghammer for first subgoal *)
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   296
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   297
fun sledgehammer names proof_state =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   298
  let
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   299
    val proverids =
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   300
      if null names then String.tokens (Symbol.is_ascii_blank o String.str) (get_atps ())
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   301
      else names
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   302
    val threads_names = map_filter (run_prover proof_state 1) proverids
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   303
    val birthtime = Time.now ()
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   304
    val deadtime = Time.+ (Time.now (), Time.fromSeconds (get_timeout ()))
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   305
    val _ = List.app (register birthtime deadtime) threads_names
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   306
    val _ = kill_excessive ()
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   307
  in () end;
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   308
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   309
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   310
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   311
(** Isar command syntax **)
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   312
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   313
local structure K = OuterKeyword and P = OuterParse in
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   314
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   315
val _ =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   316
  OuterSyntax.improper_command "atp_kill" "kill all managed provers" K.diag
28586
d238b83ba3fc renamed kill_all to kill, in conformance with atp_kill command;
wenzelm
parents: 28582
diff changeset
   317
    (Scan.succeed (Toplevel.no_timing o Toplevel.imperative kill));
28582
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   318
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   319
val _ =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   320
  OuterSyntax.improper_command "atp_info" "print information about managed provers" K.diag
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   321
    (Scan.succeed (Toplevel.no_timing o Toplevel.imperative info));
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   322
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   323
val _ =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   324
  OuterSyntax.improper_command "print_atps" "print external provers" K.diag
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   325
    (Scan.succeed (Toplevel.no_timing o Toplevel.unknown_theory o
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   326
      Toplevel.keep (print_provers o Toplevel.theory_of)));
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   327
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   328
val _ =
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   329
  OuterSyntax.command "sledgehammer" "call all automatic theorem provers" K.diag
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   330
    (Scan.repeat P.xname >> (fn names => Toplevel.no_timing o Toplevel.unknown_proof o
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   331
    Toplevel.keep ((sledgehammer names) o Toplevel.proof_of)));
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   332
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   333
end;
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   334
c269a3045fdf info: back to plain printing;
wenzelm
parents: 28571
diff changeset
   335
end;