1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
(****************************************************************************)
(* the diy toolsuite *)
(* *)
(* Jade Alglave, University College London, UK. *)
(* Luc Maranget, INRIA Paris-Rocquencourt, France. *)
(* *)
(* Copyright 2012-present Institut National de Recherche en Informatique et *)
(* en Automatique and the authors. All rights reserved. *)
(* *)
(* This software is governed by the CeCILL-B license under French law and *)
(* abiding by the rules of distribution of free software. You can use, *)
(* modify and/ or redistribute the software under the terms of the CeCILL-B *)
(* license as circulated by CEA, CNRS and INRIA at the following URL *)
(* "http://www.cecill.info". We also give a copy in LICENSE.txt. *)
(****************************************************************************)
open Printf
open LogState
type act = Diff | Inter
let verbose = ref 0
let logs = ref []
let select = ref []
let rename = ref []
let names = ref []
let excl = ref []
let hexa = ref false
let int32 = ref true
let emptyok = ref false
let act = ref Diff
let parse_emptyok r =
"-emptyok", Arg.Bool (fun b -> r := b),
(Printf.sprintf "<bool> keep tests with empty outcome in output, default %b" !hexa)
let parse_act r =
let act_of_string = function
| "diff" -> Diff
| "inter" | "intersect" -> Inter
| _ -> raise (Arg.Bad "-act must be one of {diff, inter}")
in
"-act", Arg.String (fun s -> r := act_of_string s),
"<diff|intersect> either diff or intersect the logs, default diff"
let faulttype = ref true
let options =
let open CheckName in
[
("-q", Arg.Unit (fun _ -> verbose := -1),
"<non-default> be silent");
("-v", Arg.Unit (fun _ -> incr verbose),
"<non-default> show various diagnostics, repeat to increase verbosity");
parse_hexa hexa; parse_int32 int32;
parse_emptyok emptyok;
parse_rename rename;
parse_select select; parse_names names;
parse_excl excl;
parse_act act;
parse_faulttype faulttype;
]
let prog =
if Array.length Sys.argv > 0 then (Filename.basename Sys.argv.(0))
else "mdiff"
let usage = String.concat "\n" [
Printf.sprintf "Usage: %s [options] <path/to/log-1> <path/to/log-2>" prog ;
"" ;
"List the differing observed states for each test within 2 log files." ;
"" ;
"Options:" ;
]
let () =
Arg.parse options
(fun s -> logs := !logs @ [s])
usage
let excl = !excl
let select = !select
let names = !names
let rename = !rename
let verbose = !verbose
let hexa = !hexa
let int32 = !int32
let emptyok = !emptyok
let faulttype = !faulttype
let log1,log2 = match !logs with
| [log1;log2;] -> log1,log2
| _ ->
eprintf "%s takes two arguments\n" prog ;
exit 2
module Verbose = struct let verbose = verbose end
module LS = LogState.Make(Verbose)
module LL =
LexLog_tools.Make
(struct
let verbose = verbose
include CheckName.Make
(struct
let verbose = verbose
let rename = rename
let select = select
let names = names
let excl = excl
end)
let hexa = hexa
let int32 = int32
let acceptBig = false
let faulttype = faulttype
end)
let readlog log = match log with
| "stdin" -> LL.read_chan log stdin
| _ -> LL.read_name log
module D =
LogConstr.Dump
(struct
let hexa = hexa
let tr = Misc.identity
end)
let zyva log1 log2 =
let test1 = readlog log1 in
let test2 = readlog log2 in
(* Dumping of log files *)
let is_reliable k = match k with
| Allow|Require|Forbid -> true
| _ -> false in
let dump_hash chan = function
| None -> ()
| Some h -> fprintf chan "Hash=%s\n" h in
let dump_condition chan v c = match c,v with
| Some c,(Ok|No) ->
fprintf chan
"Condition %a is%s validated\n"
D.dump c
(if v = Ok then "" else " not")
| _,_ -> () in
let dump_prop chan c = match c with
| Some c ->
fprintf chan
"Condition (%a)\n"
D.dump_prop (ConstrGen.prop_of c)
| None -> () in
let dump_test chan t =
fprintf chan "Test %s%s\n" t.tname
(if is_reliable t.kind then " "^LS.pp_kind t.kind else "") ;
LS.dump_states chan t.states ;
if is_reliable t.kind then begin
fprintf chan "%s\n" (LS.pp_validation t.validation) ;
fprintf chan "Witnesses\n" ;
let p,n = t.witnesses in
fprintf chan "Positive: %s Negative: %s\n"
(Int64.to_string p) (Int64.to_string n) ;
dump_condition chan t.validation t.condition
end else begin
fprintf chan "??\n" ;
dump_prop chan t.condition
end ;
dump_hash chan t.hash ;
begin match t.time with
| None -> ()
| Some time ->
fprintf chan "Time %s %0.2f\n" t.tname time
end ;
output_char chan '\n';
() in
let dump_log chan = Array.iter (dump_test chan) in
let diff = match !act with
| Diff -> LS.diff_logs emptyok test1 test2
| Inter -> LS.inter_logs emptyok test1 test2 in
dump_log stdout diff ;
flush stdout ;
()
let () =
try zyva log1 log2
with Misc.Fatal msg|Misc.UserError msg ->
eprintf "Fatal error: %s\n%!" msg
|
