Merge pull request #787 from talex5/freebsd-close

Ignore ECONNRESET on close
ocaml-multicore · Dec 6, 2024 · f195295 · f195295
2 parents f26d70d + 1766568
commit f195295
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib_eio/tests/dscheck/unix.ml b/lib_eio/tests/dscheck/unix.ml
@@ -1,3 +1,7 @@
+type error = ECONNRESET
+
+exception Unix_error of error * string * string
+
 type file_descr = [`Open | `Closed] Atomic.t
 
 let make () = Atomic.make `Open

diff --git a/lib_eio/unix/rcfd.ml b/lib_eio/unix/rcfd.ml
@@ -98,7 +98,13 @@ let get t =
     None
 
 let close_fd fd =
-  Eio.Private.Trace.with_span "close" (fun () -> Unix.close fd)
+  Eio.Private.Trace.with_span "close" (fun () ->
+      try
+        Unix.close fd
+      with Unix.Unix_error (ECONNRESET, _, _) ->
+        (* For FreeBSD. See https://github.com/ocaml-multicore/eio/issues/786 *)
+        ()
+    )
 
 (* Note: we could simplify this a bit by incrementing [t.ops], as [remove] does.
    However, that makes dscheck too slow. *)