Skip to content

Commit

Permalink
oxenstored: Switch to ocaml-evtchn-unix-minimal
Browse files Browse the repository at this point in the history
This drops the lwt dependency

Signed-off-by: Andrii Sultanov <[email protected]>
  • Loading branch information
last-genius committed Oct 7, 2024
1 parent 11ff051 commit ebcf378
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
(package
(name oxenstored)
(synopsis "Oxenstored")
(depends dune-site lwt lwt-dllist ounit2)
(depends dune-site ounit2)
(sites
(lib plugins)))
2 changes: 0 additions & 2 deletions oxenstored.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ bug-reports: "https://github.com/xapi-project/oxenstored/issues"
depends: [
"dune" {>= "3.15"}
"dune-site"
"lwt"
"lwt-dllist"
"ounit2"
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion oxenstored/dune
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
(:standard \ syslog configure))
(flags
(:standard -w -52))
(libraries unix xenbus xen-evtchn xen-evtchn-unix
(libraries unix xenbus xen-evtchn xen-evtchn-unix-minimal
xengnt xenmmap syslog xsdglue
dune-site dune-site.plugins))

Expand Down
6 changes: 3 additions & 3 deletions oxenstored/event.ml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ let init ?fd ?domexc_port () =
in
{handle; domexc}

let fd eventchn = Unix_activations.fd eventchn.handle
let fd eventchn = Unix_activations_minimal.fd eventchn.handle

let bind_interdomain eventchn domid port =
Xeneventchn.bind_interdomain eventchn.handle domid port
Expand All @@ -49,11 +49,11 @@ let unbind eventchn port = Xeneventchn.unbind eventchn.handle port

let notify eventchn port = Xeneventchn.notify eventchn.handle port

let pending eventchn = Unix_activations.pending eventchn.handle
let pending eventchn = Unix_activations_minimal.pending eventchn.handle

let unmask eventchn port = Xeneventchn.unmask eventchn.handle port

let dump e chan =
Printf.fprintf chan "evtchn-dev,%d,%d\n"
(Utils.FD.to_int @@ Unix_activations.fd e.handle)
(Utils.FD.to_int @@ Unix_activations_minimal.fd e.handle)
(Xeneventchn.to_int e.domexc)

0 comments on commit ebcf378

Please sign in to comment.