Use standard In_channel.with_open_* and Out_channel.with_open_* for Marshal (issue #1477)

This should also be more efficient because BatMarshal.output and BatMarshal.input convert everything via string.

Author: sim642

src/analyses/basePriv.ml

@@ -2031,12 +2031,11 @@ struct
     v
 
   let dump () =
-    let f = open_out_bin (get_string "exp.priv-prec-dump") in (* TODO: Out_channel.with_open_bin *)
+    Out_channel.with_open_bin (get_string "exp.priv-prec-dump") @@ fun f ->
     (* LVH.iter (fun (l, x) v ->
         Logs.debug "%a %a = %a" CilType.Location.pretty l CilType.Varinfo.pretty x VD.pretty v
       ) lvh; *)
-    Marshal.output f ({name = get_string "ana.base.privatization"; results = lvh}: result);
-    close_out_noerr f
+    Stdlib.Marshal.to_channel f ({name = get_string "ana.base.privatization"; results = lvh}: result) []
 
   let finalize () =
     if !is_dumping then

src/incremental/serialize.ml

@@ -1,7 +1,5 @@
 (** Serialization/deserialization of incremental analysis data. *)
 
-open Batteries
-
 (* TODO: GoblintDir *)
 let incremental_data_file_name = "analysis.data"
 let results_dir = "results"
@@ -22,13 +20,12 @@ let gob_results_dir op =
 let server () = GobConfig.get_bool "server.enabled"
 
 let marshal obj fileName  =
-  let chan = open_out_bin (Fpath.to_string fileName) in (* TODO: Out_channel.with_open_bin *)
-  Marshal.output chan obj;
-  close_out chan
+  Out_channel.with_open_bin (Fpath.to_string fileName) @@ fun chan ->
+  Marshal.to_channel chan obj []
 
 let unmarshal fileName =
   Logs.debug "Unmarshalling %s... If type of content changed, this will result in a segmentation fault!" (Fpath.to_string fileName);
-  Marshal.input (open_in_bin (Fpath.to_string fileName)) (* TODO: In_channel.with_open_bin *)
+  In_channel.with_open_bin (Fpath.to_string fileName) Marshal.from_channel
 
 let results_exist () =
   (* If Goblint did not crash irregularly, the existence of the result directory indicates that there are results *)

src/util/precCompare.ml

@@ -95,10 +95,8 @@ struct
   open Util
 
   let load filename =
-    let f = open_in_bin filename in (* TODO: In_channel.with_open_bin *)
-    let dump: dump = Marshal.from_channel f in
+    let dump: dump = In_channel.with_open_bin filename Stdlib.Marshal.from_channel in
     let dump: result = {name = dump.name; results = unmarshal dump.marshalled } in
-    close_in_noerr f;
     dump
 
   module CompareDump = MakeHashtbl (Key) (Dom) (RH)