[Misc] refactor

Author: bongjunj

src/coverage.ml

@@ -3,30 +3,20 @@ module F = Format
 module L = Logger
 
 let parse_targets targets_file =
-  (AUtil.readlines targets_file
+  AUtil.readlines targets_file
   |> List.map (fun line ->
          let chunks = String.split_on_char ':' line in
          let filename = List.nth chunks 0 |> Filename.basename in
          let lineno = List.nth chunks 1 |> int_of_string in
          (filename, lineno))
   |> List.sort_uniq compare
-  |> List.hd)
-  :: []
 
 module BlockTrace = struct
   type t = int list
 
   let of_lines lines =
     (* SAFETY: if the file is generated, it has at least one line *)
-    let lines =
-      lines
-      |> List.map (fun line ->
-             match int_of_string_opt line with
-             | Some n -> n
-             | None ->
-                 F.eprintf "BlockTrace.of_lines: invalid line %s" line;
-                 exit 1)
-    in
+    let lines = lines |> List.map int_of_string in
     match lines with
     | [] -> []
     | _ ->

src/fuzzer.ml

@@ -38,15 +38,15 @@ let evaluate_mutant parent_llm llm importants covset node_tbl distance_map =
   match optim_res with
   | Error _ -> None
   | Ok lines ->
-      let filter_func =
+      let in_slice =
         match !Config.coverage with
         | Config.FuzzingMode.Sliced_cfg ->
             fun addr ->
               Coverage.sliced_cfg_node_of_addr node_tbl distance_map addr
               |> Option.is_some
         | _ -> fun _ -> true
       in
-      let trace = lines |> List.map int_of_string |> List.filter filter_func in
+      let trace = lines |> List.map int_of_string |> List.filter in_slice in
       let cov = trace |> AUtil.pairs |> Coverage.EdgeCoverage.of_list in
       let new_points = Coverage.EdgeCoverage.diff cov covset in
       if Coverage.EdgeCoverage.is_empty new_points then

src/main.ml

@@ -32,6 +32,9 @@ let main targets_file cfg_dir =
   |> List.iter (fun (filename, lineno) ->
          F.printf "target: %s:%d@." (Filename.basename filename) lineno);
 
+  (* TODO: check *)
+  let targets = [ List.hd targets ] in
+
   let cfgs =
     Sys.readdir cfg_dir
     |> Array.to_list

src/oracle.ml

@@ -20,6 +20,10 @@ module Validator = struct
 
   let has_target line = String.starts_with ~prefix:"target " line
 
+  let launch_tv src opted =
+    Unix.open_process_args_in "timeout"
+      [| "timeout"; "2m"; !Config.alive_tv_bin; src; opted |]
+
   let run src optimized =
     if not (Sys.file_exists src && Sys.file_exists optimized) then Errors
     else
@@ -33,10 +37,7 @@ module Validator = struct
       in
       Out_channel.with_open_text optimized (fun instr ->
           List.iter (Printf.fprintf instr "%s\n") lines);
-      let tv_process =
-        Unix.open_process_args_in "timeout"
-          [| "timeout"; "2m"; !Config.alive_tv_bin; src; optimized |]
-      in
+      let tv_process = launch_tv src optimized in
       let text = In_channel.input_all tv_process in
       print_endline text;
       (*AUtil.log "%s@." text;*)