Initial version of reactive capture

Summary: Allow backend to trigger compilation of extra files when it needs them. This will allow infer to capture less files initally and possibly speed up compilation

Reviewed By: cristianoc, jberdine

Differential Revision: D4231581

fbshipit-source-id: 181abea
master
Andrzej Kotulski 8 years ago committed by Facebook Github Bot
parent f0498a77f9
commit c9d254c084

@ -109,11 +109,15 @@ let load_attributes proc_name =>
proc_attributes proc_attributes
}; };
let load_defined_attributes proc_name => let load_defined_attributes cache_none::cache_none proc_name =>
try (Procname.Hash.find defined_attr_tbl proc_name) { try (Procname.Hash.find defined_attr_tbl proc_name) {
| Not_found => | Not_found =>
let proc_attributes = load_attr defined_only::true proc_name; let proc_attributes = load_attr defined_only::true proc_name;
if (proc_attributes != None) { if (proc_attributes != None) {
/* procedure just got defined, replace attribute in attr_tbl with defined version */
Procname.Hash.replace attr_tbl proc_name proc_attributes;
Procname.Hash.add defined_attr_tbl proc_name proc_attributes
} else if cache_none {
Procname.Hash.add defined_attr_tbl proc_name proc_attributes Procname.Hash.add defined_attr_tbl proc_name proc_attributes
}; };
proc_attributes proc_attributes

@ -20,7 +20,7 @@ let load_attributes: Procname.t => option ProcAttributes.t;
/** Load attrubutes for the procedure but only if is_defined is true */ /** Load attrubutes for the procedure but only if is_defined is true */
let load_defined_attributes: Procname.t => option ProcAttributes.t; let load_defined_attributes: cache_none::bool => Procname.t => option ProcAttributes.t;
/** Given the name of an ObjC class, extract the type from the tenv where the class was defined. We /** Given the name of an ObjC class, extract the type from the tenv where the class was defined. We

@ -328,6 +328,9 @@ let store_cfg_to_file source_file::source_file (filename: DB.filename) (cfg: cfg
| None => () | None => ()
} }
}; };
/* NOTE: it's important to write attribute files to disk before writing .cfg file to disk.
OndemandCapture module relies on it - it uses existance of .cfg file as a barrier to make
sure that all attributes were written to disk (but not necessarily flushed) */
save_attributes source_file cfg; save_attributes source_file cfg;
Serialization.to_file cfg_serializer filename cfg Serialization.to_file cfg_serializer filename cfg
}; };

@ -0,0 +1,64 @@
(*
* Copyright (c) 2016 - present Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*)
open! Utils
let compilation_db = lazy (CompilationDatabase.from_json_files !Config.clang_compilation_db_files)
(** Given proc_attributes try to produce proc_attributes' where proc_attributes'.is_defined = true
It may trigger capture of extra files to do so and when it does, it waits for
frontend to finish before returning *)
let try_capture (attributes : ProcAttributes.t) : ProcAttributes.t option =
let lazy cdb = compilation_db in
if Option.is_none
(AttributesTable.load_defined_attributes ~cache_none:false attributes.proc_name) then (
let decl_file = attributes.loc.file in
let definition_file_opt = SourceFile.of_header decl_file in
let try_compile definition_file =
let source_dir = DB.source_dir_from_source_file definition_file in
(* Use cfg_filename as a proxy to find out whether definition_file was already captured.
If it was, there is no point in trying to capture it again.
Treat existance of cfg_filename as a barrier - if it exists it means that
all attributes files have been created - write logic is defined in
Cfg.store_cfg_to_file *)
let cfg_filename = DB.source_dir_get_internal_file source_dir ".cfg" in
if not (DB.file_exists cfg_filename) then (
CaptureCompilationDatabase.capture_file_in_database cdb definition_file;
if Config.debug_mode &&
Option.is_none
(AttributesTable.load_defined_attributes ~cache_none:false attributes.proc_name) then (
(* peek at the results to know if capture succeeded, but only in debug mode *)
Logging.out
"Captured file %a to get procedure %a but it wasn't found there@."
SourceFile.pp definition_file
Procname.pp attributes.proc_name
)
) else (
Logging.out
"Wanted to capture file %a to get procedure %a but file was already captured@."
SourceFile.pp definition_file
Procname.pp attributes.proc_name
)
in
Option.may try_compile definition_file_opt
);
(* It's important to call load_defined_attributes again in all cases to make sure we try
reading from disk again no matter which condition happened. If previous call to
load_defined_attributes is None, it may mean couple of things:
- proc_name hasn't been captured yet, so it needs to get captured (most likely scenario)
- there was a race and proc_name got captured by the time we checked whether
cfg_filename exists. In this case it's important to refetch attributes from disk because
contents may have changed (attributes file for proc_name may be there now)
- proc_name can't be captured (there is no definition we know of). In that case
result will stay None. At this point we know(?) we won't be able to find definition
for it ever so we can cache None.
Caveat: it's possible that procedure will be captured in some other unrelated file
later - infer may ignore it then.
It also relies on retry mechanism in deserialization code to deal with half-written
attributes files *)
AttributesTable.load_defined_attributes ~cache_none:true attributes.proc_name

@ -122,17 +122,23 @@ let get_file_data exe_env pname =
Some (Procname.Hash.find exe_env.proc_map pname) Some (Procname.Hash.find exe_env.proc_map pname)
with Not_found -> with Not_found ->
begin begin
let source_file_opt =
match AttributesTable.load_attributes pname with match AttributesTable.load_attributes pname with
| None -> | None ->
L.err "can't find tenv_cfg_object for %a@." Procname.pp pname; L.err "can't find tenv_cfg_object for %a@." Procname.pp pname;
None None
| Some proc_attributes when Config.reactive_capture ->
let get_captured_file {ProcAttributes.source_file_captured} = source_file_captured in
OndemandCapture.try_capture proc_attributes |> Option.map ~f:get_captured_file
| Some proc_attributes -> | Some proc_attributes ->
let source_file = proc_attributes.ProcAttributes.source_file_captured in Some proc_attributes.ProcAttributes.source_file_captured in
let get_file_data_for_source source_file =
let source_dir = DB.source_dir_from_source_file source_file in let source_dir = DB.source_dir_from_source_file source_file in
let cg_fname = DB.source_dir_get_internal_file source_dir ".cg" in let cg_fname = DB.source_dir_get_internal_file source_dir ".cg" in
let file_data = create_file_data exe_env.file_map source_file cg_fname in let file_data = create_file_data exe_env.file_map source_file cg_fname in
Procname.Hash.replace exe_env.proc_map pname file_data; Procname.Hash.replace exe_env.proc_map pname file_data;
Some file_data file_data in
Option.map ~f:get_file_data_for_source source_file_opt
end end
(** return the source file associated to the procedure *) (** return the source file associated to the procedure *)

@ -14,7 +14,8 @@ open! IStd
module L = Logging module L = Logging
module F = Format module F = Format
(** Directories to analyze from the ondemand file. *) (** Optional set of source dirs to analyze in on-demand mode. If None then all source dirs
will be analyzed *)
let dirs_to_analyze = let dirs_to_analyze =
let process_changed_files changed_files = let process_changed_files changed_files =
SourceFile.Set.fold SourceFile.Set.fold
@ -45,7 +46,7 @@ let unset_callbacks () =
let nesting = ref 0 let nesting = ref 0
let should_be_analyzed proc_attributes proc_name = let should_be_analyzed proc_name proc_attributes =
let currently_analyzed () = let currently_analyzed () =
match Specs.get_summary proc_name with match Specs.get_summary proc_name with
| None -> false | None -> false
@ -62,8 +63,12 @@ let should_be_analyzed proc_attributes proc_name =
let procedure_should_be_analyzed proc_name = let procedure_should_be_analyzed proc_name =
match AttributesTable.load_attributes proc_name with match AttributesTable.load_attributes proc_name with
| Some proc_attributes when Config.reactive_capture && proc_attributes.is_defined = false ->
(* try to capture procedure first *)
let defined_proc_attributes = OndemandCapture.try_capture proc_attributes in
Option.value_map ~f:(should_be_analyzed proc_name) ~default:false defined_proc_attributes
| Some proc_attributes -> | Some proc_attributes ->
should_be_analyzed proc_attributes proc_name should_be_analyzed proc_name proc_attributes
| None -> | None ->
false false
@ -192,7 +197,7 @@ let analyze_proc_desc ~propagate_exceptions curr_pdesc callee_pdesc =
let proc_attributes = Procdesc.get_attributes callee_pdesc in let proc_attributes = Procdesc.get_attributes callee_pdesc in
match !callbacks_ref with match !callbacks_ref with
| Some callbacks | Some callbacks
when should_be_analyzed proc_attributes callee_pname -> when should_be_analyzed callee_pname proc_attributes ->
run_proc_analysis ~propagate_exceptions callbacks.analyze_ondemand curr_pdesc callee_pdesc run_proc_analysis ~propagate_exceptions callbacks.analyze_ondemand curr_pdesc callee_pdesc
| _ -> () | _ -> ()

@ -11,7 +11,8 @@ open! IStd
(** Module for on-demand analysis. *) (** Module for on-demand analysis. *)
(** Optional set of source dirs to analyze in on-demand mode. *) (** Optional set of source dirs to analyze in on-demand mode. If None then all source dirs
will be analyzed *)
val dirs_to_analyze : String.Set.t option val dirs_to_analyze : String.Set.t option
type analyze_ondemand = SourceFile.t -> Procdesc.t -> unit type analyze_ondemand = SourceFile.t -> Procdesc.t -> unit

@ -53,6 +53,8 @@ let do_source_file translation_unit_context ast =
(* This could be moved in the cfg_infer module *) (* This could be moved in the cfg_infer module *)
let source_dir = DB.source_dir_from_source_file source_file in let source_dir = DB.source_dir_from_source_file source_file in
let tenv_file = DB.source_dir_get_internal_file source_dir ".tenv" in let tenv_file = DB.source_dir_get_internal_file source_dir ".tenv" in
(* Naming scheme of .cfg file matters for OndemandCapture module. If it
changes here, it should be changed there as well*)
let cfg_file = DB.source_dir_get_internal_file source_dir ".cfg" in let cfg_file = DB.source_dir_get_internal_file source_dir ".cfg" in
let cg_file = DB.source_dir_get_internal_file source_dir ".cg" in let cg_file = DB.source_dir_get_internal_file source_dir ".cg" in
Cg.store_to_file cg_file call_graph; Cg.store_to_file cg_file call_graph;

@ -143,6 +143,8 @@ let get_compilation_database_files_xcodebuild () =
Logging.stderr "There was an error executing the build command"; Logging.stderr "There was an error executing the build command";
exit 1 exit 1
let capture_files_in_database compilation_database = let capture_files_in_database compilation_database =
run_compilation_database compilation_database (should_capture_file_from_index ()) run_compilation_database compilation_database (should_capture_file_from_index ())
let capture_file_in_database compilation_database source_file =
run_compilation_database compilation_database (SourceFile.equal source_file)

@ -14,6 +14,8 @@ open! IStd
is passed, we only capture the files there *) is passed, we only capture the files there *)
val capture_files_in_database : CompilationDatabase.t -> unit val capture_files_in_database : CompilationDatabase.t -> unit
val capture_file_in_database : CompilationDatabase.t -> SourceFile.t -> unit
(** Get the compilation database files that contain the compilation given by the (** Get the compilation database files that contain the compilation given by the
buck command. It will be the compilation of the passed targets only or also buck command. It will be the compilation of the passed targets only or also
the dependencies according to the flag --use-compilation-database deps | no-deps *) the dependencies according to the flag --use-compilation-database deps | no-deps *)

@ -37,9 +37,16 @@ infer-out-no-index/report.json: $(CMAKE_BUILD_DIR)/compile_commands.json $(INFER
$(call silent_on_success,\ $(call silent_on_success,\
$(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -o infer-out-no-index -- clang-compilation-database $<) $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -o infer-out-no-index -- clang-compilation-database $<)
issues.exp.test: infer-out-with-index/report.json infer-out-no-index/report.json infer-out-reactive-capture/report.json: $(CMAKE_BUILD_DIR)/compile_commands.json $(INFER_BIN) $(SOURCES)
$(call silent_on_success,\
$(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -o infer-out-reactive-capture --reactive-capture \
--changed-files-index $(CMAKE_DIR)/index.txt -- clang-compilation-database $<)
issues.exp.test: infer-out-with-index/report.json infer-out-no-index/report.json infer-out-reactive-capture/report.json
$(INFERPRINT_BIN) -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.with-index \ $(INFERPRINT_BIN) -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.with-index \
--from-json-report infer-out-with-index/report.json --from-json-report infer-out-with-index/report.json
$(INFERPRINT_BIN) -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.no-index \ $(INFERPRINT_BIN) -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.no-index \
--from-json-report infer-out-no-index/report.json --from-json-report infer-out-no-index/report.json
cat $@.with-index $@.no-index > $@ $(INFERPRINT_BIN) -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.reactive-capture \
--from-json-report infer-out-reactive-capture/report.json
cat $@.with-index $@.no-index $@.reactive-capture > $@

@ -5,3 +5,7 @@ hello.cpp, test0, 2, NULL_DEREFERENCE, [start of procedure test0()]
hello.cpp, test1, 2, NULL_DEREFERENCE, [start of procedure test1(),start of procedure deref1()] hello.cpp, test1, 2, NULL_DEREFERENCE, [start of procedure test1(),start of procedure deref1()]
hello.cpp, test2, 2, NULL_DEREFERENCE, [start of procedure test2(),start of procedure deref2()] hello.cpp, test2, 2, NULL_DEREFERENCE, [start of procedure test2(),start of procedure deref2()]
lib3.h, test, 1, NULL_DEREFERENCE, [start of procedure test(),start of procedure deref3()] lib3.h, test, 1, NULL_DEREFERENCE, [start of procedure test(),start of procedure deref3()]
hello.cpp, test0, 2, NULL_DEREFERENCE, [start of procedure test0()]
hello.cpp, test1, 2, NULL_DEREFERENCE, [start of procedure test1(),start of procedure deref1()]
hello.cpp, test2, 2, NULL_DEREFERENCE, [start of procedure test2(),start of procedure deref2()]
lib3.h, test, 1, NULL_DEREFERENCE, [start of procedure test(),start of procedure deref3()]

Loading…
Cancel
Save