diff options
| author | KAMEZAWA Hiroyuki <kamezawa@bluextal.(none)> | 2011-02-16 05:04:42 +0900 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-03-07 18:01:05 +0000 |
| commit | 5fa5553c047155cf99fca9940cecdbc64c93acaf (patch) | |
| tree | b6221865db80811117b54d1101bf797dcb7735e5 /virt-top | |
| parent | 756b7b3faccdab8234b9f11126b147121532a24c (diff) | |
| download | virt-top-5fa5553c047155cf99fca9940cecdbc64c93acaf.tar.gz virt-top-5fa5553c047155cf99fca9940cecdbc64c93acaf.tar.xz virt-top-5fa5553c047155cf99fca9940cecdbc64c93acaf.zip | |
add memory stats to --csv mode.
In csv mode, memory usage in kbytes and %mem against total system
memory is shown.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Diffstat (limited to 'virt-top')
| -rwxr-xr-x | virt-top/virt-top.pod | 8 | ||||
| -rw-r--r-- | virt-top/virt_top.ml | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/virt-top/virt-top.pod b/virt-top/virt-top.pod index 3a955ac..d479b63 100755 --- a/virt-top/virt-top.pod +++ b/virt-top/virt-top.pod @@ -122,6 +122,10 @@ I<output.csv.00>, I<output.csv.01> etc. Disable domain CPU stats in CSV output. +=item B<--no-csv-mem> + +Disable domain memory stats in CSV output. + =item B<--no-csv-block> Disable domain block device stats in CSV output. @@ -346,6 +350,10 @@ Enables CSV output to the named file. Enable or disable domain CPU stats in CSV output. +=item B<csv-mem> I<true|false> + +Enable or disable domain memory stats in CSV output. + =item B<csv-block> I<true|false> Enable or disable domain block device stats in CSV output. diff --git a/virt-top/virt_top.ml b/virt-top/virt_top.ml index 3c6f47d..cb50ca0 100644 --- a/virt-top/virt_top.ml +++ b/virt-top/virt_top.ml @@ -126,6 +126,7 @@ let uri = ref None let debug_file = ref "" let csv_enabled = ref false let csv_cpu = ref true +let csv_mem = ref true let csv_block = ref true let csv_net = ref true let init_file = ref DefaultInitFile @@ -178,6 +179,8 @@ let start_up () = "file " ^ s_"Log statistics to CSV file"; "--no-csv-cpu", Arg.Clear csv_cpu, " " ^ s_"Disable CPU stats in CSV"; + "--no-csv-mem", Arg.Clear csv_mem, + " " ^ s_"Disable memory stats in CSV"; "--no-csv-block", Arg.Clear csv_block, " " ^ s_"Disable block device stats in CSV"; "--no-csv-net", Arg.Clear csv_net, @@ -233,6 +236,7 @@ OPTIONS" in | _, "debug", filename -> debug_file := filename | _, "csv", filename -> set_csv filename | _, "csv-cpu", b -> csv_cpu := bool_of_string b + | _, "csv-mem", b -> csv_mem := bool_of_string b | _, "csv-block", b -> csv_block := bool_of_string b | _, "csv-net", b -> csv_net := bool_of_string b | _, "batch", b -> batch_mode := bool_of_string b @@ -1238,6 +1242,7 @@ let write_csv_header () = (* These fields are repeated for each domain: *) [ "Domain ID"; "Domain name"; ] @ (if !csv_cpu then [ "CPU (ns)"; "%CPU"; ] else []) @ + (if !csv_mem then [ "Mem (bytes)"; "%Mem";] else []) @ (if !csv_block && not !block_in_bytes then [ "Block RDRQ"; "Block WRRQ"; ] else []) @ (if !csv_block && !block_in_bytes @@ -1295,6 +1300,9 @@ let append_csv (if !csv_cpu then [ string_of_float rd.rd_cpu_time; string_of_float rd.rd_percent_cpu ] else []) @ + (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; |