Merge pull request #227 from mseri/master

xcp: update and simplify interface using fd-send-recv >= 2.0.0

Author: mseri

example/jbuild

@@ -32,9 +32,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  ((name example)
   (flags (:standard -w -39 %s))
   (libraries
-   (lwt
-    lwt.unix
-    rpclib
+   (rpclib
     xcp))
   %s))
 

lib/jbuild

@@ -46,7 +46,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  ((name xcp)
   (public_name xcp)
   (flags (:standard -w -39 %s -warn-error -3))
-  (modules (:standard \ channel_helper scheduler task_server updates))
+  (modules (:standard \ scheduler task_server updates))
   (c_names (syslog_stubs))
   (libraries
    (%s
@@ -78,19 +78,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (public_name xcp.updates)
   (flags (:standard -w -39 %s))
   (modules (updates task_server scheduler))
-  (libraries
-   (lwt
-    xcp))
+  (libraries (xcp))
   (wrapped false)
   %s))
-
-(executable
- ((name channel_helper)
-  (flags (:standard -w -39 %s))
-  (modules (channel_helper))
-  (libraries
-   (cmdliner
-    lwt
-    lwt.unix
-    xcp))))
-|} runtime_coverage_enabled flags coverage_dep coverage_rewriter flags coverage_rewriter flags
+|} runtime_coverage_enabled flags coverage_dep coverage_rewriter flags coverage_rewriter

lib/posix_channel.ml

@@ -149,7 +149,7 @@ let send proxy_socket =
               let n = Unix.recv fd buffer 0 (Bytes.length buffer) [] in
               let token' = Bytes.sub_string buffer 0 n in
               if token = token' then begin
-                let (_: int) = Fd_send_recv.send_fd fd token 0 (String.length token) [] proxy_socket in
+                let (_: int) = Fd_send_recv.send_fd_substring fd token 0 (String.length token) [] proxy_socket in
                 ()
               end
             end else if List.mem s_ip readable then begin
@@ -203,8 +203,9 @@ let receive protocols =
     finally
       (fun () ->
         Unix.connect s (Unix.ADDR_UNIX path);
-        let (_: int) = Unix.send s (Bytes.unsafe_of_string token) 0 (String.length token) [] in
-        let (_, _, fd) = Fd_send_recv.recv_fd s token 0 (String.length token) [] in
+        let (_: int) = Unix.send_substring s token 0 (String.length token) [] in
+        let buf = Bytes.create (String.length token) in
+        let (_, _, fd) = Fd_send_recv.recv_fd s buf 0 (Bytes.length buf) [] in
         fd
       ) (fun () -> Unix.close s)
 

lib_test/jbuild

@@ -32,9 +32,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  ((names (test test_alco))
   (flags (:standard -w -39 %s))
   (libraries
-   (lwt
-    lwt.unix
-    alcotest
+   (alcotest
     oUnit
     rpclib
     rpclib.markdown

lib/channel_helper.ml renamed to misc/channel_helper.ml

@@ -9,9 +9,9 @@ exception End_of_file
 exception No_useful_protocol
 
 let copy_all src dst =
-  let buffer = String.make 16384 '\000' in
+  let buffer = Bytes.make 16384 '\000' in
   let rec loop () =
-    Lwt_unix.read src buffer 0 (String.length buffer) >>= fun n ->
+    Lwt_unix.read src buffer 0 (Bytes.length buffer) >>= fun n ->
     if n = 0
     then Lwt.fail End_of_file
     else
@@ -116,11 +116,11 @@ let advertise_t _common_options_t proxy_socket =
     proxy fd (Lwt_unix.of_unix_file_descr proxy_socket) in
   let t_unix =
     Lwt_unix.accept s_unix >>= fun (fd, _peer) ->
-    let buffer = String.make (String.length token) '\000' in
-    let io_vector = Lwt_unix.io_vector ~buffer ~offset:0 ~length:(String.length buffer) in
+    let buffer = Bytes.make (String.length token) '\000' in
+    let io_vector = Lwt_unix.io_vector ~buffer:(Bytes.unsafe_to_string buffer) ~offset:0 ~length:(Bytes.length buffer) in
     Lwt_unix.recv_msg ~socket:fd ~io_vectors:[io_vector] >>= fun (n, fds) ->
     List.iter Unix.close fds;
-    let token' = String.sub buffer 0 n in
+    let token' = Bytes.sub_string buffer 0 n in
     let io_vector' = Lwt_unix.io_vector ~buffer:token' ~offset:0 ~length:(String.length token') in
     if token = token'
     then

misc/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+(executable
+ ((name channel_helper)
+  (modules (channel_helper))
+  (libraries
+   (cmdliner
+    lwt
+    lwt.unix
+    xcp))
+  (preprocess (pps (ppx_deriving_rpc)))
+  ))

xcp.opam

@@ -12,9 +12,8 @@ depends: [
   "base-unix"
   "cmdliner"
   "cohttp"
-  "fd-send-recv"
+  "fd-send-recv" {>= "2.0.0"}
   "jbuilder" {build & >= "1.0+beta11"}
-  "lwt" {>= "3.0.0"}
   "message-switch-core"
   "message-switch-unix"
   "ocamlfind" {build}