diff --git a/src/dune b/src/dune index 7772f29..f26ef78 100644 --- a/src/dune +++ b/src/dune @@ -9,10 +9,3 @@ (action (with-stdout-to %{targets} (run ./gen/gen.exe --ocaml %{ocaml_version} --atomic)))) - -(rule - (targets domain_.ml) - (action - (with-stdout-to %{targets} - (run ./gen/gen.exe --ocaml %{ocaml_version} --domain)))) - diff --git a/src/gen/gen.ml b/src/gen/gen.ml index 9e6b91e..4485bb6 100644 --- a/src/gen/gen.ml +++ b/src/gen/gen.ml @@ -45,25 +45,14 @@ let atomic_post_412 = {| include Atomic |} -let domain_pre_5 = {| - -let relax () = Thread.yield () -|} - -let domain_post_5 = {| -let relax = Domain.cpu_relax -|} - let p_version s = Scanf.sscanf s "%d.%d" (fun x y -> x, y) let () = let atomic = ref false in - let domain = ref false in let ocaml = ref Sys.ocaml_version in Arg.parse [ "--atomic", Arg.Set atomic, " atomic"; - "--domain", Arg.Set domain, " domain"; "--ocaml", Arg.Set_string ocaml, " set ocaml version"; ] ignore ""; @@ -78,12 +67,4 @@ let () = atomic_post_412 in print_endline code - ) else if !domain then ( - let code = - if (major, minor) < (5, 0) then - domain_pre_5 - else - domain_post_5 - in - print_endline code ) diff --git a/src/tef/trace_tef.mli b/src/tef/trace_tef.mli index 8693ee1..6134782 100644 --- a/src/tef/trace_tef.mli +++ b/src/tef/trace_tef.mli @@ -1,5 +1,3 @@ -open Trace - val collector : out:[ `File of string | `Stderr | `Stdout ] -> unit -> Trace.collector (** Make a collector that writes into the given output. diff --git a/src/trace.ml b/src/trace.ml index f6d1410..17f5502 100644 --- a/src/trace.ml +++ b/src/trace.ml @@ -83,7 +83,7 @@ let setup_collector c : unit = | Some _ -> invalid_arg "trace: collector already present" | None -> not (A.compare_and_set collector cur (Some c)) do - Domain_.relax () + () done let shutdown () =