Merge core and src directories

The split made sense back when we were pursuing a direct backend, but now it only serves to confuse. Signed-off-by: Tudor Brindus <[email protected]>
janestreet · Jun 3, 2024 · d3a25d3 · d3a25d3
1 parent 65e53d1
commit d3a25d3
Show file tree

Hide file tree

Showing 69 changed files with 12 additions and 67 deletions.
diff --git a/core/dune b/core/dune
diff --git a/core/backend_intf.ml → src/backend_intf.ml b/core/backend_intf.ml → src/backend_intf.ml
diff --git a/src/breakpoint.ml b/src/breakpoint.ml
@@ -1,5 +1,4 @@
 open! Core
-open! Import
 
 type t
 

diff --git a/src/callstack_compression.ml b/src/callstack_compression.ml
@@ -3,7 +3,6 @@
    (callstacks and backtraces are essentially the same) *)
 
 open Core
-open Import
 
 type t =
   { symbol_to_id : (Symbol.t, int) Hashtbl.t

diff --git a/src/callstack_compression.mli b/src/callstack_compression.mli
@@ -1,5 +1,4 @@
 open Core
-open Import
 
 type t =
   { symbol_to_id : (Symbol.t, int) Hashtbl.t

diff --git a/core/collection_mode.ml → src/collection_mode.ml b/core/collection_mode.ml → src/collection_mode.ml
diff --git a/core/collection_mode.mli → src/collection_mode.mli b/core/collection_mode.mli → src/collection_mode.mli
diff --git a/core/decode_result.ml → src/decode_result.ml b/core/decode_result.ml → src/decode_result.ml
diff --git a/core/decode_result.mli → src/decode_result.mli b/core/decode_result.mli → src/decode_result.mli
diff --git a/core/demangle_ocaml_symbols.ml → src/demangle_ocaml_symbols.ml b/core/demangle_ocaml_symbols.ml → src/demangle_ocaml_symbols.ml
diff --git a/core/demangle_ocaml_symbols.mli → src/demangle_ocaml_symbols.mli b/core/demangle_ocaml_symbols.mli → src/demangle_ocaml_symbols.mli
diff --git a/src/dune b/src/dune
@@ -17,7 +17,7 @@
   (names breakpoint_stubs boot_time_stubs ptrace_stubs))
  (libraries core async core_unix.filename_unix fzf re shell
    core_unix.sys_unix cohttp cohttp_static_handler core_unix.signal_unix
-   tracing magic_trace magic_trace_core)
+   tracing magic_trace owee angstrom expect_test_helpers_core)
  (inline_tests)
  (preprocess
   (pps ppx_jane)))
diff --git a/core/elf.ml → src/elf.ml b/core/elf.ml → src/elf.ml
diff --git a/core/elf.mli → src/elf.mli b/core/elf.mli → src/elf.mli
diff --git a/core/elf_intf.ml → src/elf_intf.ml b/core/elf_intf.ml → src/elf_intf.ml
diff --git a/core/env_vars.ml → src/env_vars.ml b/core/env_vars.ml → src/env_vars.ml
diff --git a/core/env_vars.mli → src/env_vars.mli b/core/env_vars.mli → src/env_vars.mli
diff --git a/core/errno.ml → src/errno.ml b/core/errno.ml → src/errno.ml
diff --git a/core/errno.mli → src/errno.mli b/core/errno.mli → src/errno.mli
diff --git a/core/event.ml → src/event.ml b/core/event.ml → src/event.ml
diff --git a/core/event.mli → src/event.mli b/core/event.mli → src/event.mli
diff --git a/src/for_range.ml b/src/for_range.ml
@@ -1,6 +1,5 @@
 open! Core
 open! Async
-open! Import
 
 module Symbol_hit = struct
   module Kind = struct

diff --git a/src/for_range.mli b/src/for_range.mli
@@ -1,9 +1,8 @@
 open! Core
 open! Async
-open! Import
 
 val decode_events_and_annotate
-  :  decode_events:(unit -> Import.Decode_result.t Deferred.Or_error.t)
+  :  decode_events:(unit -> Decode_result.t Deferred.Or_error.t)
   -> range_symbols:Trace_filter.t
   -> (Event.With_write_info.t Async.Pipe.Reader.t list * unit Deferred.Or_error.t)
        Deferred.Or_error.t
diff --git a/src/import.ml b/src/import.ml
diff --git a/core/ocaml_exception_info.ml → src/ocaml_exception_info.ml b/core/ocaml_exception_info.ml → src/ocaml_exception_info.ml
diff --git a/core/ocaml_exception_info.mli → src/ocaml_exception_info.mli b/core/ocaml_exception_info.mli → src/ocaml_exception_info.mli
diff --git a/src/perf_decode.ml b/src/perf_decode.ml
@@ -1,6 +1,5 @@
 open! Core
 open! Async
-open! Import
 
 let saturating_sub_i64 a b =
   match Int64.(to_int (a - b)) with

diff --git a/src/perf_decode.mli b/src/perf_decode.mli
@@ -2,7 +2,6 @@
 
 open! Core
 open! Async
-open! Import
 
 val to_events
   :  ?perf_maps:Perf_map.Table.t

diff --git a/core/perf_map.ml → src/perf_map.ml b/core/perf_map.ml → src/perf_map.ml
diff --git a/core/perf_map.mli → src/perf_map.mli b/core/perf_map.mli → src/perf_map.mli
diff --git a/core/perf_map_location.ml → src/perf_map_location.ml b/core/perf_map_location.ml → src/perf_map_location.ml
diff --git a/core/perf_map_location.mli → src/perf_map_location.mli b/core/perf_map_location.mli → src/perf_map_location.mli
diff --git a/src/perf_tool_backend.ml b/src/perf_tool_backend.ml
@@ -1,6 +1,5 @@
 open! Core
 open! Async
-open! Import
 
 (* PAGER=cat because perf spawns [less] if you get the arguments wrong, and that keeps the
    parent process alive even though it just failed. That, in turn, makes magic-trace stop

diff --git a/src/perf_tool_backend.mli b/src/perf_tool_backend.mli
@@ -1,4 +1,2 @@
 (** A backend that uses the [perf] command line tool for recording and decoding *)
-open! Import
-
 include Backend_intf.S
diff --git a/src/process_info.ml b/src/process_info.ml
@@ -1,5 +1,4 @@
 open! Core
-open! Import
 
 module Entry = struct
   module Cmdline = struct

diff --git a/src/process_info.mli b/src/process_info.mli
@@ -1,5 +1,4 @@
 open! Core
-open! Import
 
 module Entry : sig
   module Cmdline : sig

diff --git a/src/real_trace.ml b/src/real_trace.ml
@@ -1,5 +1,4 @@
 open! Core
-open! Import
 open Trace_writer_intf
 
 let create (trace : Tracing.Trace.t) =

diff --git a/src/real_trace.mli b/src/real_trace.mli
@@ -1,5 +1,4 @@
 open! Core
-open! Import
 open Trace_writer_intf
 
 (* Creates an abstract [S_trace] out of a real [Tracing] backend. I know this isn't a great reason,

diff --git a/core/subcommand.ml → src/subcommand.ml b/core/subcommand.ml → src/subcommand.ml
diff --git a/core/subcommand.mli → src/subcommand.mli b/core/subcommand.mli → src/subcommand.mli
diff --git a/core/symbol.ml → src/symbol.ml b/core/symbol.ml → src/symbol.ml
diff --git a/core/symbol.mli → src/symbol.mli b/core/symbol.mli → src/symbol.mli
diff --git a/core/symbol_selection.ml → src/symbol_selection.ml b/core/symbol_selection.ml → src/symbol_selection.ml
diff --git a/core/symbol_selection.mli → src/symbol_selection.mli b/core/symbol_selection.mli → src/symbol_selection.mli
diff --git a/core/timer_resolution.ml → src/timer_resolution.ml b/core/timer_resolution.ml → src/timer_resolution.ml
diff --git a/core/timer_resolution.mli → src/timer_resolution.mli b/core/timer_resolution.mli → src/timer_resolution.mli
diff --git a/src/trace.ml b/src/trace.ml
@@ -2,7 +2,6 @@
 
 open! Core
 open! Async
-open! Import
 
 let supports_command command =
   Lazy.from_fun (fun () ->

diff --git a/src/trace.mli b/src/trace.mli
@@ -1,6 +1,5 @@
 open! Core
 open! Async
-open! Import
 
 val command : Command.t
 

diff --git a/core/trace_filter.ml → src/trace_filter.ml b/core/trace_filter.ml → src/trace_filter.ml
diff --git a/core/trace_filter.mli → src/trace_filter.mli b/core/trace_filter.mli → src/trace_filter.mli
diff --git a/core/trace_scope.ml → src/trace_scope.ml b/core/trace_scope.ml → src/trace_scope.ml
diff --git a/core/trace_scope.mli → src/trace_scope.mli b/core/trace_scope.mli → src/trace_scope.mli
diff --git a/core/trace_state_change.ml → src/trace_state_change.ml b/core/trace_state_change.ml → src/trace_state_change.ml
diff --git a/core/trace_state_change.mli → src/trace_state_change.mli b/core/trace_state_change.mli → src/trace_state_change.mli
diff --git a/src/trace_writer.ml b/src/trace_writer.ml
@@ -1,5 +1,4 @@
 open! Core
-open! Import
 
 let debug = ref false
 let is_kernel_address addr = Int64.(addr < 0L)

diff --git a/src/trace_writer.mli b/src/trace_writer.mli
@@ -1,5 +1,4 @@
 open! Core
-open! Import
 
 (* Enable this in tests to see [t] after every perf event. Don't forget to disable it when
    you're done!

diff --git a/src/trace_writer_intf.ml b/src/trace_writer_intf.ml
@@ -1,5 +1,4 @@
 open! Core
-open! Import
 
 module type S_trace = sig
   type thread

diff --git a/src/tracing_tool_output.ml b/src/tracing_tool_output.ml
@@ -1,6 +1,5 @@
 open! Core
 open! Async
-open! Import
 
 module Serve = struct
   type enabled =

diff --git a/core/util.ml → src/util.ml b/core/util.ml → src/util.ml
diff --git a/core/util.mli → src/util.mli b/core/util.mli → src/util.mli
diff --git a/core/when_to_snapshot.ml → src/when_to_snapshot.ml b/core/when_to_snapshot.ml → src/when_to_snapshot.ml
diff --git a/core/when_to_snapshot.mli → src/when_to_snapshot.mli b/core/when_to_snapshot.mli → src/when_to_snapshot.mli
diff --git a/test/callstack_compression_test.ml b/test/callstack_compression_test.ml
@@ -1,6 +1,5 @@
 open Core
 open Magic_trace_lib
-open Import
 
 let compressed_test_string =
   {|(

diff --git a/test/demangle_ocaml_symbols.ml b/test/demangle_ocaml_symbols.ml
@@ -1,8 +1,7 @@
 open! Core
-open Magic_trace_core
 
 let demangle_symbol_test symbol =
-  let demangle_symbol = Demangle_ocaml_symbols.demangle symbol in
+  let demangle_symbol = Magic_trace_lib.Demangle_ocaml_symbols.demangle symbol in
   print_s [%sexp (demangle_symbol : string option)]
 ;;
 

diff --git a/test/dune b/test/dune
@@ -2,6 +2,6 @@
  (name magic_trace_app_test)
  (inline_tests)
  (libraries async core expect_test_helpers_core expect_test_helpers_async
-   magic_trace_lib magic_trace_core)
+   magic_trace_lib)
  (preprocess
   (pps ppx_jane)))
diff --git a/test/ocaml_exceptions.ml b/test/ocaml_exceptions.ml
@@ -30,7 +30,7 @@ open! Async
 
 let%expect_test "A raise_notrace OCaml exception" =
   let ocaml_exception_info =
-    Magic_trace_core.Ocaml_exception_info.create
+    Magic_trace_lib.Ocaml_exception_info.create
       ~entertraps:[| 0x411030L |]
       ~pushtraps:[| 0x41100bL |]
       ~poptraps:[| 0x411026L |]
@@ -91,7 +91,7 @@ let%expect_test "A raise_notrace OCaml exception" =
 
 let%expect_test "a corner case where a call doesn't return directly into a poptrap" =
   let ocaml_exception_info =
-    Magic_trace_core.Ocaml_exception_info.create
+    Magic_trace_lib.Ocaml_exception_info.create
       ~entertraps:[| 0xffffffL (* not used *) |]
       ~pushtraps:[| 0xcb457dL |]
       ~poptraps:[| 0xcb459cL |]
@@ -115,7 +115,7 @@ let%expect_test "a corner case where a call doesn't return directly into a poptr
 
 let%expect_test "the same test case above, as if there was no exception block" =
   let ocaml_exception_info =
-    Magic_trace_core.Ocaml_exception_info.create
+    Magic_trace_lib.Ocaml_exception_info.create
       ~entertraps:[||]
       ~pushtraps:[||]
       ~poptraps:[||]

diff --git a/test/perf_script.ml b/test/perf_script.ml
@@ -1,6 +1,5 @@
 open! Core
 open! Async
-open Magic_trace_core
 open Magic_trace_lib
 module Time_ns = Time_ns_unix
 

diff --git a/test/perf_script.mli b/test/perf_script.mli
@@ -1,6 +1,5 @@
 open! Core
 open! Async
-open! Magic_trace_core
 
 (* Runs some perf script end-to-end through the perf_tool_backend and the trace_writer, printing
    out generated traces as a string.
@@ -17,7 +16,7 @@ open! Magic_trace_core
 val run
   :  ?debug:bool
   -> ?events_writer:Magic_trace_lib.Tracing_tool_output.events_writer
-  -> ?ocaml_exception_info:Ocaml_exception_info.t
-  -> trace_scope:Trace_scope.t
+  -> ?ocaml_exception_info:Magic_trace_lib.Ocaml_exception_info.t
+  -> trace_scope:Magic_trace_lib.Trace_scope.t
   -> Filename.t
   -> unit Deferred.t
diff --git a/test/test.ml b/test/test.ml
@@ -3,7 +3,7 @@ open! Async
 open! Magic_trace_lib.Trace.For_testing
 
 include struct
-  open Magic_trace_core
+  open Magic_trace_lib
   module Decode_result = Decode_result
   module Event = Event
   module Symbol = Symbol
@@ -791,9 +791,9 @@ let%expect_test "filtered trace" =
 ;;
 
 let%expect_test "get debug information from ELF" =
-  let elf = Magic_trace_core.Elf.create "sample-targets/ocaml-raise/sample.exe" in
+  let elf = Magic_trace_lib.Elf.create "sample-targets/ocaml-raise/sample.exe" in
   let debug_table =
-    Magic_trace_core.Elf.addr_table (Option.value_exn elf)
+    Magic_trace_lib.Elf.addr_table (Option.value_exn elf)
     |> Hashtbl.filter ~f:(fun info ->
       match info.filename with
       | Some "sample.ml" -> true