Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
(description "An Lwt engine that allows running Lwt within an Eio event loop.")
(depends
(eio (>= 0.13))
(lwt (>= 5.7.0))
(lwt (>= 6.1.0))
(mdx (and (>= 1.10.0) :with-test))
(eio_main :with-test)))
(using mdx 0.2)
4 changes: 4 additions & 0 deletions lib/lwt_eio.ml
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,13 @@ let install_sigchld_handler = lazy (
)
)

type Lwt_engine.engine_id += Engine_id__Eio_lwt

let make_engine ~sw ~clock = object
inherit Lwt_engine.abstract

method id = Engine_id__Eio_lwt

method private cleanup =
try Switch.fail sw Exit
with Invalid_argument _ -> () (* Already destroyed *)
Expand Down
2 changes: 1 addition & 1 deletion lwt_eio.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bug-reports: "https://github.com/ocaml-multicore/lwt_eio/issues"
depends: [
"dune" {>= "3.8"}
"eio" {>= "0.13"}
"lwt" {>= "5.7.0"}
"lwt" {>= "6.1.0"}
"mdx" {>= "1.10.0" & with-test}
"eio_main" {with-test}
"odoc" {with-doc}
Expand Down
14 changes: 7 additions & 7 deletions test/test.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,20 @@ Lwt and Eio fibers don't block each other:
);;
+eio: i = 1
+ lwt: i = 1
+ lwt: i = 2
+eio: i = 2
+ lwt: i = 3
+ lwt: i = 2
+eio: i = 3
+ lwt: i = 4
+ lwt: i = 3
+eio: i = 4
+ lwt: i = 5
+ lwt: i = 4
+eio: i = 5
+ lwt: i = 6
+ lwt: i = 5
+eio: i = 6
+ lwt: i = 7
+ lwt: i = 6
+eio: i = 7
+ lwt: i = 8
+ lwt: i = 7
+eio: i = 8
+ lwt: i = 8
- : unit = ()
```

Expand Down