src/Pure/General/output.ML
author wenzelm
Wed, 04 Apr 2007 00:11:17 +0200
changeset 22585 16af5cb012e7
parent 22469 365bce31e051
child 22699 938c1011ac94
permissions -rw-r--r--
cleaned-up Output functions; removed unused info channel; moved print_mode to ROOT.ML (generic non-sense);
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
     1
(*  Title:      Pure/General/output.ML
77a509d83163 output channels;
wenzelm
parents:
diff changeset
     2
    ID:         $Id$
77a509d83163 output channels;
wenzelm
parents:
diff changeset
     3
    Author:     Makarius, Hagia Maria Sion Abbey (Jerusalem)
77a509d83163 output channels;
wenzelm
parents:
diff changeset
     4
22585
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
     5
Output channels and timing messages.
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
     6
*)
77a509d83163 output channels;
wenzelm
parents:
diff changeset
     7
77a509d83163 output channels;
wenzelm
parents:
diff changeset
     8
signature BASIC_OUTPUT =
77a509d83163 output channels;
wenzelm
parents:
diff changeset
     9
sig
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    10
  val writeln: string -> unit
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    11
  val priority: string -> unit
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    12
  val tracing: string -> unit
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    13
  val warning: string -> unit
14869
544be18288e6 moved exception handling back to library.ML;
wenzelm
parents: 14862
diff changeset
    14
  val timing: bool ref
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    15
  val cond_timeit: bool -> (unit -> 'a) -> 'a
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    16
  val timeit: (unit -> 'a) -> 'a
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    17
  val timeap: ('a -> 'b) -> 'a -> 'b
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    18
  val timeap_msg: string -> ('a -> 'b) -> 'a -> 'b
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
    19
  val time_accumulator: string -> ('a -> 'b) -> 'a -> 'b
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    20
end;
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    21
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    22
signature OUTPUT =
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    23
sig
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    24
  include BASIC_OUTPUT
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    25
  val output_width: string -> string * real
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    26
  val output: string -> string
19265
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    27
  val keyword_width: bool -> string -> string * real
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    28
  val keyword: bool -> string -> string
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    29
  val indent: string * int -> string
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    30
  val raw: string -> string
22585
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    31
  val std_output: string -> unit
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    32
  val std_error: string -> unit
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    33
  val immediate_output: string -> unit
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    34
  val writeln_default: string -> unit
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    35
  val writeln_fn: (string -> unit) ref
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    36
  val priority_fn: (string -> unit) ref
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    37
  val tracing_fn: (string -> unit) ref
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    38
  val warning_fn: (string -> unit) ref
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    39
  val error_fn: (string -> unit) ref
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    40
  val panic_fn: (string -> unit) ref
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    41
  val debug_fn: (string -> unit) ref
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    42
  val debugging: bool ref
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    43
  val no_warnings: ('a -> 'b) -> 'a -> 'b
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    44
  exception TOPLEVEL_ERROR
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    45
  val do_toplevel_errors: bool ref
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    46
  val toplevel_errors: ('a -> 'b) -> 'a -> 'b
18716
bb4af2bdd17b added ML_errors;
wenzelm
parents: 18682
diff changeset
    47
  val ML_errors: ('a -> 'b) -> 'a -> 'b
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    48
  val panic: string -> unit
22130
0906fd95e0b5 Output.debug: non-strict;
wenzelm
parents: 21336
diff changeset
    49
  val debug: (unit -> string) -> unit
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    50
  val error_msg: string -> unit
20926
b2f67b947200 moved Context.ml_output to Output.ml_output;
wenzelm
parents: 20664
diff changeset
    51
  val ml_output: (string -> unit) * (string -> unit)
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    52
  val add_mode: string ->
19265
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    53
    (string -> string * real) * (bool -> string -> string * real) *
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    54
    (string * int -> string) * (string -> string) -> unit
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
    55
  val accumulated_time: unit -> unit
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    56
end;
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    57
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    58
structure Output: OUTPUT =
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    59
struct
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    60
22585
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
    61
(** output functions **)
14881
e1f501a14159 added has_mode; handle_error: output raw;
wenzelm
parents: 14869
diff changeset
    62
14955
wenzelm
parents: 14911
diff changeset
    63
type mode_fns =
19265
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    64
 {output: string -> string * real,
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    65
  keyword: bool -> string -> string * real,
14955
wenzelm
parents: 14911
diff changeset
    66
  indent: string * int -> string,
wenzelm
parents: 14911
diff changeset
    67
  raw: string -> string};
wenzelm
parents: 14911
diff changeset
    68
wenzelm
parents: 14911
diff changeset
    69
val modes = ref (Symtab.empty: mode_fns Symtab.table);
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    70
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    71
fun lookup_mode name = Symtab.lookup (! modes) name;
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    72
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
    73
exception MISSING_DEFAULT_OUTPUT;
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    74
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    75
fun get_mode () =
15531
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 15190
diff changeset
    76
  (case Library.get_first lookup_mode (! print_mode) of SOME p => p
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 15190
diff changeset
    77
  | NONE =>
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 15190
diff changeset
    78
      (case lookup_mode "" of SOME p => p
08c8dad8e399 Deleted Library.option type.
skalberg
parents: 15190
diff changeset
    79
      | NONE => raise MISSING_DEFAULT_OUTPUT));  (*sys_error would require output again!*)
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    80
19265
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    81
fun output_width x = #output (get_mode ()) x;
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    82
val output = #1 o output_width;
19265
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    83
fun keyword_width b x = #keyword (get_mode ()) b x;
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
    84
val keyword = #1 oo keyword_width;
14955
wenzelm
parents: 14911
diff changeset
    85
fun indent x = #indent (get_mode ()) x;
wenzelm
parents: 14911
diff changeset
    86
fun raw x = #raw (get_mode ()) x;
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    87
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    88
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    89
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    90
(** output channels **)
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    91
14984
edbc81e60809 immediate_output;
wenzelm
parents: 14978
diff changeset
    92
(* output primitives -- normally NOT used directly!*)
edbc81e60809 immediate_output;
wenzelm
parents: 14978
diff changeset
    93
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    94
fun std_output s = (TextIO.output (TextIO.stdOut, s); TextIO.flushOut TextIO.stdOut);
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    95
fun std_error s = (TextIO.output (TextIO.stdErr, s); TextIO.flushOut TextIO.stdErr);
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    96
14984
edbc81e60809 immediate_output;
wenzelm
parents: 14978
diff changeset
    97
val immediate_output = std_output o output;
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    98
val writeln_default = std_output o suffix "\n";
77a509d83163 output channels;
wenzelm
parents:
diff changeset
    99
14984
edbc81e60809 immediate_output;
wenzelm
parents: 14978
diff changeset
   100
edbc81e60809 immediate_output;
wenzelm
parents: 14978
diff changeset
   101
(* Isabelle output channels *)
edbc81e60809 immediate_output;
wenzelm
parents: 14978
diff changeset
   102
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   103
val writeln_fn = ref writeln_default;
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   104
val priority_fn = ref (fn s => ! writeln_fn s);
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   105
val tracing_fn = ref (fn s => ! writeln_fn s);
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   106
val warning_fn = ref (std_output o suffix "\n" o prefix_lines "### ");
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   107
val error_fn = ref (std_output o suffix "\n" o prefix_lines "*** ");
14862
a43f9e2c6332 Add panic function which exits Isabelle immediately.
aspinall
parents: 14815
diff changeset
   108
val panic_fn = ref (std_output o suffix "\n" o prefix_lines "!!! ");
15190
b6788dbd2ef9 Add info and debug output channels.
aspinall
parents: 15010
diff changeset
   109
val debug_fn = ref (std_output o suffix "\n" o prefix_lines "::: ");
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   110
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   111
fun writeln s = ! writeln_fn (output s);
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   112
fun priority s = ! priority_fn (output s);
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   113
fun tracing s = ! tracing_fn (output s);
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   114
fun warning s = ! warning_fn (output s);
15190
b6788dbd2ef9 Add info and debug output channels.
aspinall
parents: 15010
diff changeset
   115
16191
9d503d6fcbb1 added no_warnings;
wenzelm
parents: 15531
diff changeset
   116
fun no_warnings f = setmp warning_fn (K ()) f;
9d503d6fcbb1 added no_warnings;
wenzelm
parents: 15531
diff changeset
   117
22130
0906fd95e0b5 Output.debug: non-strict;
wenzelm
parents: 21336
diff changeset
   118
val debugging = ref false;
0906fd95e0b5 Output.debug: non-strict;
wenzelm
parents: 21336
diff changeset
   119
fun debug s = if ! debugging then ! debug_fn (output (s ())) else ()
15190
b6788dbd2ef9 Add info and debug output channels.
aspinall
parents: 15010
diff changeset
   120
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   121
fun error_msg s = ! error_fn (output s);
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   122
14862
a43f9e2c6332 Add panic function which exits Isabelle immediately.
aspinall
parents: 14815
diff changeset
   123
fun panic_msg s = ! panic_fn (output s);
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   124
fun panic s = (panic_msg ("## SYSTEM EXIT ##\n" ^ s); exit 1);
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   125
20926
b2f67b947200 moved Context.ml_output to Output.ml_output;
wenzelm
parents: 20664
diff changeset
   126
val ml_output = (writeln, error_msg);
b2f67b947200 moved Context.ml_output to Output.ml_output;
wenzelm
parents: 20664
diff changeset
   127
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   128
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   129
(* toplevel errors *)
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   130
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   131
exception TOPLEVEL_ERROR;
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   132
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   133
val do_toplevel_errors = ref true;
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   134
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   135
fun toplevel_errors f x =
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   136
  if ! do_toplevel_errors then
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   137
    f x handle ERROR msg => (error_msg msg; raise TOPLEVEL_ERROR)
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   138
  else f x;
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   139
18716
bb4af2bdd17b added ML_errors;
wenzelm
parents: 18682
diff changeset
   140
fun ML_errors f = setmp do_toplevel_errors true (toplevel_errors f);
bb4af2bdd17b added ML_errors;
wenzelm
parents: 18682
diff changeset
   141
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   142
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   143
(* add_mode *)
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   144
19265
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
   145
fun add_mode name (output, keyword, indent, raw) =
18682
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   146
 (if is_none (lookup_mode name) then ()
216692feebab removed special ERROR handling stuff (transform_error etc.);
wenzelm
parents: 17539
diff changeset
   147
  else warning ("Redeclaration of symbol print mode: " ^ quote name);
19265
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
   148
  change modes (Symtab.update (name,
cae36e16f3c0 Output.add_mode: keyword component;
wenzelm
parents: 18716
diff changeset
   149
    {output = output, keyword = keyword, indent = indent, raw = raw})));
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   150
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   151
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   152
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   153
(** timing **)
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   154
14869
544be18288e6 moved exception handling back to library.ML;
wenzelm
parents: 14862
diff changeset
   155
(*global timing mode*)
544be18288e6 moved exception handling back to library.ML;
wenzelm
parents: 14862
diff changeset
   156
val timing = ref false;
544be18288e6 moved exception handling back to library.ML;
wenzelm
parents: 14862
diff changeset
   157
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   158
(*a conditional timing function: applies f to () and, if the flag is true,
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   159
  prints its runtime on warning channel*)
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   160
fun cond_timeit flag f =
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   161
  if flag then
21295
63552bc99cfb tuned names of start_timing,/end_timing/check_timer;
wenzelm
parents: 20926
diff changeset
   162
    let val start = start_timing ()
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   163
        val result = f ()
22585
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
   164
    in warning (end_timing start); result end
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   165
  else f ();
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   166
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   167
(*unconditional timing function*)
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   168
fun timeit x = cond_timeit true x;
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   169
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   170
(*timed application function*)
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   171
fun timeap f x = timeit (fn () => f x);
22585
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
   172
fun timeap_msg s f x = (warning s; timeap f x);
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   173
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   174
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   175
(* accumulated timing *)
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   176
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   177
local
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   178
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   179
datatype time_info = TI of
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   180
  {name: string,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   181
   timer: Timer.cpu_timer,
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   182
   sys: Time.time,
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   183
   usr: Time.time,
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   184
   gc: Time.time,
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   185
   count: int};
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   186
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   187
fun time_init name = ref (TI
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   188
 {name = name,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   189
  timer = Timer.startCPUTimer (),
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   190
  sys = Time.zeroTime,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   191
  usr = Time.zeroTime,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   192
  gc = Time.zeroTime,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   193
  count = 0});
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   194
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   195
fun time_reset (r as ref (TI {name, ...})) = r := ! (time_init name);
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   196
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   197
fun time_check (ref (TI r)) = r;
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   198
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   199
fun time_add ti f x =
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   200
  let
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   201
    fun add_diff time time1 time2 =
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   202
      Time.+ (time, Time.- (time2, time1) handle Time.Time => Time.zeroTime);
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   203
    val {name, timer, sys, usr, gc, count} = time_check ti;
21295
63552bc99cfb tuned names of start_timing,/end_timing/check_timer;
wenzelm
parents: 20926
diff changeset
   204
    val (sys1, usr1, gc1) = check_timer timer;
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   205
    val result = capture f x;
21295
63552bc99cfb tuned names of start_timing,/end_timing/check_timer;
wenzelm
parents: 20926
diff changeset
   206
    val (sys2, usr2, gc2) = check_timer timer;
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   207
  in
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   208
    ti := TI
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   209
     {name = name,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   210
      timer = timer,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   211
      sys = add_diff sys sys1 sys2,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   212
      usr = add_diff usr usr1 usr2,
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   213
      gc = add_diff gc gc1 gc2,
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   214
      count = count + 1};
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   215
    release result
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   216
  end;
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   217
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   218
fun time_finish ti =
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   219
  let
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   220
    fun secs prfx time = prfx ^ Time.toString time;
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   221
    val {name, timer, sys, usr, gc, count} = time_check ti;
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   222
  in
22585
16af5cb012e7 cleaned-up Output functions;
wenzelm
parents: 22469
diff changeset
   223
    warning ("Total of " ^ quote name ^ ": " ^
16726
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   224
      secs "User " usr ^ secs "  GC " gc ^ secs "  All " (Time.+ (sys, Time.+ (usr, gc))) ^
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   225
      " secs in " ^ string_of_int count ^ " calls");
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   226
    time_reset ti
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   227
  end;
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   228
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   229
val time_finish_hooks = ref ([]: (unit -> unit) list);
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   230
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   231
in
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   232
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   233
fun time_accumulator name =
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   234
  let val ti = time_init name in
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   235
    change time_finish_hooks (cons (fn () => time_finish ti));
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   236
    time_add ti
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   237
  end;
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   238
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   239
fun accumulated_time () = List.app (fn f => f ()) (! time_finish_hooks);
4399016bf13e added time_accumulator and accumulated_time supercede
wenzelm
parents: 16683
diff changeset
   240
14978
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   241
end;
108ce0289c35 added accumulated timing;
wenzelm
parents: 14955
diff changeset
   242
14815
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   243
end;
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   244
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   245
structure BasicOutput: BASIC_OUTPUT = Output;
77a509d83163 output channels;
wenzelm
parents:
diff changeset
   246
open BasicOutput;