From f999f2ebb7cddaa9dace3c38ea408863119677b0 Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Wed, 24 Jan 2018 09:50:08 -0800 Subject: [PATCH] [cleanup] remove unused `ProcessPool.Execution_error` Summary: Also, always log failures. This also shows that the dead code detection does not detect dead exceptions :/ Reviewed By: jeremydubreil Differential Revision: D6796843 fbshipit-source-id: 3d0ff5c --- infer/src/base/ProcessPool.ml | 10 ++++------ infer/src/base/ProcessPool.mli | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/infer/src/base/ProcessPool.ml b/infer/src/base/ProcessPool.ml index a2d02bf3d..cb71993b7 100644 --- a/infer/src/base/ProcessPool.ml +++ b/infer/src/base/ProcessPool.ml @@ -7,11 +7,10 @@ * of patent rights can be found in the PATENTS file in the same directory. *) open! IStd +module L = Logging type t = {mutable num_processes: int; jobs: int} -exception Execution_error of string - let create ~jobs = {num_processes= 0; jobs} let incr counter = counter.num_processes <- counter.num_processes + 1 @@ -22,11 +21,10 @@ let wait counter = match Unix.wait `Any with | _, Ok _ -> decr counter - | _, Error _ when Config.keep_going -> - (* Proceed past the failure when keep going mode is on *) - decr counter | _, (Error _ as status) -> - raise (Execution_error (Unix.Exit_or_signal.to_string_hum status)) + let log_or_die = if Config.keep_going then L.internal_error else L.die InternalError in + log_or_die "Error in infer subprocess: %s@." (Unix.Exit_or_signal.to_string_hum status) ; + decr counter let wait_all counter = for _ = 1 to counter.num_processes do wait counter done diff --git a/infer/src/base/ProcessPool.mli b/infer/src/base/ProcessPool.mli index 7ee3b72ad..83713bd90 100644 --- a/infer/src/base/ProcessPool.mli +++ b/infer/src/base/ProcessPool.mli @@ -12,8 +12,6 @@ open! IStd (** Pool of processes to execute in parallel up to a number of jobs. *) type t -exception Execution_error of string (** Infer process execution failure *) - val create : jobs:int -> t (** Create a new pool of processes *)