Skip to content
Merged
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
31 changes: 0 additions & 31 deletions .travis-ci.sh

This file was deleted.

6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
language: c
script: bash -ex .travis-ci.sh
install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
script: bash -ex .travis-opam.sh
env:
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
- OCAML_VERSION=latest PACKAGE=mirage-net-xen
- OCAML_VERSION=4.01 PACKAGE=mirage-net-xen
12 changes: 8 additions & 4 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
* When waiting for space in the transmit queue, we would sometimes fail to notice when
space became available.
* Copy out-bound data into pre-shared pages for performance, security and simplicity.
1.3.0 (2015-01-24):
* When waiting for space in the transmit queue, we would sometimes fail
to notice when space became available. (#15)
* Copy out-bound data into pre-shared pages for performance, security
and simplicity. (#17)
* Use a centrally sourced Travis file and test OCaml 4.02+ as well.

1.2.0 (2014-12-17):
* Add profiling tracepoints and labels (#13). Introduces a dependency on `mirage-profile`.
* Add profiling tracepoints and labels (#13).
Introduces a dependency on `mirage-profile`.
* New `opam` file present in source repository for OPAM 1.2 workflow.

1.1.3 (2014-08-08):
Expand Down
7 changes: 4 additions & 3 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
OASISFormat: 0.4
Name: mirage-net-xen
Version: 1.2.0
Version: 1.3.0
Synopsis: Xen network frontend driver implementation
Authors: Anil Madhavapeddy, David Scott
License: ISC
Plugins: META (0.3), DevFiles (0.3)
Plugins: META (0.4), DevFiles (0.4)
BuildTools: ocamlbuild

Library "mirage-net-xen"
CompiledObject: best
Path: lib
Findlibname: mirage-net-xen
Modules: Netif
BuildDepends: lwt.syntax,cstruct, cstruct.syntax, ipaddr, mirage-xen, xen-evtchn, xen-gnt, mirage-profile
BuildDepends: lwt.syntax, cstruct, cstruct.syntax, ipaddr, mirage-xen, xen-evtchn, xen-gnt, mirage-profile
XMETARequires: lwt, cstruct, ipaddr, mirage-xen, xen-evtchn, xen-gnt, mirage-profile
7 changes: 3 additions & 4 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# OASIS_START
# DO NOT EDIT (digest: 1f973501842c42b53f95c2b3f2186970)
version = "1.2.0"
# DO NOT EDIT (digest: 359ed9b327bc26524f3cee5aaa540534)
version = "1.3.0"
description = "Xen network frontend driver implementation"
requires =
"lwt.syntax cstruct cstruct.syntax ipaddr mirage-xen xen-evtchn xen-gnt mirage-profile"
requires = "lwt cstruct ipaddr mirage-xen xen-evtchn xen-gnt mirage-profile"
archive(byte) = "mirage-net-xen.cma"
archive(byte, plugin) = "mirage-net-xen.cma"
archive(native) = "mirage-net-xen.cmxa"
Expand Down
8 changes: 4 additions & 4 deletions lib/netif.ml
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,12 @@ let tx_poll nf =

let poll_thread (nf: t) : unit Lwt.t =
let rec loop from =
lwt () = refill_requests nf.t in
rx_poll nf.t nf.receive_callback;
refill_requests nf.t >>= fun () ->
tx_poll nf.t;

lwt from = Activations.after nf.t.evtchn from in
loop from in
Activations.after nf.t.evtchn from >>= fun from ->
loop from
in
loop Activations.program_start

let connect id =
Expand Down
11 changes: 6 additions & 5 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.1 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 15b31a850ce53ebd316ce6dd0b501f31) *)
(* DO NOT EDIT (digest: fde7d63a140d350f6ba215f082781b14) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6673,7 +6673,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "mirage-net-xen";
version = "1.2.0";
version = "1.3.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -6768,21 +6768,22 @@ let setup_t =
})
];
plugins =
[(`Extra, "META", Some "0.3"); (`Extra, "DevFiles", Some "0.3")];
[(`Extra, "META", Some "0.4"); (`Extra, "DevFiles", Some "0.4")];
disable_oasis_section = [];
schema_data = PropList.Data.create ();
plugin_data = []
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "\149HO>\172u\247\209\211\155\021\1354+\216\n";
oasis_digest =
Some "\217\026\223\t\223\177\216\167\001\224\1553\205\238,,";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 6787 "setup.ml"
# 6788 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;