Merge pull request #806 from dialohq/main

Prioritize returning Fiber.any value over cancelling quickly

Author: talex5

lib_eio/core/fiber.ml

@@ -150,8 +150,8 @@ let any_gen ~return ~combine fs =
       )
   in
   match !r, Cancel.get_error parent_c with
-  | OK r, None -> r
-  | (OK _ | New), Some ex -> raise ex
+  | OK r, _ -> r
+  | New, Some ex -> raise ex
   | Ex (ex, bt), None -> Printexc.raise_with_backtrace ex bt
   | Ex ex1, Some ex2 ->
     let bt2 = Printexc.get_raw_backtrace () in

tests/fiber.md

@@ -191,21 +191,23 @@ Cancelled from parent:
 Exception: Failure "Parent cancel".
 ```
 
-Cancelled from parent while already cancelling:
+Cancelled from parent while already cancelling
+(we return the value despite the cancellation):
 
 ```ocaml
 # run @@ fun () ->
   Fiber.both
     (fun () ->
-      let _ = Fiber.first
+      traceln "%s" @@ Fiber.first
         (fun () -> "a")
-        (fun () -> Fiber.yield (); failwith "cancel-b")
-      in
+        (fun () -> Fiber.yield (); failwith "cancel-b");
+      Fiber.check ();
       traceln "Parent cancel failed"
     )
     (fun () -> traceln "Cancelling parent"; failwith "Parent cancel");
   "not-reached";;
 +Cancelling parent
++a
 Exception: Failure "Parent cancel".
 ```