pghs975uc
/
infer_clone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[reporting][perf] combine PerfStats source_file with stats_type

Browse Source 
Summary: `stats_type` can just include a `SourceFile.t`, as the existence of a `source_file` parameter previously depended on the value of `stats_type` anyway

Reviewed By: dulmarod

Differential Revision: D7381605

fbshipit-source-id: 953ee27
master
Varun Arora 7 years ago committed by Facebook Github Bot
parent c29c636768
commit 24e66ada0b
5 changed files with 53 additions and 41 deletions
Show Stats Download Patch File Download Diff File

64
infer/src/backend/PerfStats.ml
Unescape View File

@ -32,27 +32,27 @@ type perf_stats = {mem: mem_perf option; time: time_perf option}
type stats_kind = Time of Mtime_clock.counter * Unix.process_times | Memory | TimeAndMemory type stats_kind = Time of Mtime_clock.counter * Unix.process_times | Memory | TimeAndMemory
type stats_type = type stats_type =
| ClangLinters | ClangLinters of SourceFile.t
| ClangFrontend | ClangFrontend of SourceFile.t
| ClangFrontendLinters | ClangFrontendLinters of SourceFile.t
| JavaFrontend | JavaFrontend of SourceFile.t
| PythonFrontend | PythonFrontend of SourceFile.t
| Backend | Backend of SourceFile.t
| Reporting | Reporting
| Driver | Driver
let dirname_of_stats_type = function let dirname_of_stats_type = function
| ClangLinters -> | ClangLinters _ ->
Config.frontend_stats_dir_name Config.frontend_stats_dir_name
| ClangFrontend -> | ClangFrontend _ ->
Config.frontend_stats_dir_name Config.frontend_stats_dir_name
| ClangFrontendLinters -> | ClangFrontendLinters _ ->
Config.frontend_stats_dir_name Config.frontend_stats_dir_name
| JavaFrontend -> | JavaFrontend _ ->
Config.frontend_stats_dir_name Config.frontend_stats_dir_name
| PythonFrontend -> | PythonFrontend _ ->
Config.frontend_stats_dir_name Config.frontend_stats_dir_name
| Backend -> | Backend _ ->
Config.backend_stats_dir_name Config.backend_stats_dir_name
| Reporting -> | Reporting ->
Config.reporting_stats_dir_name Config.reporting_stats_dir_name
@ -61,17 +61,17 @@ let dirname_of_stats_type = function
let string_of_stats_type = function let string_of_stats_type = function
| ClangLinters -> | ClangLinters _ ->
"linters" "linters"
| ClangFrontend -> | ClangFrontend _ ->
"clang_frontend" "clang_frontend"
| ClangFrontendLinters -> | ClangFrontendLinters _ ->
"clang_frontend_and_linters" "clang_frontend_and_linters"
| JavaFrontend -> | JavaFrontend _ ->
"java_frontend" "java_frontend"
| PythonFrontend -> | PythonFrontend _ ->
"python_frontend" "python_frontend"
| Backend -> | Backend _ ->
"backend" "backend"
| Reporting -> | Reporting ->
"reporting" "reporting"
@ -79,6 +79,18 @@ let string_of_stats_type = function
"driver" "driver"
let source_file_of_stats_type = function
| ClangLinters source_file
| ClangFrontend source_file
| ClangFrontendLinters source_file
| JavaFrontend source_file
| PythonFrontend source_file
| Backend source_file ->
Some source_file
| _ ->
None
let to_json ps = let to_json ps =
let time = let time =
Option.value_map ~default:[] ps.time ~f:(fun time_perf -> Option.value_map ~default:[] ps.time ~f:(fun time_perf ->
@ -254,7 +266,7 @@ let compute_time_stats ?rtime_counter (initial_times: Unix.process_times) =
(stats, time) (stats, time)
let compute_stats stats_kind source_file stats_type = let compute_stats stats_kind stats_type =
let (mem, mem_perf), (time, time_perf) = let (mem, mem_perf), (time, time_perf) =
match stats_kind with match stats_kind with
| Time (rtime_counter, initial_times) -> | Time (rtime_counter, initial_times) ->
@ -268,7 +280,7 @@ let compute_stats stats_kind source_file stats_type =
let stats_event = let stats_event =
EventLogger.PerformanceStats EventLogger.PerformanceStats
{ lang= Language.to_explicit_string !Language.curr_language { lang= Language.to_explicit_string !Language.curr_language
; source_file ; source_file= source_file_of_stats_type stats_type
; stats_type= string_of_stats_type stats_type ; stats_type= string_of_stats_type stats_type
; mem_perf ; mem_perf
; time_perf } ; time_perf }
@ -276,9 +288,9 @@ let compute_stats stats_kind source_file stats_type =
(stats, stats_event) (stats, stats_event)
let report stats_kind source_file file stats_type () = let report stats_kind file stats_type () =
try try
let stats, stats_event = compute_stats stats_kind source_file stats_type in let stats, stats_event = compute_stats stats_kind stats_type in
let json_stats = to_json stats in let json_stats = to_json stats in
EventLogger.log stats_event ; EventLogger.log stats_event ;
(* We always log to EventLogger, but json files are unnecessary to log outside of developer mode *) (* We always log to EventLogger, but json files are unnecessary to log outside of developer mode *)
@ -305,10 +317,10 @@ let get_relative_path filename stats_type =
Filename.concat dirname filename Filename.concat dirname filename
let register_report stats_kind ?source_file filename stats_type = let register_report stats_kind filename stats_type =
let relative_path = get_relative_path filename stats_type in let relative_path = get_relative_path filename stats_type in
let absolute_path = Filename.concat Config.results_dir relative_path in let absolute_path = Filename.concat Config.results_dir relative_path in
let f = report stats_kind source_file absolute_path stats_type in let f = report stats_kind absolute_path stats_type in
(* make sure to not double register the same perf stat report *) (* make sure to not double register the same perf stat report *)
match String.Table.add registered ~key:relative_path ~data:f with match String.Table.add registered ~key:relative_path ~data:f with
| `Ok -> | `Ok ->
@ -324,8 +336,8 @@ let get_reporter filename stats_type =
String.Table.find registered relative_path |> Option.value ~default:dummy_reporter String.Table.find registered relative_path |> Option.value ~default:dummy_reporter
let register_report_at_exit ?source_file filename stats_type = let register_report_at_exit filename stats_type =
register_report TimeAndMemory ?source_file filename stats_type ; register_report TimeAndMemory filename stats_type ;
Epilogues.register Epilogues.register
~f:(get_reporter filename stats_type) ~f:(get_reporter filename stats_type)
(string_of_stats_type stats_type ^ "stats reporting in " ^ filename) (string_of_stats_type stats_type ^ "stats reporting in " ^ filename)

16
infer/src/backend/PerfStats.mli
Unescape View File

@ -16,12 +16,12 @@ type perf_stats
type stats_kind = Time of Mtime_clock.counter * Unix.process_times | Memory | TimeAndMemory type stats_kind = Time of Mtime_clock.counter * Unix.process_times | Memory | TimeAndMemory
type stats_type = type stats_type =
| ClangLinters | ClangLinters of SourceFile.t
| ClangFrontend | ClangFrontend of SourceFile.t
| ClangFrontendLinters | ClangFrontendLinters of SourceFile.t
| JavaFrontend | JavaFrontend of SourceFile.t
| PythonFrontend | PythonFrontend of SourceFile.t
| Backend | Backend of SourceFile.t
| Reporting | Reporting
| Driver | Driver
@ -29,11 +29,11 @@ val from_json : Yojson.Basic.json -> perf_stats
val aggregate : perf_stats list -> Yojson.Basic.json val aggregate : perf_stats list -> Yojson.Basic.json
val register_report : stats_kind -> ?source_file:SourceFile.t -> string -> stats_type -> unit val register_report : stats_kind -> string -> stats_type -> unit
(** Register performance reporting function *) (** Register performance reporting function *)
val get_reporter : string -> stats_type -> unit -> unit val get_reporter : string -> stats_type -> unit -> unit
(** Get reporting function that can be called at any time to create a performance report *) (** Get reporting function that can be called at any time to create a performance report *)
val register_report_at_exit : ?source_file:SourceFile.t -> string -> stats_type -> unit val register_report_at_exit : string -> stats_type -> unit
(** Create performance report when the current process terminates *) (** Create performance report when the current process terminates *)

4
infer/src/backend/callbacks.ml
Unescape View File

@ -122,8 +122,8 @@ let dump_duplicate_procs (exe_env: Exe_env.t) procs =
let create_perf_stats_report source_file = let create_perf_stats_report source_file =
let abbrev_source_file = DB.source_file_encoding source_file in let abbrev_source_file = DB.source_file_encoding source_file in
let filename = F.sprintf "%s_%s.json" Config.perf_stats_prefix abbrev_source_file in let filename = F.sprintf "%s_%s.json" Config.perf_stats_prefix abbrev_source_file in
PerfStats.register_report PerfStats.TimeAndMemory ~source_file filename PerfStats.Backend ; PerfStats.register_report PerfStats.TimeAndMemory filename (PerfStats.Backend source_file) ;
PerfStats.get_reporter filename PerfStats.Backend () PerfStats.get_reporter filename (PerfStats.Backend source_file) ()
(** Invoke all procedure and cluster callbacks on a given environment. *) (** Invoke all procedure and cluster callbacks on a given environment. *)

8
infer/src/clang/Capture.ml
Unescape View File

@ -30,15 +30,15 @@ let register_perf_stats_report source_file =
let stats_type = let stats_type =
match (Config.capture, Config.linters) with match (Config.capture, Config.linters) with
| true, true -> | true, true ->
PerfStats.ClangFrontendLinters PerfStats.ClangFrontendLinters source_file
| true, false -> | true, false ->
PerfStats.ClangFrontend PerfStats.ClangFrontend source_file
| false, true -> | false, true ->
PerfStats.ClangLinters PerfStats.ClangLinters source_file
| false, false -> | false, false ->
Logging.(die UserError) "Clang frontend should be run in capture and/or linters mode." Logging.(die UserError) "Clang frontend should be run in capture and/or linters mode."
in in
PerfStats.register_report_at_exit filename ~source_file stats_type PerfStats.register_report_at_exit filename stats_type
let init_global_state_for_capture_and_linters source_file = let init_global_state_for_capture_and_linters source_file =

2
infer/src/java/jMain.ml
Unescape View File

@ -17,7 +17,7 @@ module L = Logging
let register_perf_stats_report source_file = let register_perf_stats_report source_file =
let abbrev_source_file = DB.source_file_encoding source_file in let abbrev_source_file = DB.source_file_encoding source_file in
let filename = F.sprintf "%s_%s.json" Config.perf_stats_prefix abbrev_source_file in let filename = F.sprintf "%s_%s.json" Config.perf_stats_prefix abbrev_source_file in
PerfStats.register_report_at_exit filename ~source_file PerfStats.JavaFrontend PerfStats.register_report_at_exit filename (PerfStats.JavaFrontend source_file)
let init_global_state source_file = let init_global_state source_file =

Write Preview
Loading…
Cancel
Save