X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcsv_output.ml;h=cb373d5b6175279dd432a5ce59ac195207f58cdd;hb=1aedabd0caf7a0562a3f314dddd13d49e0165c92;hp=9496ca81a67bd6d330afa9cfbfbec24dc33b598d;hpb=90d14bc151e488972d33eefaac2242d9a6e07578;p=virt-top.git

diff --git a/src/csv_output.ml b/src/csv_output.ml
index 9496ca8..cb373d5 100644
--- a/src/csv_output.ml
+++ b/src/csv_output.ml
@@ -20,8 +20,8 @@
 (* CSV output functions. *)
 
 open Printf
-open ExtList
 
+open Utils
 open Collect
 
 module C = Libvirt.Connect
@@ -56,6 +56,7 @@ let write_csv_header (csv_cpu, csv_mem, csv_block, csv_net) block_in_bytes =
 (* Write summary data to CSV file. *)
 let append_csv (_, _, _, _, _, node_info, hostname, _) (* setup *)
                (csv_cpu, csv_mem, csv_block, csv_net)
+               block_in_bytes
                { rd_doms = doms;
                  rd_printable_time = printable_time;
                  rd_nr_pcpus = nr_pcpus; rd_total_cpu = total_cpu;
@@ -91,9 +92,9 @@ let append_csv (_, _, _, _, _, node_info, hostname, _) (* setup *)
   let cmp (_, { rd_domid = rd_domid1 }) (_, { rd_domid = rd_domid2 }) =
     compare rd_domid1 rd_domid2
   in
-  let doms = List.sort ~cmp doms in
+  let doms = List.sort cmp doms in
 
-  let string_of_int64_option = Option.map_default Int64.to_string "" in
+  let string_of_int64_option = map_default Int64.to_string "" in
 
   let domain_fields = List.map (
     fun (domname, rd) ->
@@ -104,10 +105,15 @@ let append_csv (_, _, _, _, _, node_info, hostname, _) (* setup *)
         (if csv_mem then [
             Int64.to_string rd.rd_mem_bytes; Int64.to_string rd.rd_mem_percent
          ] else []) @
-	(if csv_block then [
-	   string_of_int64_option rd.rd_block_rd_info;
-	   string_of_int64_option rd.rd_block_wr_info;
-	 ] else []) @
+	(if csv_block then
+           if block_in_bytes then [
+	     string_of_int64_option rd.rd_block_rd_bytes;
+	     string_of_int64_option rd.rd_block_wr_bytes;
+	   ] else [
+	     string_of_int64_option rd.rd_block_rd_reqs;
+	     string_of_int64_option rd.rd_block_wr_reqs;
+           ]
+         else []) @
 	(if csv_net then [
 	   string_of_int64_option rd.rd_net_rx_bytes;
 	   string_of_int64_option rd.rd_net_tx_bytes;