From 78e137f944e4c9d9162d372cd07c24f7361dc948 Mon Sep 17 00:00:00 2001 From: Julien Sagot Date: Tue, 17 Jun 2025 10:02:49 +0200 Subject: [PATCH] Manifest: from eio_posix to eio_main --- 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 +- opam/virtual/octez-deps.opam.locked | 2 +- src/lib_base/unix/dune | 2 +- src/lib_base/unix/event_loop.ml | 6 +++--- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/brassaia-eio/test/brassaia-mem/dune b/brassaia-eio/test/brassaia-mem/dune index e6b0acc6a03e..b35f57312daa 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_posix + eio_main 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 0c634ce13c8f..56fdfd3e8d11 100644 --- a/brassaia-eio/test/brassaia-mem/test.ml +++ b/brassaia-eio/test/brassaia-mem/test.ml @@ -15,7 +15,7 @@ *) let () = - Eio_posix.run @@ fun _ -> + Eio_main.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 4f208730d4c6..0f87319cdc34 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_posix + eio_main 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 df70660e13d4..7e52def0bcb6 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_posix + eio_main 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 6b0d11ae93e4..a233f59ecd7a 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_posix.run @@ fun _env -> + Eio_main.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 4ad58736a461..1a9c073b9870 100644 --- a/manifest/externals.ml +++ b/manifest/externals.ml @@ -125,7 +125,7 @@ let dynlink = external_lib "dynlink" V.True ~opam:"" let eio = external_lib "eio" V.True -let eio_posix = external_lib "eio_posix" V.True +let eio_main = external_lib "eio_main" V.True let lwt_eio = external_lib "lwt_eio" V.True diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index 4874bda8f941..cbcaab9bf307 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -1894,7 +1894,7 @@ let octez_base_unix = lwt_exit; terminal; eio; - eio_posix; + eio_main; lwt_eio; ] ~inline_tests:ppx_expect @@ -3281,7 +3281,7 @@ let _brassaia_eio_generic_key_tests = octez_base_unix; brassaia_eio_test_helpers |> open_; brassaia_eio_mem; - eio_posix; + eio_main; vector; octez_stdlib_unix |> open_; octez_test_helpers |> open_; @@ -3387,7 +3387,7 @@ let _brassaia_eio_mem_tests = brassaia_eio_mem; brassaia_eio_test_helpers; octez_test_helpers |> open_; - eio_posix; + eio_main; tezt_lib |> open_ |> open_ ~m:"Base"; ] @@ -3560,7 +3560,7 @@ let _brassaia_eio_pack_tests = octez_test_helpers |> open_; alcotezt; fpath; - eio_posix; + eio_main; 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 dbe4707dd35e..449a57be6bcf 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -66,7 +66,7 @@ depends: [ "terminal" "uutf" "eio" - "eio_posix" + "eio_main" "lwt_eio" "ppxlib" { >= "0.34.0" } "ambient-context-lwt" { = "0.1.0" } diff --git a/opam/tezos_internal_brassaia_eio_tests.opam b/opam/tezos_internal_brassaia_eio_tests.opam index 40028c51ac59..af2f5967fc64 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_posix" {with-test} + "eio_main" {with-test} "fpath" {with-test} "vector" {with-test} ] diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 50594057402c..c5fd1efa395e 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -49,7 +49,7 @@ depends: [ "dream" { >= "1.0.0~alpha7" } "dune-configurator" "eio" - "eio_posix" + "eio_main" "eqaf" "ezgzip" "ezjsonm" { >= "1.3.0" } diff --git a/opam/virtual/octez-deps.opam.locked b/opam/virtual/octez-deps.opam.locked index c8035522ff1c..e6c4f60feaa1 100644 --- a/opam/virtual/octez-deps.opam.locked +++ b/opam/virtual/octez-deps.opam.locked @@ -94,7 +94,7 @@ depends: [ "duration" {= "0.2.1"} "dyn" {= "3.19.0"} "eio" {= "1.2"} - "eio_posix" {= "1.2"} + "eio_main" {= "1.2"} "either" {= "1.0.0"} "eqaf" {= "0.10"} "ezgzip" {= "0.2.3"} diff --git a/src/lib_base/unix/dune b/src/lib_base/unix/dune index 7cf2ae3b8c82..ed321f037686 100644 --- a/src/lib_base/unix/dune +++ b/src/lib_base/unix/dune @@ -19,7 +19,7 @@ lwt-exit terminal eio - eio_posix + eio_main 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 04b4f081948a..5fb36cdf8451 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_posix.main_run] + called within [main_run]. It will be caught up by [eio_main.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_posix.run @@ fun env -> + Eio_main.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_posix.run @@ fun env -> + Eio_main.run @@ fun env -> Eio.Switch.run @@ fun switch -> init_eio_loop ~env ~switch () ; let res = promise env in -- GitLab