From 77843fbbedea493124f58b6be265da27667dd91e Mon Sep 17 00:00:00 2001 From: James Hinshelwood Date: Fri, 16 May 2025 11:33:54 +0100 Subject: [PATCH] Add optional memtrace --- package.json | 3 ++- scilla.opam | 1 + src/runners/dune | 2 +- src/runners/scilla_server_http.ml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 841862b85..8f346de08 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,8 @@ "@opam/stdint": ">=0.5.1 <0.8.0", "@opam/yojson": ">=1.7.0 <2.1.0", "@opam/opium": ">=0.20.0 <1.0.0", - "@opam/ezcurl": ">=0.2.4 <0.3.0" + "@opam/ezcurl": ">=0.2.4 <0.3.0", + "@opam/memtrace": ">=0.2.3 <0.3.0" }, "devDependencies": { "@opam/merlin": "*", diff --git a/scilla.opam b/scilla.opam index 6b8d4d718..db1e7348b 100644 --- a/scilla.opam +++ b/scilla.opam @@ -51,6 +51,7 @@ depends: [ "yojson" {>= "1.7.0" & < "2.1~"} "opium" {>= "0.20.0" & < "1.0.0"} "ezcurl" {>= "0.2.4" & < "0.3.0"} + "memtrace" {>= "0.2.3" & < "0.3.0"} ] build: [ [ "./scripts/build_deps.sh" ] diff --git a/src/runners/dune b/src/runners/dune index c213077c3..dbdadbf77 100644 --- a/src/runners/dune +++ b/src/runners/dune @@ -8,7 +8,7 @@ disambiguate_state_json scilla_fmt scilla_merger scilla_server_http) (libraries core core_unix.command_unix angstrom yojson cryptokit fileutils scilla_base scilla_eval scilla_server_lib scilla_crypto scilla_format - scilla_merge cmdliner opium) + scilla_merge cmdliner opium memtrace) (modes byte native) (preprocess (pps ppx_sexp_conv ppx_deriving_yojson ppx_let ppx_deriving.show bisect_ppx --conditional))) diff --git a/src/runners/scilla_server_http.ml b/src/runners/scilla_server_http.ml index 1d594abdf..40097399a 100644 --- a/src/runners/scilla_server_http.ml +++ b/src/runners/scilla_server_http.ml @@ -66,6 +66,7 @@ let run_handler req = ;; let _ = + Memtrace.trace_if_requested ~context:"scilla-server" (); App.empty |> App.post "/run" (Error_checking_mutex.synchronize run_handler) |> App.run_command