src/HOL/Tools/ATP/watcher.ML
author paulson
Wed, 05 Oct 2005 11:18:06 +0200
changeset 17764 fde495b9e24b
parent 17746 af59c748371d
child 17772 818cec5f82a4
permissions -rw-r--r--
improved process handling. tidied
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15789
4cb16144c81b added hearder lines and deleted some redundant material
paulson
parents: 15787
diff changeset
     1
(*  Title:      Watcher.ML
4cb16144c81b added hearder lines and deleted some redundant material
paulson
parents: 15787
diff changeset
     2
    ID:         $Id$
4cb16144c81b added hearder lines and deleted some redundant material
paulson
parents: 15787
diff changeset
     3
    Author:     Claire Quigley
4cb16144c81b added hearder lines and deleted some redundant material
paulson
parents: 15787
diff changeset
     4
    Copyright   2004  University of Cambridge
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     5
 *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     6
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
     7
(*  The watcher process starts a resolution process when it receives a     *)
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     8
(*  message from Isabelle                                                  *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     9
(*  Signals Isabelle, puts output of child into pipe to Isabelle,          *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    10
(*  and removes dead processes.  Also possible to kill all the resolution  *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    11
(*  processes currently running.                                           *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    12
17305
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    13
signature WATCHER =
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    14
sig
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    15
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    16
(*  Send request to Watcher for multiple spasses to be called for filenames in arg       *)
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
    17
(* callResProvers (outstreamtoWatcher, prover name,prover-command, (settings,file) list *)
17305
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    18
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    19
val callResProvers :
17422
3b237822985d massive tidy-up and simplification
paulson
parents: 17317
diff changeset
    20
    TextIO.outstream * (string*string*string*string*string) list 
17305
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    21
    -> unit
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    22
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
    23
(* Send message to watcher to kill resolution provers *)
17305
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    24
val callSlayer : TextIO.outstream -> unit
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    25
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    26
(* Start a watcher and set up signal handlers             *)
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
    27
val createWatcher : 
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
    28
    thm * (ResClause.clause * thm) Array.array -> 
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
    29
    TextIO.instream * TextIO.outstream * Posix.Process.pid
17305
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    30
val killWatcher : Posix.Process.pid -> unit
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
    31
val setting_sep : char
17305
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    32
end
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    33
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
    34
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    35
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    36
structure Watcher: WATCHER =
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
    37
struct
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    38
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
    39
(*Field separators, used to pack items onto a text line*)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
    40
val command_sep = #"\t"
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
    41
and setting_sep = #"%";
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
    42
17488
67376a311a2b further simplification of the Isabelle-ATP linkup
paulson
parents: 17484
diff changeset
    43
open Recon_Transfer
16805
fadf80952202 open ReconPrelim Recon_Transfer;
wenzelm
parents: 16767
diff changeset
    44
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    45
val goals_being_watched = ref 0;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    46
17583
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
    47
val trace_path = Path.basic "watcher_trace";
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
    48
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
    49
fun trace s = if !Output.show_debug_msgs then File.append (File.tmp_path trace_path) s 
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
    50
              else ();
17583
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
    51
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    52
(*  The result of calling createWatcher  *)
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    53
datatype proc = PROC of {
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    54
        pid : Posix.Process.pid,
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    55
        instr : TextIO.instream,
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    56
        outstr : TextIO.outstream
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    57
      };
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    58
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    59
(*  The result of calling executeToList  *)
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    60
datatype cmdproc = CMDPROC of {
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
    61
        prover: string,       (* Name of the resolution prover used, e.g. Vampire*)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
    62
        cmd:  string,         (* The file containing the goal for res prover to prove *)     
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
    63
        goalstring: string,   (* string representation of subgoal*) 
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    64
        proc_handle : (TextIO.instream,TextIO.outstream) Unix.proc,
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    65
        instr : TextIO.instream,   (*  Input stream to child process *)
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
    66
        outstr : TextIO.outstream};  (*  Output stream from child process *)
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    67
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    68
type signal = Posix.Signal.signal
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    69
datatype exit_status = datatype Posix.Process.exit_status
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    70
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    71
val fromStatus = Posix.Process.fromStatus
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    72
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    73
fun reap(pid, instr, outstr) =
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
    74
  let val u = TextIO.closeIn instr;
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
    75
      val u = TextIO.closeOut outstr;
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
    76
      val (_, status) = Posix.Process.waitpid(Posix.Process.W_CHILD pid, [])
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
    77
  in status end
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    78
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    79
fun fdReader (name : string, fd : Posix.IO.file_desc) =
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    80
	  Posix.IO.mkTextReader {initBlkMode = true,name = name,fd = fd };
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    81
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    82
fun fdWriter (name, fd) =
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    83
          Posix.IO.mkTextWriter {
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    84
	      appendMode = false,
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    85
              initBlkMode = true,
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    86
              name = name,  
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    87
              chunkSize=4096,
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
    88
              fd = fd};
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    89
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    90
fun openOutFD (name, fd) =
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    91
	  TextIO.mkOutstream (
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    92
	    TextIO.StreamIO.mkOutstream (
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    93
	      fdWriter (name, fd), IO.BLOCK_BUF));
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    94
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    95
fun openInFD (name, fd) =
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    96
	  TextIO.mkInstream (
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    97
	    TextIO.StreamIO.mkInstream (
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    98
	      fdReader (name, fd), ""));
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
    99
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   100
fun childInfo (PROC{pid,instr,outstr }) = (pid,(instr,outstr));
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   101
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   102
fun cmdstreamsOf (CMDPROC{instr,outstr,...}) = (instr, outstr);
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   103
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   104
fun cmdInStream (CMDPROC{instr,outstr,...}) = instr;
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   105
17422
3b237822985d massive tidy-up and simplification
paulson
parents: 17317
diff changeset
   106
fun cmdchildInfo (CMDPROC{prover,cmd,proc_handle,goalstring,instr,outstr}) = 
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   107
  (prover,(cmd, (instr,outstr)));
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   108
17422
3b237822985d massive tidy-up and simplification
paulson
parents: 17317
diff changeset
   109
fun cmdchildHandle (CMDPROC{prover,cmd,goalstring,proc_handle,instr,outstr})  = 
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   110
  proc_handle;
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   111
17422
3b237822985d massive tidy-up and simplification
paulson
parents: 17317
diff changeset
   112
fun cmdProver (CMDPROC{prover,cmd,goalstring,proc_handle,instr,outstr})  =
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   113
  prover;
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   114
17422
3b237822985d massive tidy-up and simplification
paulson
parents: 17317
diff changeset
   115
fun cmdGoal (CMDPROC{prover,cmd,goalstring,proc_handle,instr,outstr})  =
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   116
  goalstring;
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   117
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   118
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   119
(*    gets individual args from instream and concatenates them into a list      *)
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   120
fun getArgs (fromParentStr, toParentStr, ys) =  
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   121
  let val thisLine = TextIO.input fromParentStr
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   122
  in ys@[thisLine] end
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   123
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   124
                            
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   125
(*  Send request to Watcher for a vampire to be called for filename in arg      *)
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   126
                   
17231
f42bc4f7afdf tidying up the Isabelle/ATP interface
paulson
parents: 17216
diff changeset
   127
fun callResProver (toWatcherStr,  arg) = 
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   128
      (TextIO.output (toWatcherStr, arg^"\n"); 
17231
f42bc4f7afdf tidying up the Isabelle/ATP interface
paulson
parents: 17216
diff changeset
   129
       TextIO.flushOut toWatcherStr)
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   130
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   131
(*****************************************************************************************)
16357
f1275d2a1dee All subgoals sent to the watcher at once now.
quigley
parents: 16260
diff changeset
   132
(*  Send request to Watcher for multiple provers to be called for filenames in arg       *)
f1275d2a1dee All subgoals sent to the watcher at once now.
quigley
parents: 16260
diff changeset
   133
(*  need to do the dfg stuff in the watcher, not here! send over the clasimp and stuff files too*)
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   134
(*****************************************************************************************)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   135
16475
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   136
fun callResProvers (toWatcherStr,  []) = 
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   137
      (TextIO.output (toWatcherStr, "End of calls\n");  TextIO.flushOut toWatcherStr)
16475
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   138
|   callResProvers (toWatcherStr,
17422
3b237822985d massive tidy-up and simplification
paulson
parents: 17317
diff changeset
   139
                    (prover,goalstring, proverCmd,settings, 
3b237822985d massive tidy-up and simplification
paulson
parents: 17317
diff changeset
   140
                     probfile)  ::  args) =
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   141
      let val _ = trace (space_implode "\n" 
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   142
		         (["\ncallResProvers:",prover,goalstring,proverCmd,settings,
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   143
			  probfile]))
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   144
      in TextIO.output (toWatcherStr,
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   145
                        (*Uses a special character to separate items sent to watcher*)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   146
      	                space_implode (str command_sep)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   147
                          [prover, proverCmd, settings, probfile,
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   148
                           String.toString goalstring ^ "\n"]);
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   149
              (*goalstring is a single string literal, with all specials escaped.*)
16475
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   150
         goals_being_watched := (!goals_being_watched) + 1;
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   151
	 TextIO.flushOut toWatcherStr;
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   152
	 callResProvers (toWatcherStr,args)
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   153
      end   
16357
f1275d2a1dee All subgoals sent to the watcher at once now.
quigley
parents: 16260
diff changeset
   154
                                                
17305
6cef3aedd661 axioms now included in tptp files, no /bin/cat and various tidying
paulson
parents: 17235
diff changeset
   155
                                    
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   156
 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   157
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   158
(*Send message to watcher to kill currently running vampires. NOT USED and possibly
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   159
  buggy. Note that killWatcher kills the entire process group anyway.*)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   160
fun callSlayer toWatcherStr = (TextIO.output (toWatcherStr, "Kill children\n"); 
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   161
                            TextIO.flushOut toWatcherStr)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   162
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   163
                    
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   164
(**************************************************************)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   165
(* Get commands from Isabelle                                 *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   166
(**************************************************************)
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   167
fun getCmds (toParentStr, fromParentStr, cmdList) = 
16475
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   168
  let val thisLine = TextIO.inputLine fromParentStr 
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   169
  in
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   170
     trace("\nGot command from parent: " ^ thisLine);
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   171
     if thisLine = "End of calls\n" orelse thisLine = "" then cmdList
17422
3b237822985d massive tidy-up and simplification
paulson
parents: 17317
diff changeset
   172
     else if thisLine = "Kill children\n"
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   173
     then (TextIO.output (toParentStr,thisLine); 
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   174
	   TextIO.flushOut toParentStr;
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   175
	   [("","","Kill children",[],"")])
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   176
     else
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   177
       let val [prover,proverCmd,settingstr,probfile,goalstring] = 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   178
                   String.tokens (fn c => c = command_sep) thisLine
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   179
           val settings = String.tokens (fn c => c = setting_sep) settingstr
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   180
       in
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   181
           trace ("\nprover: " ^ prover ^ "  prover path: " ^ proverCmd^
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   182
                  "  problem file: " ^ probfile ^ 
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   183
		  "\ngoalstring:  "^goalstring);
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   184
           getCmds (toParentStr, fromParentStr, 
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   185
                    (prover, goalstring, proverCmd, settings, probfile)::cmdList) 
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   186
       end
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   187
       handle Bind => 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   188
          (trace "getCmds: command parsing failed!";
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   189
           getCmds (toParentStr, fromParentStr, cmdList))
16475
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   190
  end
8f3ba52a7937 using TPTP2X_HOME; indentation, etc
paulson
parents: 16357
diff changeset
   191
	    
16357
f1275d2a1dee All subgoals sent to the watcher at once now.
quigley
parents: 16260
diff changeset
   192
                                                                  
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   193
(**************************************************************)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   194
(*  Get Io-descriptor for polling of an input stream          *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   195
(**************************************************************)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   196
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   197
fun getInIoDesc someInstr = 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   198
    let val (rd, buf) = TextIO.StreamIO.getReader(TextIO.getInstream someInstr)
15702
2677db44c795 new signalling primmitives for sml/nj compatibility
paulson
parents: 15684
diff changeset
   199
        val _ = TextIO.output (TextIO.stdOut, buf)
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   200
        val ioDesc = 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   201
	    case rd
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   202
	      of TextPrimIO.RD{ioDesc = SOME iod, ...} =>SOME iod
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   203
	       | _ => NONE
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   204
     in (* since getting the reader will have terminated the stream, we need
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   205
	 * to build a new stream. *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   206
	TextIO.setInstream(someInstr, TextIO.StreamIO.mkInstream(rd, buf));
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   207
	ioDesc
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   208
    end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   209
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   210
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   211
(*************************************)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   212
(*  Set up a Watcher Process         *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   213
(*************************************)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   214
17716
89932e53f31d moved concat_with_and to watcher.ML
paulson
parents: 17690
diff changeset
   215
(* for tracing: encloses each string element in brackets. *)
89932e53f31d moved concat_with_and to watcher.ML
paulson
parents: 17690
diff changeset
   216
val concat_with_and = space_implode " & " o map (enclose "(" ")");
89932e53f31d moved concat_with_and to watcher.ML
paulson
parents: 17690
diff changeset
   217
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   218
fun prems_string_of th =
17716
89932e53f31d moved concat_with_and to watcher.ML
paulson
parents: 17690
diff changeset
   219
  concat_with_and (map (Sign.string_of_term (sign_of_thm th)) (prems_of th))
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   220
17525
ae5bb6001afb tidying, and support for axclass/classrel clauses
paulson
parents: 17502
diff changeset
   221
fun killChild proc = (Unix.kill(proc, Posix.Signal.kill); Unix.reap proc);
ae5bb6001afb tidying, and support for axclass/classrel clauses
paulson
parents: 17502
diff changeset
   222
ae5bb6001afb tidying, and support for axclass/classrel clauses
paulson
parents: 17502
diff changeset
   223
fun killChildren procs = List.app (ignore o killChild) procs;
17502
8836793df947 further tidying; killing of old Watcher loops
paulson
parents: 17488
diff changeset
   224
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   225
 (*************************************************************)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   226
 (* take an instream and poll its underlying reader for input *)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   227
 (*************************************************************)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   228
 
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   229
 fun pollParentInput (fromParentIOD, fromParentStr, toParentStr) = 
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   230
   case OS.IO.pollDesc fromParentIOD of
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   231
      SOME pd =>
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   232
	 (case OS.IO.poll ([OS.IO.pollIn pd], SOME (Time.fromSeconds 2)) of
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   233
	      [] => NONE
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   234
	    | pd''::_ => if OS.IO.isIn pd''
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   235
	 	         then SOME (getCmds (toParentStr, fromParentStr, []))
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   236
	 	         else NONE)
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   237
   | NONE => NONE;
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   238
17583
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
   239
(*get the number of the subgoal from the filename: the last digit string*)
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
   240
fun number_from_filename s =
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
   241
  case String.tokens (not o Char.isDigit) s of
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   242
      [] => (trace "\nWatcher could not read subgoal nunber!!"; raise ERROR)
17583
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
   243
    | numbers => valOf (Int.fromString (List.last numbers));
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
   244
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   245
fun setupWatcher (thm,clause_arr) = 
16061
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   246
  let
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   247
    val p1 = Posix.IO.pipe ()   (** pipes for communication between parent and watcher **)
16061
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   248
    val p2 = Posix.IO.pipe ()
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   249
    fun closep () = 
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   250
	 (Posix.IO.close (#outfd p1); Posix.IO.close (#infd p1);
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   251
	  Posix.IO.close (#outfd p2); Posix.IO.close (#infd p2))
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   252
    (****** fork a watcher process and get it set up and going ******)
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   253
    fun startWatcher procList =
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   254
     (case  Posix.Process.fork() 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   255
      of SOME pid => pid (* parent - i.e. main Isabelle process *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   256
       | NONE => let                (* child - i.e. watcher  *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   257
	  val oldchildin = #infd p1  
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   258
	  val fromParent = Posix.FileSys.wordToFD 0w0
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   259
	  val oldchildout = #outfd p2
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   260
	  val toParent = Posix.FileSys.wordToFD 0w1
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   261
	  val fromParentIOD = Posix.FileSys.fdToIOD fromParent
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   262
	  val fromParentStr = openInFD ("_exec_in_parent", fromParent)
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   263
	  val toParentStr = openOutFD ("_exec_out_parent", toParent)
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   264
	  val pid = Posix.ProcEnv.getpid()
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   265
	  val () = Posix.ProcEnv.setpgid {pid = SOME pid, pgid = SOME pid}
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   266
                   (*set process group id: allows killing all children*)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   267
	  val () = debug ("subgoals forked to startWatcher: "^ prems_string_of thm);
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   268
	 
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   269
	  fun pollChildInput fromStr = 
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   270
	     case getInIoDesc fromStr of
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   271
	       SOME iod => 
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   272
		 (case OS.IO.pollDesc iod of
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   273
		    SOME pd =>
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   274
			let val pd' = OS.IO.pollIn pd in
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   275
			  case OS.IO.poll ([pd'], SOME (Time.fromSeconds 2)) of
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   276
			      [] => false
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   277
			    | pd''::_ => OS.IO.isIn pd''
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   278
			end
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   279
		   | NONE => false)
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   280
	     | NONE => false
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   281
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   282
	  (* Check all ATP processes currently running for output                 *)
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   283
	  fun checkChildren ([], toParentStr) = []  (* no children to check *)
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   284
	  |   checkChildren (childProc::otherChildren, toParentStr) = 
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   285
	       let val _ = trace ("\nIn check child, length of queue:"^
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   286
			          Int.toString (length (childProc::otherChildren)))
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   287
		   val (childInput,childOutput) = cmdstreamsOf childProc
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   288
		   val child_handle = cmdchildHandle childProc
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   289
		   val childCmd = #1(#2(cmdchildInfo childProc)) (*name of problem file*)
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   290
		   val _ = trace ("\nchildCmd = " ^ childCmd)
17583
c272b91b619f removal of "sleep" to stop looping in Poly/ML, and replacement of funny codes by tracing statements
paulson
parents: 17568
diff changeset
   291
		   val sg_num = number_from_filename childCmd
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   292
		   val childIncoming = pollChildInput childInput
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   293
		   val parentID = Posix.ProcEnv.getppid()
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   294
		   val prover = cmdProver childProc
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   295
		   val prems_string = prems_string_of thm
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   296
		   val goalstring = cmdGoal childProc							
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   297
	       in 
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   298
		 trace("\nsubgoals forked to checkChildren: " ^ goalstring);
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   299
		 if childIncoming
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   300
		 then (* check here for prover label on child*)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   301
		   let val _ = trace ("\nInput available from child: " ^ childCmd ^ 
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   302
				      "\ngoalstring is " ^ goalstring)
17306
5cde710a8a23 Progress on eprover linkup, also massive tidying
paulson
parents: 17305
diff changeset
   303
		       val childDone = (case prover of
17488
67376a311a2b further simplification of the Isabelle-ATP linkup
paulson
parents: 17484
diff changeset
   304
			   "vampire" => AtpCommunication.checkVampProofFound(childInput, toParentStr, parentID,goalstring, childCmd, clause_arr)  
67376a311a2b further simplification of the Isabelle-ATP linkup
paulson
parents: 17484
diff changeset
   305
			    | "E" => AtpCommunication.checkEProofFound(childInput, toParentStr, parentID,goalstring, childCmd, clause_arr)             
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   306
			  |"spass" => AtpCommunication.checkSpassProofFound(childInput, toParentStr, parentID,goalstring, childCmd, thm, sg_num,clause_arr)  )
17306
5cde710a8a23 Progress on eprover linkup, also massive tidying
paulson
parents: 17305
diff changeset
   307
		    in
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   308
		     if childDone
17306
5cde710a8a23 Progress on eprover linkup, also massive tidying
paulson
parents: 17305
diff changeset
   309
		     then (* child has found a proof and transferred it *)
5cde710a8a23 Progress on eprover linkup, also massive tidying
paulson
parents: 17305
diff changeset
   310
			(* Remove this child and go on to check others*)
5cde710a8a23 Progress on eprover linkup, also massive tidying
paulson
parents: 17305
diff changeset
   311
			(Unix.reap child_handle;
17716
89932e53f31d moved concat_with_and to watcher.ML
paulson
parents: 17690
diff changeset
   312
			 OS.FileSys.remove childCmd;
17306
5cde710a8a23 Progress on eprover linkup, also massive tidying
paulson
parents: 17305
diff changeset
   313
			 checkChildren(otherChildren, toParentStr))
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   314
		     else (* Keep this child and go on to check others  *)
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   315
		       childProc :: checkChildren (otherChildren, toParentStr)
17306
5cde710a8a23 Progress on eprover linkup, also massive tidying
paulson
parents: 17305
diff changeset
   316
		  end
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   317
		else (trace "\nNo child output";
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   318
		      childProc::(checkChildren (otherChildren, toParentStr)))
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   319
	       end
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   320
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   321
	
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   322
	(* call resolution processes                                        *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   323
	(* settings should be a list of strings  ["-t 300", "-m 100000"]    *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   324
	(* takes list of (string, string, string list, string)list proclist *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   325
	fun execCmds [] procList = procList
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   326
	|   execCmds ((prover, goalstring,proverCmd,settings,file)::cmds) procList  =
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   327
	      let val _ = trace (space_implode "\n" 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   328
				 (["\nAbout to execute command for goal:",
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   329
				   goalstring, proverCmd] @ settings @
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   330
				  [file, Date.toString(Date.fromTimeLocal(Time.now()))]))
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   331
	          val childhandle:(TextIO.instream,TextIO.outstream) Unix.proc  = 
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   332
		       Unix.execute(proverCmd, settings@[file])
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   333
		  val (instr, outstr) = Unix.streamsOf childhandle
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   334
		  val newProcList = CMDPROC{prover = prover,
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   335
					    cmd = file,
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   336
					    goalstring = goalstring,
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   337
					    proc_handle = childhandle,
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   338
					    instr = instr,
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   339
					    outstr = outstr} :: procList
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   340
     
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   341
		  val _ = trace ("\nFinished at " ^
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   342
			         Date.toString(Date.fromTimeLocal(Time.now())))
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   343
	      in execCmds cmds newProcList end
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   344
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   345
         (******** Watcher Loop ********)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   346
         val limit = ref 500;  (*don't let it run forever*)
16061
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   347
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   348
	 fun keepWatching (procList) = 
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   349
	   let fun loop procList =  
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   350
	      let val _ = trace ("\nCalling pollParentInput: " ^ Int.toString (!limit));
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   351
		  val cmdsFromIsa = pollParentInput 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   352
				     (fromParentIOD, fromParentStr, toParentStr)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   353
	      in 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   354
		 OS.Process.sleep (Time.fromMilliseconds 100);
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   355
		 limit := !limit - 1;
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   356
		 if !limit = 0 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   357
		 then 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   358
		  (trace "\nTimeout: Killing proof processes";
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   359
		   TextIO.output(toParentStr, "Timeout: Killing proof processes!\n");
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   360
		   TextIO.flushOut toParentStr;
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   361
		   killChildren (map cmdchildHandle procList);
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   362
		   exit 0)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   363
		 else case cmdsFromIsa of
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   364
		     SOME [(_,_,"Kill children",_,_)] => 
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   365
		       let val child_handles = map cmdchildHandle procList 
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   366
		       in  killChildren child_handles; loop []  end
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   367
		   | SOME cmds => (*  deal with commands from Isabelle process *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   368
		       if length procList < 40
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   369
		       then                        (* Execute locally  *)
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   370
			 let 
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   371
			   val newProcList = execCmds cmds procList
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   372
			   val newProcList' = checkChildren (newProcList, toParentStr) 
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   373
			 in
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   374
			   trace "\nJust execed a child"; loop newProcList'
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   375
			 end
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   376
		       else  (* Execute remotely [FIXME: NOT REALLY]  *)
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   377
			 let 
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   378
			   val newProcList = execCmds cmds procList
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   379
			   val newProcList' = checkChildren (newProcList, toParentStr) 
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   380
			 in loop newProcList' end
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   381
		   | NONE => (* No new input from Isabelle *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   382
		       let val newProcList = checkChildren (procList, toParentStr)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   383
		       in
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   384
			 trace "\nNo new input, still watching"; loop newProcList
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   385
		       end
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   386
	       end
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   387
	   in  
17306
5cde710a8a23 Progress on eprover linkup, also massive tidying
paulson
parents: 17305
diff changeset
   388
	       loop procList
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   389
	   end
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   390
	   
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   391
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   392
	 in
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   393
	  (*** Sort out pipes ********)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   394
	   Posix.IO.close (#outfd p1);
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   395
	   Posix.IO.close (#infd p2);
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   396
	   Posix.IO.dup2{old = oldchildin, new = fromParent};
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   397
	   Posix.IO.close oldchildin;
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   398
	   Posix.IO.dup2{old = oldchildout, new = toParent};
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   399
	   Posix.IO.close oldchildout;
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   400
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   401
	   (* start the watcher loop  *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   402
	   keepWatching (procList);
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   403
	   (* fake return value - actually want the watcher to loop until killed *)
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   404
	   Posix.Process.wordToPid 0w0
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   405
	 end);
17234
12a9393c5d77 further tidying up of Isabelle-ATP link
paulson
parents: 17231
diff changeset
   406
     (* end case *)
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   407
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   408
16061
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   409
    val _ = TextIO.flushOut TextIO.stdOut
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   410
16061
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   411
    (*******************************)
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   412
    (***  set watcher going ********)
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   413
    (*******************************)
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   414
16061
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   415
    val procList = []
17317
3f12de2e2e6e Isabelle-ATP link: sortable axiom names; no spaces in switches; general tidying
paulson
parents: 17315
diff changeset
   416
    val pid = startWatcher procList
16061
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   417
    (**************************************************)
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   418
    (* communication streams to watcher               *)
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   419
    (**************************************************)
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   420
16061
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   421
    val instr = openInFD ("_exec_in", #infd p2)
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   422
    val outstr = openOutFD ("_exec_out", #outfd p1)
8a139c1557bf A new structure and reduced indentation
paulson
parents: 16039
diff changeset
   423
    
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   424
  in
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   425
   (*******************************)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   426
   (* close the child-side fds    *)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   427
   (*******************************)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   428
    Posix.IO.close (#outfd p2);
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   429
    Posix.IO.close (#infd p1);
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   430
    (* set the fds close on exec *)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   431
    Posix.IO.setfd (#infd p2, Posix.IO.FD.flags [Posix.IO.FD.cloexec]);
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   432
    Posix.IO.setfd (#outfd p1, Posix.IO.FD.flags [Posix.IO.FD.cloexec]);
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   433
     
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   434
   (*******************************)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   435
   (* return value                *)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   436
   (*******************************)
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   437
    PROC{pid = pid, instr = instr, outstr = outstr}
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   438
  end;
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   439
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   440
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   441
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   442
(**********************************************************)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   443
(* Start a watcher and set up signal handlers             *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   444
(**********************************************************)
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   445
17764
fde495b9e24b improved process handling. tidied
paulson
parents: 17746
diff changeset
   446
fun killWatcher pid = Posix.Process.kill(Posix.Process.K_GROUP pid, Posix.Signal.kill);
17488
67376a311a2b further simplification of the Isabelle-ATP linkup
paulson
parents: 17484
diff changeset
   447
16039
dfe264950511 Moved some of the clausify functions from ATP/res_clasimpset.ML to res_axioms.ML.
quigley
parents: 15919
diff changeset
   448
fun reapWatcher(pid, instr, outstr) =
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   449
  (TextIO.closeIn instr; TextIO.closeOut outstr;
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   450
   Posix.Process.waitpid(Posix.Process.W_CHILD pid, []); ())
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   451
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   452
fun createWatcher (thm, clause_arr) =
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   453
 let val (childpid,(childin,childout)) = childInfo (setupWatcher(thm,clause_arr))
17435
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   454
     fun decr_watched() =
17502
8836793df947 further tidying; killing of old Watcher loops
paulson
parents: 17488
diff changeset
   455
	  (goals_being_watched := !goals_being_watched - 1;
17435
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   456
	   if !goals_being_watched = 0
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   457
	   then 
17716
89932e53f31d moved concat_with_and to watcher.ML
paulson
parents: 17690
diff changeset
   458
	     (debug ("\nReaping a watcher, childpid = "^
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   459
		     LargeWord.toString (Posix.Process.pidToWord childpid));
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   460
	      killWatcher childpid; reapWatcher (childpid,childin, childout))
17435
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   461
	    else ())
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   462
     val _ = debug ("subgoals forked to createWatcher: "^ prems_string_of thm);
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   463
     fun proofHandler n = 
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   464
       let val outcome = TextIO.inputLine childin
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   465
	   val goalstring = valOf (String.fromString (TextIO.inputLine childin))
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   466
	   val _ = debug ("In signal handler. outcome = \"" ^ outcome ^ 
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   467
		        "\"\ngoalstring = " ^ goalstring ^
17568
e93f7510e1e1 trying to limit the looping
paulson
parents: 17525
diff changeset
   468
		        "\ngoals_being_watched: "^  Int.toString (!goals_being_watched))
17502
8836793df947 further tidying; killing of old Watcher loops
paulson
parents: 17488
diff changeset
   469
       in 
8836793df947 further tidying; killing of old Watcher loops
paulson
parents: 17488
diff changeset
   470
	 if String.isPrefix "[" outcome (*indicates a proof reconstruction*)
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   471
	 then (priority (Recon_Transfer.apply_res_thm outcome goalstring);
17435
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   472
	       decr_watched())
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   473
	 else if String.isPrefix "Invalid" outcome
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   474
	 then (priority ("Subgoal is not provable:\n" ^ goalstring);
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   475
	       decr_watched())
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   476
	 else if String.isPrefix "Failure" outcome
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   477
	 then (priority ("Proof attempt failed:\n" ^ goalstring);
17435
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   478
	       decr_watched()) 
17216
df66d8feec63 improved formatting
paulson
parents: 17150
diff changeset
   479
	(* print out a list of rules used from clasimpset*)
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   480
	 else if String.isPrefix "Success" outcome
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   481
	 then (priority (outcome ^ goalstring);
17435
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   482
	       decr_watched())
17216
df66d8feec63 improved formatting
paulson
parents: 17150
diff changeset
   483
	  (* if proof translation failed *)
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   484
	 else if String.isPrefix "Translation failed" outcome
17746
af59c748371d fixed the ascii-armouring of goalstring
paulson
parents: 17716
diff changeset
   485
	 then (priority (outcome ^ goalstring);
17435
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   486
	       decr_watched())
17690
8ba7c3cd24a8 time limit option; fixed bug concerning first line of ATP output
paulson
parents: 17583
diff changeset
   487
	 else (priority "System error in proof handler";
17435
0eed5a1c00c1 PARTIAL conversion to Vampire8
paulson
parents: 17422
diff changeset
   488
	       decr_watched())
17484
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   489
       end
f6a225f97f0a simplification of the Isabelle-ATP code; hooks for batch generation of problems
paulson
parents: 17435
diff changeset
   490
 in IsaSignal.signal (IsaSignal.usr2, IsaSignal.SIG_HANDLE proofHandler);
17216
df66d8feec63 improved formatting
paulson
parents: 17150
diff changeset
   491
    (childin, childout, childpid)
df66d8feec63 improved formatting
paulson
parents: 17150
diff changeset
   492
  end
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   493
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   494
end (* structure Watcher *)