From 11a693f524732e5594f8b240d48b0dad27ccc4aa Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Mon, 13 Oct 2025 15:42:44 +0200 Subject: [PATCH] Manifest: from eio_main to eio_posix --- brassaia-eio/test/brassaia-mem/dune | 2 +- brassaia-eio/test/brassaia-mem/test.ml | 2 +- brassaia-eio/test/brassaia-pack/dune | 2 +- brassaia-eio/test/brassaia/generic-key/dune | 2 +- brassaia-eio/test/brassaia/generic-key/test.ml | 2 +- manifest/externals.ml | 2 +- manifest/product_octez.ml | 8 ++++---- opam/octez-libs.opam | 2 +- opam/tezos_internal_brassaia_eio_tests.opam | 2 +- opam/virtual/octez-deps.opam | 2 +- src/lib_base/unix/dune | 2 +- src/lib_base/unix/event_loop.ml | 6 +++--- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/brassaia-eio/test/brassaia-mem/dune b/brassaia-eio/test/brassaia-mem/dune index b35f57312daa..e6b0acc6a03e 100644 --- a/brassaia-eio/test/brassaia-mem/dune +++ b/brassaia-eio/test/brassaia-mem/dune @@ -11,7 +11,7 @@ octez-libs.brassaia_eio.mem octez-libs.brassaia_eio_test_helpers octez-libs.test-helpers - eio_main + eio_posix tezt) (library_flags (:standard -linkall)) (flags diff --git a/brassaia-eio/test/brassaia-mem/test.ml b/brassaia-eio/test/brassaia-mem/test.ml index 56fdfd3e8d11..0c634ce13c8f 100644 --- a/brassaia-eio/test/brassaia-mem/test.ml +++ b/brassaia-eio/test/brassaia-mem/test.ml @@ -15,7 +15,7 @@ *) let () = - Eio_main.run @@ fun _ -> + Eio_posix.run @@ fun _ -> Brassaia_eio_test_helpers.Brassaia_test.Store.run ~__FILE__ "brassaia-eio-mem" diff --git a/brassaia-eio/test/brassaia-pack/dune b/brassaia-eio/test/brassaia-pack/dune index 0f87319cdc34..4f208730d4c6 100644 --- a/brassaia-eio/test/brassaia-pack/dune +++ b/brassaia-eio/test/brassaia-pack/dune @@ -17,7 +17,7 @@ octez-libs.test-helpers octez-alcotezt fpath - eio_main + eio_posix tezt) (preprocess (pps octez-libs.ppx_brassaia_eio.internal)) (library_flags (:standard -linkall)) diff --git a/brassaia-eio/test/brassaia/generic-key/dune b/brassaia-eio/test/brassaia/generic-key/dune index 7e52def0bcb6..df70660e13d4 100644 --- a/brassaia-eio/test/brassaia/generic-key/dune +++ b/brassaia-eio/test/brassaia/generic-key/dune @@ -11,7 +11,7 @@ octez-libs.base.unix octez-libs.brassaia_eio_test_helpers octez-libs.brassaia_eio.mem - eio_main + eio_posix vector octez-libs.stdlib-unix octez-libs.test-helpers diff --git a/brassaia-eio/test/brassaia/generic-key/test.ml b/brassaia-eio/test/brassaia/generic-key/test.ml index a233f59ecd7a..6b0d11ae93e4 100644 --- a/brassaia-eio/test/brassaia/generic-key/test.ml +++ b/brassaia-eio/test/brassaia/generic-key/test.ml @@ -15,7 +15,7 @@ *) let () = - Eio_main.run @@ fun _env -> + Eio_posix.run @@ fun _env -> Brassaia_eio_test_helpers.Brassaia_test.Store.run ~__FILE__ "brassaia-eio/generic-key" diff --git a/manifest/externals.ml b/manifest/externals.ml index a44d9eed3469..75bb08093c72 100644 --- a/manifest/externals.ml +++ b/manifest/externals.ml @@ -129,7 +129,7 @@ let dynlink = external_lib "dynlink" V.True ~opam:"" let eio = external_lib "eio" V.True -let eio_main = external_lib "eio_main" V.True +let eio_posix = external_lib "eio_posix" V.True let lwt_eio = external_lib "lwt_eio" V.True diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index d58fefa1c03d..fadbb28e4e2b 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -1884,7 +1884,7 @@ let octez_base_unix = lwt_exit; terminal; eio; - eio_main; + eio_posix; lwt_eio; ] ~inline_tests:ppx_expect @@ -3293,7 +3293,7 @@ let _brassaia_eio_generic_key_tests = octez_base_unix; brassaia_eio_test_helpers |> open_; brassaia_eio_mem; - eio_main; + eio_posix; vector; octez_stdlib_unix |> open_; octez_test_helpers |> open_; @@ -3399,7 +3399,7 @@ let _brassaia_eio_mem_tests = brassaia_eio_mem; brassaia_eio_test_helpers; octez_test_helpers |> open_; - eio_main; + eio_posix; tezt_lib |> open_ |> open_ ~m:"Base"; ] @@ -3572,7 +3572,7 @@ let _brassaia_eio_pack_tests = octez_test_helpers |> open_; alcotezt; fpath; - eio_main; + eio_posix; tezt_lib |> open_ |> open_ ~m:"Base"; ] ~preprocess:(pps ppx_brassaia_eio_internal) diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 50f3a46580f5..47c28081eb9a 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -62,7 +62,7 @@ depends: [ "terminal" "uutf" "eio" - "eio_main" + "eio_posix" "lwt_eio" "ppxlib" { >= "0.34.0" } "opentelemetry" { >= "0.12" } diff --git a/opam/tezos_internal_brassaia_eio_tests.opam b/opam/tezos_internal_brassaia_eio_tests.opam index 9d11c6122d03..f5419b3e081b 100644 --- a/opam/tezos_internal_brassaia_eio_tests.opam +++ b/opam/tezos_internal_brassaia_eio_tests.opam @@ -17,7 +17,7 @@ depends: [ "octez-shell-libs" {with-test} "octez-alcotezt" {with-test} "eio" {with-test} - "eio_main" {with-test} + "eio_posix" {with-test} "fpath" {with-test} "vector" {with-test} ] diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index c4202e0a0229..e2eea7440e25 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -51,7 +51,7 @@ depends: [ "dream" { >= "1.0.0~alpha8-octez" } "dune-configurator" "eio" - "eio_main" + "eio_posix" "eqaf" "ezgzip" "ezjsonm" { >= "1.3.0" } diff --git a/src/lib_base/unix/dune b/src/lib_base/unix/dune index ed321f037686..7cf2ae3b8c82 100644 --- a/src/lib_base/unix/dune +++ b/src/lib_base/unix/dune @@ -19,7 +19,7 @@ lwt-exit terminal eio - eio_main + eio_posix lwt_eio) (inline_tests (flags -verbose) diff --git a/src/lib_base/unix/event_loop.ml b/src/lib_base/unix/event_loop.ml index 5fb36cdf8451..8ba65d8d8abc 100644 --- a/src/lib_base/unix/event_loop.ml +++ b/src/lib_base/unix/event_loop.ml @@ -30,7 +30,7 @@ let on_main_run callback = let init_eio_loop ~env ~switch () = (* Having [!instance <> None] should only happen if [main_run] is - called within [main_run]. It will be caught up by [eio_main.main_run] + called within [main_run]. It will be caught up by [eio_posix.main_run] but we can [assert false] just in case the error is not caught for some reason. *) assert (!instance = None) ; @@ -41,7 +41,7 @@ let main_run ?(eio = false) ~process_name promise = Gc_setup.set_gc_space_overhead process_name ; if eio then ( let debug = Sys.getenv_opt "LWT_EIO_DEBUG" <> None in - Eio_main.run @@ fun env -> + Eio_posix.run @@ fun env -> Lwt_eio.with_event_loop ~debug ~clock:env#clock @@ fun () -> Eio.Switch.run @@ fun switch -> init_eio_loop ~env ~switch () ; @@ -64,7 +64,7 @@ let main_run ?(eio = false) ~process_name promise = else Lwt_main.run @@ promise () let main_run_eio promise = - Eio_main.run @@ fun env -> + Eio_posix.run @@ fun env -> Eio.Switch.run @@ fun switch -> init_eio_loop ~env ~switch () ; let res = promise env in -- GitLab