[cleanup] rename thread-safety analysis

Reviewed By: jvillard

Differential Revision: D6087967

fbshipit-source-id: 22bfb6d

Author: sblackshear

Makefile

@@ -48,7 +48,7 @@ BUILD_SYSTEMS_TESTS += \
 
 DIRECT_TESTS += \
   c_biabduction c_bufferoverrun c_errors c_frontend \
-  cpp_bufferoverrun cpp_errors cpp_frontend  cpp_liveness cpp_quandary cpp_siof cpp_threadsafety cpp_uninit cpp_nullable \
+  cpp_bufferoverrun cpp_errors cpp_frontend  cpp_liveness cpp_quandary cpp_racerd cpp_siof cpp_uninit cpp_nullable \
 
 ifneq ($(BUCK),no)
 BUILD_SYSTEMS_TESTS += buck-clang-db buck_flavors buck_flavors_run buck_flavors_deterministic
@@ -86,7 +86,7 @@ BUILD_SYSTEMS_TESTS += \
 
 DIRECT_TESTS += \
   java_checkers java_eradicate java_infer java_lab java_tracing java_quandary \
-  java_threadsafety java_crashcontext java_harness
+  java_racerd java_crashcontext java_harness
 ifneq ($(ANT),no)
 BUILD_SYSTEMS_TESTS += ant
 endif

infer/src/backend/specs.ml

@@ -336,7 +336,7 @@ type payload =
   ; quandary: QuandarySummary.t option
   ; resources: ResourceLeakDomain.summary option
   ; siof: SiofDomain.astate option
-  ; threadsafety: ThreadSafetyDomain.summary option
+  ; racerd: RacerDDomain.summary option
   ; buffer_overrun: BufferOverrunDomain.Summary.t option
   ; uninit: UninitDomain.summary option }
 
@@ -465,7 +465,7 @@ let pp_payload pe fmt
     ; crashcontext_frame
     ; quandary
     ; siof
-    ; threadsafety
+    ; racerd
     ; buffer_overrun
     ; annot_map
     ; uninit } =
@@ -481,7 +481,7 @@ let pp_payload pe fmt
     (pp_opt "TypeState" (TypeState.pp TypeState.unit_ext))
     typestate (pp_opt "CrashContext" Crashcontext.pp_stacktree) crashcontext_frame
     (pp_opt "Quandary" QuandarySummary.pp) quandary (pp_opt "Siof" SiofDomain.pp) siof
-    (pp_opt "ThreadSafety" ThreadSafetyDomain.pp_summary) threadsafety
+    (pp_opt "RacerD" RacerDDomain.pp_summary) racerd
     (pp_opt "BufferOverrun" BufferOverrunDomain.Summary.pp) buffer_overrun
     (pp_opt "AnnotationReachability" AnnotReachabilityDomain.pp) annot_map
     (pp_opt "Uninitialised" UninitDomain.pp_summary) uninit
@@ -695,7 +695,7 @@ let empty_payload =
   ; quandary= None
   ; resources= None
   ; siof= None
-  ; threadsafety= None
+  ; racerd= None
   ; buffer_overrun= None
   ; uninit= None }
 

infer/src/backend/specs.mli

@@ -136,7 +136,7 @@ type payload =
   ; quandary: QuandarySummary.t option
   ; resources: ResourceLeakDomain.summary option
   ; siof: SiofDomain.astate option
-  ; threadsafety: ThreadSafetyDomain.summary option
+  ; racerd: RacerDDomain.summary option
   ; buffer_overrun: BufferOverrunDomain.Summary.t option
   ; uninit: UninitDomain.summary option }
 

infer/src/base/Config.ml

@@ -242,9 +242,9 @@ let manual_java = "JAVA OPTIONS"
 
 let manual_quandary = "QUANDARY CHECKER OPTIONS"
 
-let manual_siof = "SIOF CHECKER OPTIONS"
+let manual_racerd = "RACERD CHECKER OPTIONS"
 
-let manual_threadsafety = "THREADSAFETY CHECKER OPTIONS"
+let manual_siof = "SIOF CHECKER OPTIONS"
 
 (** Maximum level of recursion during the analysis, after which a timeout is generated *)
 let max_recursion = 5
@@ -681,14 +681,16 @@ and ( annotation_reachability
     , liveness
     , printf_args
     , quandary
+    , racerd
     , repeated_calls
     , resource_leak
     , siof
-    , threadsafety
     , suggest_nullable
     , uninit ) =
-  let mk_checker ?(default= false) ~long doc =
-    let var = CLOpt.mk_bool ~long ~in_help:CLOpt.([(Analyze, manual_generic)]) ~default doc in
+  let mk_checker ?(default= false) ?(deprecated= []) ~long doc =
+    let var =
+      CLOpt.mk_bool ~long ~in_help:CLOpt.([(Analyze, manual_generic)]) ~default ~deprecated doc
+    in
     all_checkers := (var, long, doc, default) :: !all_checkers ;
     var
   in
@@ -719,14 +721,16 @@ and ( annotation_reachability
     mk_checker ~long:"printf-args" ~default:true
       "the detection of mismatch between the Java printf format strings and the argument types For, example, this checker will warn about the type error in `printf(\"Hello %d\", \"world\")`"
   and quandary = mk_checker ~long:"quandary" ~default:true "the quandary taint analysis"
+  and racerd =
+    mk_checker ~long:"racerd" ~deprecated:["-threadsafety"] ~default:true
+      "the RacerD thread safety analysis"
   and repeated_calls = mk_checker ~long:"repeated-calls" "check for repeated calls"
   and resource_leak = mk_checker ~long:"resource-leak" ""
   and siof =
     mk_checker ~long:"siof" ~default:true
       "the Static Initialization Order Fiasco analysis (C++ only)"
   and suggest_nullable =
     mk_checker ~long:"suggest-nullable" ~default:false "Nullable annotation sugesstions analysis"
-  and threadsafety = mk_checker ~long:"threadsafety" ~default:true "the thread safety analysis"
   and uninit = mk_checker ~long:"uninit" "checker for use of uninitialized values" in
   let mk_only (var, long, doc, _) =
     let _ : bool ref =
@@ -776,10 +780,10 @@ and ( annotation_reachability
   , liveness
   , printf_args
   , quandary
+  , racerd
   , repeated_calls
   , resource_leak
   , siof
-  , threadsafety
   , suggest_nullable
   , uninit )
 
@@ -1728,7 +1732,7 @@ and testing_mode =
 
 and threadsafe_aliases =
   CLOpt.mk_json ~long:"threadsafe-aliases"
-    ~in_help:CLOpt.([(Analyze, manual_threadsafety)])
+    ~in_help:CLOpt.([(Analyze, manual_racerd)])
     "Specify custom annotations that should be considered aliases of @ThreadSafe"
 
 and trace_join =
@@ -1979,14 +1983,14 @@ let post_parsing_initialization command_opt =
       | _
        -> () ) ;
   ( match !analyzer with
-  | Some BiAbduction | None
+  | Some BiAbduction
    -> disable_all_checkers () ;
       (* technically the biabduction checker doesn't run in this mode, but this gives an easy way to test if the biabduction *analysis* is active *)
       biabduction := true
   | Some Crashcontext
    -> disable_all_checkers () ;
       crashcontext := true
-  | Some (CaptureOnly | Checkers | CompileOnly | Linters)
+  | Some (CaptureOnly | Checkers | CompileOnly | Linters) | None
    -> () ) ;
   Option.value ~default:CLOpt.Run command_opt
 
@@ -2342,6 +2346,8 @@ and quandary_sinks = !quandary_sinks
 
 and quiet = !quiet
 
+and racerd = !racerd
+
 and reactive_mode = !reactive || CLOpt.(equal_command Diff) command
 
 and reactive_capture = !reactive_capture
@@ -2378,8 +2384,6 @@ and show_progress_bar = !progress_bar
 
 and siof = !siof
 
-and uninit = !uninit
-
 and siof_safe_methods = !siof_safe_methods
 
 and skip_analysis_in_path = !skip_analysis_in_path
@@ -2418,8 +2422,6 @@ and test_filtering = !test_filtering
 
 and testing_mode = !testing_mode
 
-and threadsafety = !threadsafety
-
 and threadsafe_aliases = !threadsafe_aliases
 
 and trace_error = !trace_error
@@ -2436,6 +2438,8 @@ and tv_limit = !tv_limit
 
 and type_size = !type_size
 
+and uninit = !uninit
+
 and unsafe_malloc = !unsafe_malloc
 
 and whole_seconds = !whole_seconds

infer/src/base/Config.mli

@@ -627,8 +627,6 @@ val show_progress_bar : bool
 
 val siof : bool
 
-val uninit : bool
-
 val siof_safe_methods : string list
 
 val skip_analysis_in_path : string list
@@ -665,7 +663,7 @@ val test_filtering : bool
 
 val testing_mode : bool
 
-val threadsafety : bool
+val racerd : bool
 
 val threadsafe_aliases : Yojson.Basic.json
 
@@ -681,6 +679,8 @@ val tv_limit : int
 
 val type_size : bool
 
+val uninit : bool
+
 val unsafe_malloc : bool
 
 val whole_seconds : bool

infer/src/checkers/registerCheckers.ml

@@ -84,13 +84,13 @@ let all_checkers =
             Procedure ResourceLeaks.checker
           , Config.Java ) ] }
   ; {name= "SIOF"; active= Config.siof; callbacks= [(Procedure Siof.checker, Config.Clang)]}
-  ; { name= "thread safety"
-    ; active= Config.threadsafety
+  ; { name= "RacerD"
+    ; active= Config.racerd
     ; callbacks=
-        [ (Procedure ThreadSafety.analyze_procedure, Config.Clang)
-        ; (Procedure ThreadSafety.analyze_procedure, Config.Java)
-        ; (Cluster ThreadSafety.file_analysis, Config.Clang)
-        ; (Cluster ThreadSafety.file_analysis, Config.Java) ] }
+        [ (Procedure RacerD.analyze_procedure, Config.Clang)
+        ; (Procedure RacerD.analyze_procedure, Config.Java)
+        ; (Cluster RacerD.file_analysis, Config.Clang)
+        ; (Cluster RacerD.file_analysis, Config.Java) ] }
   ; { name= "uninitialized variables"
     ; active= Config.uninit
     ; callbacks= [(Procedure Uninit.checker, Config.Clang)] } ]