Skip to contentSkip to conversation

Ocaml: misc fixes

PATCH In review Wei Liu 2 participants 5 messages Feb 7, 2018

lore
Share & tools
lore

Wei Liu

author
#0 lore raw

cover Ocaml: misc fixes

Wei Liu (2):
ocaml/xb: update xb.mli in accordance with df1e4c6e7f8 ocaml/libs/xb: don't generate *.mli automatically

 tools/ocaml/libs/xb/Makefile    |  4 ----
 tools/ocaml/libs/xb/op.mli      | 29 +++++++++++++++++++++++++++++
 tools/ocaml/libs/xb/packet.mli  | 13 +++++++++++++
 tools/ocaml/libs/xb/partial.mli | 14 ++++++++++++++
 tools/ocaml/libs/xb/xb.mli      |  4 ++--
 5 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 tools/ocaml/libs/xb/op.mli
 create mode 100644 tools/ocaml/libs/xb/packet.mli
 create mode 100644 tools/ocaml/libs/xb/partial.mli
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
author
#1 lore raw

PATCH 1/2 ocaml/xb: update xb.mli in accordance with df1e4c6e7f8

---
 tools/ocaml/libs/xb/xb.mli | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/ocaml/libs/xb/xb.mli +2 -2
index b4d705201f..95d1c6f840 100644
@@ -76,10 +76,10 @@ type t = {
 val init_partial_in : unit -> partial_buf
 val reconnect : t -> unit
 val queue : t -> Packet.t -> unit
-val read_fd : backend_fd -> 'a -> string -> int -> int
+val read_fd : backend_fd -> 'a -> bytes -> int -> int
 val read_mmap : backend_mmap -> 'a -> string -> int -> int
 val read : t -> string -> int -> int
-val write_fd : backend_fd -> 'a -> string -> int -> int
+val write_fd : backend_fd -> 'a -> bytes -> int -> int
 val write_mmap : backend_mmap -> 'a -> string -> int -> int
 val write : t -> string -> int -> int
 val output : t -> bool
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Acked-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] ocaml/xb: update xb.mli in accordance with df1e4c6e7f8

Quoted 23 lines · Wei Liu

---
tools/ocaml/libs/xb/xb.mli | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
tools/ocaml/libs/xb/xb.mli +0 -0
index b4d705201f..95d1c6f840 100644
@@ -76,10 +76,10 @@ type t = {

val init_partial_in : unit -> partial_buf
val reconnect : t -> unit
val queue : t -> Packet.t -> unit

tools/ocaml/libs/xb/xb.mli +1 -1
-val read_fd : backend_fd -> 'a -> string -> int -> int
+val read_fd : backend_fd -> 'a -> bytes -> int -> int

val read_mmap : backend_mmap -> 'a -> string -> int -> int val read : t -> string -> int -> int

tools/ocaml/libs/xb/xb.mli +1 -1
-val write_fd : backend_fd -> 'a -> string -> int -> int
+val write_fd : backend_fd -> 'a -> bytes -> int -> int
Quoted 6 lines

val write_mmap : backend_mmap -> 'a -> string -> int -> int val write : t -> string -> int -> int
val output : t -> bool

Signature · 1 line
2.11.0

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#3 lore raw

PATCH 2/2 ocaml/libs/xb: don't generate *.mli automatically

In reply to Wei Liu

To stay in line with other parts of the ocaml code base.

This requires committing a bunch of mli files in tree.

---
 tools/ocaml/libs/xb/Makefile    |  4 ----
 tools/ocaml/libs/xb/op.mli      | 29 +++++++++++++++++++++++++++++
 tools/ocaml/libs/xb/packet.mli  | 13 +++++++++++++
 tools/ocaml/libs/xb/partial.mli | 14 ++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 tools/ocaml/libs/xb/op.mli
 create mode 100644 tools/ocaml/libs/xb/packet.mli
 create mode 100644 tools/ocaml/libs/xb/partial.mli
tools/ocaml/libs/xb/Makefile +0 -4
index 09d1bc8946..be4499147e 100644
@@ -39,10 +39,6 @@ xenbus.cmo : $(foreach obj, $(OBJS), $(obj).cmo)
 	$(E) " CMO      $@"
 	$(OCAMLC) -pack -o $@ $^
 
-%.mli: %.ml
-	$(E) " MLI      $@"
-	$(Q)$(OCAMLC) $(OCAMLINCLUDE) -i $< $o
-
 .PHONY: install
 install: $(LIBS) META
 	mkdir -p $(OCAMLDESTDIR)
tools/ocaml/libs/xb/op.mli new file +29 -0
new file mode 100644
index 0000000000..ecabfff0d1
@@ -0,0 +1,29 @@
+type operation =
+    Debug
+  | Directory
+  | Read
+  | Getperms
+  | Watch
+  | Unwatch
+  | Transaction_start
+  | Transaction_end
+  | Introduce
+  | Release
+  | Getdomainpath
+  | Write
+  | Mkdir
+  | Rm
+  | Setperms
+  | Watchevent
+  | Error
+  | Isintroduced
+  | Resume
+  | Set_target
+  | Reset_watches
+  | Invalid
+val operation_c_mapping : operation array
+val size : int
+val array_search : 'a -> 'a array -> int
+val of_cval : int -> operation
+val to_cval : operation -> int
+val to_string : operation -> string
tools/ocaml/libs/xb/packet.mli new file +13 -0
new file mode 100644
index 0000000000..f4e53c73a8
@@ -0,0 +1,13 @@
+type t = { tid : int; rid : int; ty : Op.operation; data : string; }
+exception Error of string
+exception DataError of string
+external string_of_header : int -> int -> int -> int -> string
+  = "stub_string_of_header"
+val create : int -> int -> Op.operation -> string -> t
+val of_partialpkt : Partial.pkt -> t
+val to_string : t -> string
+val unpack : t -> int * int * Op.operation * string
+val get_tid : t -> int
+val get_ty : t -> Op.operation
+val get_data : t -> string
+val get_rid : t -> int
tools/ocaml/libs/xb/partial.mli new file +14 -0
new file mode 100644
index 0000000000..359a75e88d
@@ -0,0 +1,14 @@
+type pkt = {
+  tid : int;
+  rid : int;
+  ty : Op.operation;
+  len : int;
+  buf : Buffer.t;
+}
+external header_size : unit -> int = "stub_header_size"
+external header_of_string_internal : string -> int * int * int * int
+  = "stub_header_of_string"
+val xenstore_payload_max : int
+val of_string : string -> pkt
+val append : pkt -> string -> int -> unit
+val to_complete : pkt -> int
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Acked-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] ocaml/libs/xb: don't generate *.mli automatically

Quoted 111 lines · Wei Liu

To stay in line with other parts of the ocaml code base.

This requires committing a bunch of mli files in tree.

---

tools/ocaml/libs/xb/Makefile    |  4 ----
tools/ocaml/libs/xb/op.mli      | 29 +++++++++++++++++++++++++++++
tools/ocaml/libs/xb/packet.mli  | 13 +++++++++++++
tools/ocaml/libs/xb/partial.mli | 14 ++++++++++++++
4 files changed, 56 insertions(+), 4 deletions(-)

create mode 100644 tools/ocaml/libs/xb/op.mli create mode 100644 tools/ocaml/libs/xb/packet.mli create mode 100644 tools/ocaml/libs/xb/partial.mli

tools/ocaml/libs/xb/Makefile +0 -4
index 09d1bc8946..be4499147e 100644
@@ -39,10 +39,6 @@ xenbus.cmo : $(foreach obj, $(OBJS), $(obj).cmo)
 	$(E) " CMO      $@"
 	$(OCAMLC) -pack -o $@ $^
 
-%.mli: %.ml
-	$(E) " MLI      $@"
-	$(Q)$(OCAMLC) $(OCAMLINCLUDE) -i $< $o
-

.PHONY: install
install: $(LIBS) META

	mkdir -p $(OCAMLDESTDIR)
tools/ocaml/libs/xb/op.mli new file +29 -0
new file mode 100644
index 0000000000..ecabfff0d1
@@ -0,0 +1,29 @@
+type operation =
+    Debug
+  | Directory
+  | Read
+  | Getperms
+  | Watch
+  | Unwatch
+  | Transaction_start
+  | Transaction_end
+  | Introduce
+  | Release
+  | Getdomainpath
+  | Write
+  | Mkdir
+  | Rm
+  | Setperms
+  | Watchevent
+  | Error
+  | Isintroduced
+  | Resume
+  | Set_target
+  | Reset_watches
+  | Invalid
+val operation_c_mapping : operation array
+val size : int
+val array_search : 'a -> 'a array -> int
+val of_cval : int -> operation
+val to_cval : operation -> int
+val to_string : operation -> string
tools/ocaml/libs/xb/packet.mli new file +13 -0
new file mode 100644
index 0000000000..f4e53c73a8
@@ -0,0 +1,13 @@
+type t = { tid : int; rid : int; ty : Op.operation; data : string; }
+exception Error of string
+exception DataError of string
+external string_of_header : int -> int -> int -> int -> string
+  = "stub_string_of_header"
+val create : int -> int -> Op.operation -> string -> t
+val of_partialpkt : Partial.pkt -> t
+val to_string : t -> string
+val unpack : t -> int * int * Op.operation * string
+val get_tid : t -> int
+val get_ty : t -> Op.operation
+val get_data : t -> string
+val get_rid : t -> int
tools/ocaml/libs/xb/partial.mli new file +14 -0
new file mode 100644
index 0000000000..359a75e88d
@@ -0,0 +1,14 @@
+type pkt = {
+  tid : int;
+  rid : int;
+  ty : Op.operation;
+  len : int;
+  buf : Buffer.t;
+}
+external header_size : unit -> int = "stub_header_size"
+external header_of_string_internal : string -> int * int * int * int
+  = "stub_header_of_string"
+val xenstore_payload_max : int
+val of_string : string -> pkt
+val append : pkt -> string -> int -> unit
+val to_complete : pkt -> int
Signature · 1 line
2.11.0

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel