From 69bd080c843d457eb6543ab9e8a4c88da11f7939 Mon Sep 17 00:00:00 2001 From: Sudha Parimala Date: Mon, 31 Oct 2022 10:32:31 +0530 Subject: [PATCH 1/2] Lwt_domain: update to domainslib.0.5.0 --- lwt_domain.opam | 2 +- src/domain/lwt_domain.ml | 4 ++-- src/domain/lwt_domain.mli | 4 ++-- test/domain/test_lwt_domain.ml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lwt_domain.opam b/lwt_domain.opam index b4604da98..3d96347ac 100644 --- a/lwt_domain.opam +++ b/lwt_domain.opam @@ -20,7 +20,7 @@ depends: [ "dune" {>= "1.8.0"} "lwt" {>= "3.0.0"} "ocaml" {>= "4.08"} - "domainslib" {>= "0.3.2"} + "domainslib" {>= "0.5.0"} "base-domains" ] diff --git a/src/domain/lwt_domain.ml b/src/domain/lwt_domain.ml index 00e124369..71ef49629 100644 --- a/src/domain/lwt_domain.ml +++ b/src/domain/lwt_domain.ml @@ -5,8 +5,8 @@ module T = Domainslib.Task type pool = Domainslib.Task.pool -let setup_pool ?name num_additional_domains = - T.setup_pool ?name ~num_additional_domains () +let setup_pool ?name num_domains = + T.setup_pool ?name ~num_domains () let teardown_pool = T.teardown_pool diff --git a/src/domain/lwt_domain.mli b/src/domain/lwt_domain.mli index eb543ec5d..60603e8ab 100644 --- a/src/domain/lwt_domain.mli +++ b/src/domain/lwt_domain.mli @@ -56,8 +56,8 @@ is recommended to use this function sparingly. *) val setup_pool : ?name:string -> int -> pool - (** [setup_pool name num_additional_domains] returns a task pool with - [num_additional_domains] domains including the current domain. + (** [setup_pool name num_domains] returns a task pool with + [num_domains] new domains. It is recommended to use this function to create a pool once before calling [Lwt_main.run] and to not call it again afterwards. To resize the diff --git a/test/domain/test_lwt_domain.ml b/test/domain/test_lwt_domain.ml index 0face6c22..d3a4f93d4 100644 --- a/test/domain/test_lwt_domain.ml +++ b/test/domain/test_lwt_domain.ml @@ -56,7 +56,7 @@ let lwt_domain_test = [ (fun _ -> Lwt.return_false) (fun exn -> Lwt.return (exn = Invalid_argument - "Task.setup_pool: num_additional_domains must be at least 0")) + "Task.setup_pool: num_domains must be at least 0")) end; test "detach_exception" begin fun () -> let pool = Option.get (Lwt_domain.lookup_pool "pool_1") in From f79d25f6fedd4749d40568b0996e2acd72ceb7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Thu, 3 Nov 2022 11:21:19 +0100 Subject: [PATCH 2/2] Remove workflow that is not useful anymore --- .github/workflows/workflow.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a3a8cb259..ab8673dee 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -42,12 +42,6 @@ jobs: local-packages: | *.opam !lwt_domain.opam - - os: ubuntu-latest - ocaml-compiler: ocaml-variants.4.12.0+domains - libev: false - ppx: true - domain: true - local-packages: "*.opam" - os: macos-latest ocaml-compiler: 4.14.x libev: true