Lwt 6 only await and events

.github/workflows/workflow.yml

@@ -15,23 +15,22 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - "4.14"
-          - "5.0"
           - "5.1"
           - "5.2"
           - "5.3"
+          - "5.4"
         libev:
           - true
           - false
         include:
           - os: ubuntu-24.04-arm
-            ocaml-compiler: "5.3"
+            ocaml-compiler: "5.4"
             libev: false
           - os: macos-latest
-            ocaml-compiler: "5.3"
+            ocaml-compiler: "5.4"
             libev: false
           - os: windows-latest
-            ocaml-compiler: "5.3"
+            ocaml-compiler: "5.4"
             libev: false
 
     runs-on: ${{ matrix.os }}
@@ -47,7 +46,7 @@ jobs:
             "4.14"|"5.0")
               :
               ;;
-            "5.1"|"5.2"|"5.3")
+            "5.1"|"5.2"|"5.3"|"5.4")
               opampkgs="${opampkgs} ./lwt_ppx__ppx_let_tests.opam"
               dunepkgs="${dunepkgs},lwt_ppx__ppx_let_tests"
               ;;
@@ -60,7 +59,7 @@ jobs:
             "4.14")
               :
               ;;
-            "5.0"|"5.1"|"5.2"|"5.3")
+            "5.0"|"5.1"|"5.2"|"5.3"|"5.4")
               opampkgs="${opampkgs} ./lwt_direct.opam"
               dunepkgs="${dunepkgs},lwt_direct"
               ;;
@@ -69,6 +68,19 @@ jobs:
               exit 1
               ;;
           esac
+          case ${{ matrix.ocaml-compiler }} in
+            "4.14"|"5.0"|"5.1"|"5.2"|"5.3")
+              :
+              ;;
+            "5.4")
+              opampkgs="${opampkgs} ./lwt_runtime_events.opam"
+              dunepkgs="${dunepkgs},lwt_runtime_events"
+              ;;
+            *)
+              printf "unrecognised version %s\n" "${{ matrix.ocaml-compiler }}";
+              exit 1
+              ;;
+          esac
           echo "opampkgs=${opampkgs}"
           echo "opampkgs=${opampkgs}" >> "$GITHUB_OUTPUT"
           echo "dunepkgs=${dunepkgs}"

dune-project

@@ -62,6 +62,15 @@
   base-unix
   (lwt (>= 6))))
 
+(package
+ (name lwt_runtime_events)
+ (version 6.0.0~beta00)
+ (synopsis "Emit runtime events to trace the execution of Lwt programs")
+ (authors "Raphaël Proust")
+ (depends
+  (ocaml (>= 5.1))
+  ))
+
 (package
  (name lwt)
  (version 6.0.0~beta00)
@@ -77,10 +86,9 @@ synchronization primitives. Code can be run in parallel on an opt-in basis.
 ")
  (depends
   (ocaml (>= 4.14))
-  domain_shims
   (cppo (and :build (>= 1.1)))
   (ocamlfind (and :dev (>= 1.7.3-1)))
   (odoc (and :with-doc (>= 2.3)))
   dune-configurator
   ocplib-endian)
- (depopts base-threads base-unix conf-libev))
+ (depopts base-threads base-unix conf-libev lwt_runtime_events))

lwt.opam

@@ -23,14 +23,13 @@ bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
   "dune" {>= "3.15"}
   "ocaml" {>= "4.14"}
-  "domain_shims"
   "cppo" {build & >= "1.1"}
   "ocamlfind" {dev & >= "1.7.3-1"}
   "odoc" {with-doc & >= "2.3"}
   "dune-configurator"
   "ocplib-endian"
 ]
-depopts: ["base-threads" "base-unix" "conf-libev"]
+depopts: ["base-threads" "base-unix" "conf-libev" "lwt_runtime_events"]
 dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
   ["dune" "subst"] {dev}

lwt_runtime_events.opam

@@ -0,0 +1,32 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+version: "6.0.0~beta00"
+synopsis: "Emit runtime events to trace the execution of Lwt programs"
+maintainer: [
+  "Raphaël Proust <[email protected]>" "Anton Bachin <[email protected]>"
+]
+authors: ["Raphaël Proust"]
+license: "MIT"
+homepage: "https://github.com/ocsigen/lwt"
+doc: "https://ocsigen.org/lwt"
+bug-reports: "https://github.com/ocsigen/lwt/issues"
+depends: [
+  "dune" {>= "3.15"}
+  "ocaml" {>= "5.1"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/ocsigen/lwt.git"

src/core/dune

@@ -2,7 +2,10 @@
  (public_name lwt)
  (synopsis "Monadic promises and concurrent I/O")
  (wrapped false)
- (libraries domain_shims))
+ (libraries
+ (select lwt_rte.ml from
+  (lwt_runtime_events -> lwt_rte.with.ml)
+  (-> lwt_rte.without.ml))))
 
 (documentation
  (package lwt))