CP-32622: Delay: replace select with time_limited_read

Signed-off-by: Edwin Török <[email protected]>

dune-project

@@ -337,6 +337,7 @@
     (odoc :with-doc)
     (xapi-stdext-pervasives (= :version))
     (mtime :with-test)
+    (xapi-stdext-unix (= :version))
   )
 )
 

ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/dune

@@ -5,6 +5,7 @@
   (libraries
     threads.posix
     unix
+    xapi-stdext-unix
     xapi-stdext-pervasives)
 )
 (test

ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/threadext.ml

@@ -86,11 +86,15 @@ module Delay = struct
                 pipe_out
             )
           in
-          let r, _, _ = Unix.select [pipe_out] [] [] seconds in
+          let open Xapi_stdext_unix.Unixext in
           (* flush the single byte from the pipe *)
-          if r <> [] then ignore (Unix.read pipe_out (Bytes.create 1) 0 1) ;
+          try
+            let (_ : string) =
+              time_limited_single_read pipe_out 1 ~max_wait:seconds
+            in
+            false
+          with Timeout -> true
           (* return true if we waited the full length of time, false if we were woken *)
-          r = []
         with Pre_signalled -> false
       )
       (fun () ->

xapi-stdext-threads.opam

@@ -14,6 +14,7 @@ depends: [
   "odoc" {with-doc}
   "xapi-stdext-pervasives" {= version}
   "mtime" {with-test}
+  "xapi-stdext-unix" {= version}
 ]
 build: [
   ["dune" "subst"] {dev}