Improve copy function

[virt-p2v.git] / virt-p2v

diff --git a/virt-p2v b/virt-p2v
index d54da3a..ad9e159 100755 (executable)
--- a/virt-p2v
+++ b/virt-p2v
@@ -46,6 +46,7 @@ type state = { greeting : bool;
               architecture : architecture option;
               memory : int option; vcpus : int option;
               mac_address : string option;
+              compression : bool option;
             }
 and network = Auto
            | Shell
@@ -93,6 +94,7 @@ let defaults = {
   memory = None;
   vcpus = None;
   mac_address = None;
+  compression = None;
 }
 (* END OF CUSTOM virt-p2v SCRIPT SECTION.                               *)
 (*----------------------------------------------------------------------*)
@@ -199,11 +201,15 @@ let msgbox, yesno, inputbox, radiolist, checklist, form =
   in
 
   (* Handle the common parameters.  Note Continuation Passing Style. *)
-  let with_common cont ?(cancel=false) ?(backbutton=true) title =
+  let with_common cont
+      ?(cancel=false)
+      ?(backbutton=true) ?(backbutton_label="Back")
+      title =
     let params = ["--title"; title] in
     let params = if not cancel then "--nocancel" :: params else params in
     let params =
-      if backbutton then "--extra-button" :: "--extra-label" :: "Back" :: params
+      if backbutton then
+       "--extra-button" :: "--extra-label" :: backbutton_label :: params
       else params in
     cont params
   in
@@ -1023,6 +1029,19 @@ let rec main ttyname =
     | Back -> Prev
   in
 
+  let ask_compression state =
+    match
+    radiolist "Network compression" "Enable network compression" 10 50 2 [
+      "yes", "Yes, compress network traffic", state.compression <> Some false;
+      "no", "No, don't compress", state.compression = Some false
+    ]
+    with
+    | Yes ("no"::_) -> Next { state with compression = Some false }
+    | Yes _ -> Next { state with compression = Some true }
+    | No | Help | Error -> Ask_again
+    | Back -> Prev
+  in
+
   let ask_verify state =
     match
     yesno "Verify and proceed"
@@ -1037,7 +1056,8 @@ Hypervisor:   %s
 Architecture: %s
 Memory:       %s
 VCPUs:        %s
-MAC address:  %s"
+MAC address:  %s
+Compression:  %b"
          (Option.default "" state.remote_host)
          (Option.default "" state.remote_port)
          (Option.default "" state.remote_directory)
@@ -1061,6 +1081,7 @@ MAC address:  %s"
          | Some vcpus -> string_of_int vcpus | None -> "")
          (match state.mac_address with
          | Some "" -> "Random" | Some mac -> mac | None -> "")
+         (Option.default true state.compression)
       )
       21 50
     with
@@ -1097,6 +1118,7 @@ MAC address:  %s"
     ask_memory,        defaults.memory <> None,           dont_skip;
     ask_vcpus,         defaults.vcpus <> None,            dont_skip;
     ask_mac_address,   defaults.mac_address <> None,      dont_skip;
+    ask_compression,   defaults.compression <> None,      dont_skip;
     ask_verify,        not defaults.greeting,             dont_skip;
   |] in
 
@@ -1250,7 +1272,8 @@ MAC address:  %s"
 
   (* Functions to connect and disconnect from the remote system. *)
   let do_connect remote_name _ =
-    let cmd = sprintf "ssh -C -l %s -p %s %s \"cat > %s/%s\""
+    let cmd = sprintf "ssh%s -l %s -p %s %s \"cat > %s/%s\""
+      (if state.compression = Some false then "" else " -C")
       (quote remote_username) (quote remote_port) (quote remote_host)
       (quote remote_directory) (quote remote_name) in
     eprintf "connect: %s\n%!" cmd;
@@ -1459,7 +1482,8 @@ MAC address:  %s"
       let rec copy bytes_sent last_printed_at =
        let n = read fd buffer 0 bufsize in
        if n > 0 then (
-         ignore (write sock buffer 0 n);
+         let n' = write sock buffer 0 n in
+         if n <> n' then assert false; (* never, according to the manual *)
 
          let bytes_sent = Int64.add bytes_sent (Int64.of_int n) in
          let last_printed_at =
@@ -1468,19 +1492,20 @@ MAC address:  %s"
            if now -. last_printed_at > 5. then (
              let elapsed = Int64.to_float bytes_sent /. Int64.to_float size in
              let secs_elapsed = now -. start in
-             printf "%.0f%%" (100. *. elapsed);
+             printf "%.0f%% @ %.1f Mbps"
+               (100. *. elapsed)
+               (Int64.to_float bytes_sent/.secs_elapsed/.1_000_000. *. 8.);
              (* After 60 seconds has elapsed, start printing estimates. *)
              if secs_elapsed >= 60. then (
                let remaining = 1. -. elapsed in
                let secs_remaining = (remaining /. elapsed) *. secs_elapsed in
                if secs_remaining > 120. then
-                 printf " (about %.0f minutes remaining)          "
-                   (secs_remaining /. 60.)
+                 printf " (about %.0f minutes remaining)" (secs_remaining/.60.)
                else
-                 printf " (about %.0f seconds remaining)          "
+                 printf " (about %.0f seconds remaining)"
                    secs_remaining
              );
-             printf "\r%!";
+             printf "          \r%!";
              now
            )
            else last_printed_at in
@@ -1489,11 +1514,14 @@ MAC address:  %s"
        )
       in
       copy 0L start;
+      printf "\n\n%!"; (* because of the messages printed above *)
 
       (* Disconnect. *)
       do_disconnect conn
   ) devices_to_send;
 
+  (*printf "\n\nPress any key ...\n%!"; ignore (read_line ());*)
+
   (* Clean up and reboot. *)
   ignore (
     msgbox "virt-p2v completed"