aboutsummaryrefslogtreecommitdiff
path: root/lib/control.ml
diff options
context:
space:
mode:
authorPierre-Marie Pédrot2020-01-28 13:31:51 +0100
committerPierre-Marie Pédrot2020-01-28 13:31:51 +0100
commitb105077dd42e34f19d0849620fec2837e84b4887 (patch)
tree217628a17b0d335d8ad453bf7bab34a2b68227fe /lib/control.ml
parent36c61df9435ce382084ddb097ffe0c7b2e220cbb (diff)
parentc825bc9caf3abb9610310b79f9420688f06bdf54 (diff)
Merge PR #11379: [ocaml] Remove Custom Backtrace module in favor of OCaml's
Reviewed-by: ppedrot
Diffstat (limited to 'lib/control.ml')
-rw-r--r--lib/control.ml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/control.ml b/lib/control.ml
index 7d54838df8..e67e88ee95 100644
--- a/lib/control.ml
+++ b/lib/control.ml
@@ -38,7 +38,7 @@ let unix_timeout n f x e =
restore_timeout ();
res
with e ->
- let e = Backtrace.add_backtrace e in
+ let e = Exninfo.capture e in
restore_timeout ();
Exninfo.iraise e
@@ -76,7 +76,7 @@ let windows_timeout n f x e =
else raise e
| e ->
let () = killed := true in
- let e = Backtrace.add_backtrace e in
+ let e = Exninfo.capture e in
Exninfo.iraise e
type timeout = { timeout : 'a 'b. int -> ('a -> 'b) -> 'a -> exn -> 'b }
@@ -102,7 +102,7 @@ let protect_sigalrm f x =
| true, Sys.Signal_handle f -> f Sys.sigalrm; res
| _, _ -> res
with e ->
- let e = Backtrace.add_backtrace e in
+ let e = Exninfo.capture e in
Sys.set_signal Sys.sigalrm old_handler;
Exninfo.iraise e
with Invalid_argument _ -> (* This happens on Windows, as handling SIGALRM does not seem supported *)