Skip to content

avoid overriding the user's OCAMLRUNPARAM settings #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gasche wants to merge 1 commit into
base: main
Choose a base branch
from
Open

avoid overriding the user's OCAMLRUNPARAM settings #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions lib/olly_common/launch.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,24 @@ let exec_process (config : runtime_events_config) (argsl : string list) :
raise (Fail (Printf.sprintf "file %s is not a directory" dir));

let env =
Array.append
[|
(* See https://ocaml.org/manual/5.3/runtime-tracing.html#s:runtime-tracing-environment-variables *)
"OCAML_RUNTIME_EVENTS_START=1";
"OCAML_RUNTIME_EVENTS_DIR=" ^ dir;
"OCAML_RUNTIME_EVENTS_PRESERVE=1";
((* See https://ocaml.org/manual/5.3/runtime.html#s:ocamlrun-options *)
let log_wsize =
match config.log_wsize with
| Some i -> "e=" ^ Int.to_string i
| None -> ""
in
"OCAMLRUNPARAM=" ^ log_wsize);
|]
(Unix.environment ())
Array.concat
[
[|
(* See https://ocaml.org/manual/5.3/runtime-tracing.html#s:runtime-tracing-environment-variables *)
"OCAML_RUNTIME_EVENTS_START=1";
"OCAML_RUNTIME_EVENTS_DIR=" ^ dir;
"OCAML_RUNTIME_EVENTS_PRESERVE=1";
|];
(* See https://ocaml.org/manual/5.3/runtime.html#s:ocamlrun-options *)
(match config.log_wsize with
| None -> [||]
| Some i -> (
let event_log = "e=" ^ Int.to_string i in
match Sys.getenv_opt "OCAMLRUNPARAM" with
| None -> [| "OCAMLRUNPARAM=" ^ event_log |]
| Some params -> [| "OCAMLRUNPARAM=" ^ params ^ "," ^ event_log |]));
Unix.environment ();
]
in
let child_pid =
try
Expand Down
Loading