From e43546f04a57f77dda9092c8e74118fb9b62c986 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Mon, 1 Feb 2021 18:37:36 +0100
Subject: [PATCH] [Eva] use Filepath parameters for relevant options
---
.../value/domains/numerors/numerors_domain.ml | 4 +--
src/plugins/value/domains/traces_domain.ml | 2 +-
src/plugins/value/utils/red_statuses.ml | 7 +++---
src/plugins/value/utils/value_perf.ml | 4 +--
src/plugins/value/value_parameters.ml | 25 +++++++++++--------
src/plugins/value/value_parameters.mli | 8 +++---
6 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/plugins/value/domains/numerors/numerors_domain.ml b/src/plugins/value/domains/numerors/numerors_domain.ml
index cafa9a5f1da..bc5a6c74469 100644
--- a/src/plugins/value/domains/numerors/numerors_domain.ml
+++ b/src/plugins/value/domains/numerors/numerors_domain.ml
@@ -87,9 +87,9 @@ module Domain = struct
let post_analysis f =
match f, Value_parameters.NumerorsLogFile.get () with
- | _, s when s = "" -> ()
+ | _, s when Filepath.Normalized.is_unknown s -> ()
| `Value _, s ->
- let log = open_out s in
+ let log = open_out (s:>string) in
let fmt = Format.formatter_of_out_channel log in
List.iter (fun f -> f fmt ()) !Numerors_Value.dprint_callstack ;
close_out log
diff --git a/src/plugins/value/domains/traces_domain.ml b/src/plugins/value/domains/traces_domain.ml
index ce718b03ee1..408114d1568 100644
--- a/src/plugins/value/domains/traces_domain.ml
+++ b/src/plugins/value/domains/traces_domain.ml
@@ -1278,7 +1278,7 @@ module D = struct
Value_parameters.failure "The trace is TOP can't generate code"
| `Value state ->
if not (Value_parameters.TracesDot.is_default ())
- then output_dot (Value_parameters.TracesDot.get ()) state;
+ then output_dot (Value_parameters.TracesDot.get ():>string) state;
if Value_parameters.TracesProject.get ()
then project_of_cfg return_exp state
end
diff --git a/src/plugins/value/utils/red_statuses.ml b/src/plugins/value/utils/red_statuses.ml
index 8657a9dae7c..550a23adc16 100644
--- a/src/plugins/value/utils/red_statuses.ml
+++ b/src/plugins/value/utils/red_statuses.ml
@@ -175,8 +175,9 @@ let print_information fmt { loc; kf; alarm; kind; text; status; contexts } =
dir file lnum kf alarm kind contexts status text
let output file =
- Value_parameters.feedback "Listing red statuses in file %s" file;
- let channel = open_out file in
+ Value_parameters.feedback "Listing red statuses in file %a"
+ Filepath.Normalized.pretty file;
+ let channel = open_out (file:>string) in
let fmt = Format.formatter_of_out_channel channel in
Format.pp_set_margin fmt 1000000;
Format.fprintf fmt "@[<v>";
@@ -190,4 +191,4 @@ let output file =
let report () =
let file = Value_parameters.ReportRedStatuses.get () in
- if file <> "" then output file
+ if not (Filepath.Normalized.is_unknown file) then output file
diff --git a/src/plugins/value/utils/value_perf.ml b/src/plugins/value/utils/value_perf.ml
index e8f0be51619..5d310a3baca 100644
--- a/src/plugins/value/utils/value_perf.ml
+++ b/src/plugins/value/utils/value_perf.ml
@@ -396,10 +396,10 @@ let start_doing_flamegraph callstack =
| [_] ->
(* Analysis of main *)
let file = Value_parameters.ValPerfFlamegraphs.get () in
- if file <> "" then begin
+ if not (Filepath.Normalized.is_unknown file) then begin
try
(* Flamegraphs must be computed. Set up the stack and the output file *)
- let oc = open_out file in
+ let oc = open_out (file:>string) in
oc_flamegraph := Some oc;
stack_flamegraph := [ (Sys.time (), 0.) ]
with e ->
diff --git a/src/plugins/value/value_parameters.ml b/src/plugins/value/value_parameters.ml
index ec4e77fd3ed..494a55fc98f 100644
--- a/src/plugins/value/value_parameters.ml
+++ b/src/plugins/value/value_parameters.ml
@@ -351,11 +351,13 @@ module TracesUnifyLoop =
let () = add_precision_dep TracesUnifyLoop.parameter
let () = Parameter_customize.set_group domains
-module TracesDot = Empty_string
+module TracesDot = Filepath
(struct
let option_name = "-eva-traces-dot"
- let help = "Output to the given filename the Cfg in dot format."
let arg_name = "FILENAME"
+ let file_kind = "DOT"
+ let existence = Fc_Filepath.Indifferent
+ let help = "Output to the given filename the Cfg in dot format."
end)
let () = Parameter_customize.set_group domains
@@ -1070,14 +1072,15 @@ module ValShowPerf =
let () = Parameter_customize.set_group messages
module ValPerfFlamegraphs =
- String
+ Filepath
(struct
let option_name = "-eva-flamegraph"
+ let arg_name = "file"
+ let file_kind = "Text for flamegraph"
+ let existence = Fc_Filepath.Indifferent
let help = "Dump a summary of the time spent analyzing function calls \
in a format suitable for the Flamegraph tool \
(http://www.brendangregg.com/flamegraphs.html)"
- let arg_name = "file"
- let default = ""
end)
@@ -1103,11 +1106,12 @@ module PrintCallstacks =
let () = Parameter_customize.set_group messages
module ReportRedStatuses =
- String
+ Filepath
(struct
let option_name = "-eva-report-red-statuses"
let arg_name = "filename"
- let default = ""
+ let file_kind = "CSV"
+ let existence = Fc_Filepath.Indifferent
let help = "Output the list of \"red properties\" in a csv file of the \
given name. These are the properties which were invalid for \
some states. Their consolidated status may not be invalid, \
@@ -1116,13 +1120,14 @@ module ReportRedStatuses =
let () = Parameter_customize.set_group messages
module NumerorsLogFile =
- String
+ Filepath
(struct
let option_name = "-eva-numerors-log-file"
+ let arg_name = "file"
+ let file_kind = "Text"
+ let existence = Fc_Filepath.Indifferent
let help = "The Numerors domain will save each call to the DPRINT \
function in the given file"
- let arg_name = "file"
- let default = ""
end)
(* ------------------------------------------------------------------------- *)
diff --git a/src/plugins/value/value_parameters.mli b/src/plugins/value/value_parameters.mli
index 3f50d6efaa7..9a6a7172cc2 100644
--- a/src/plugins/value/value_parameters.mli
+++ b/src/plugins/value/value_parameters.mli
@@ -42,7 +42,7 @@ module OctagonCall: Parameter_sig.Bool
module TracesUnrollLoop: Parameter_sig.Bool
module TracesUnifyLoop: Parameter_sig.Bool
-module TracesDot: Parameter_sig.String
+module TracesDot: Parameter_sig.Filepath
module TracesProject: Parameter_sig.Bool
module EqualityStorage: Parameter_sig.Bool
@@ -122,11 +122,11 @@ module SplitGlobalStrategy: State_builder.Ref with type data = Split_strategy.t
module ValShowProgress: Parameter_sig.Bool
module ValShowPerf: Parameter_sig.Bool
-module ValPerfFlamegraphs: Parameter_sig.String
+module ValPerfFlamegraphs: Parameter_sig.Filepath
module ShowSlevel: Parameter_sig.Int
module PrintCallstacks: Parameter_sig.Bool
-module ReportRedStatuses: Parameter_sig.String
-module NumerorsLogFile: Parameter_sig.String
+module ReportRedStatuses: Parameter_sig.Filepath
+module NumerorsLogFile: Parameter_sig.Filepath
module MemExecAll: Parameter_sig.Bool
--
GitLab