X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-top%2Fvirt_top.ml;h=cb50ca0df755418de77d5293a6dedfe91bc63ae3;hp=3ad7afc8dd5d851dd20d120ede2c8fea11b0b6e9;hb=5fa5553c047155cf99fca9940cecdbc64c93acaf;hpb=668ea8dfcd13c14ea859a3ee60ffbd33725af91a diff --git a/virt-top/virt_top.ml b/virt-top/virt_top.ml index 3ad7afc..cb50ca0 100644 --- a/virt-top/virt_top.ml +++ b/virt-top/virt_top.ml @@ -1,5 +1,5 @@ (* 'top'-like tool for libvirt domains. - (C) Copyright 2007 Richard W.M. Jones, Red Hat Inc. + (C) Copyright 2007-2009 Richard W.M. Jones, Red Hat Inc. http://libvirt.org/ This program is free software; you can redistribute it and/or modify @@ -39,7 +39,7 @@ let parse_device_xml : (int -> [>`R] D.t -> string list * string list) ref = (* Hooks for CSV support (see virt_top_csv.ml). *) let csv_start : (string -> unit) ref = ref ( - fun _ -> failwith (s_ "virt-top was compiled without support for CSV files") + fun _ -> failwith (s_"virt-top was compiled without support for CSV files") ) let csv_write : (string list -> unit) ref = ref ( @@ -50,7 +50,7 @@ let csv_write : (string list -> unit) ref = let parse_date_time : (string -> float) ref = ref ( fun _ -> - failwith (s_ "virt-top was compiled without support for dates and times") + failwith (s_"virt-top was compiled without support for dates and times") ) (* Sort order. *) @@ -62,15 +62,15 @@ let all_sort_fields = [ NetRX; NetTX; BlockRdRq; BlockWrRq ] let printable_sort_order = function - | Processor -> s_ "%CPU" - | Memory -> s_ "%MEM" - | Time -> s_ "TIME (CPU time)" - | DomainID -> s_ "Domain ID" - | DomainName -> s_ "Domain name" - | NetRX -> s_ "Net RX bytes" - | NetTX -> s_ "Net TX bytes" - | BlockRdRq -> s_ "Block read reqs" - | BlockWrRq -> s_ "Block write reqs" + | Processor -> s_"%CPU" + | Memory -> s_"%MEM" + | Time -> s_"TIME (CPU time)" + | DomainID -> s_"Domain ID" + | DomainName -> s_"Domain name" + | NetRX -> s_"Net RX bytes" + | NetTX -> s_"Net TX bytes" + | BlockRdRq -> s_"Block read reqs" + | BlockWrRq -> s_"Block write reqs" let sort_order_of_cli = function | "cpu" | "processor" -> Processor | "mem" | "memory" -> Memory @@ -80,9 +80,8 @@ let sort_order_of_cli = function | "netrx" -> NetRX | "nettx" -> NetTX | "blockrdrq" -> BlockRdRq | "blockwrrq" -> BlockWrRq | str -> - failwith - (sprintf (f_ "%s: sort order should be: %s") - str "cpu|mem|time|id|name|netrx|nettx|blockrdrq|blockwrrq") + failwithf (f_"%s: sort order should be: %s") + str "cpu|mem|time|id|name|netrx|nettx|blockrdrq|blockwrrq" let cli_of_sort_order = function | Processor -> "cpu" | Memory -> "mem" @@ -103,9 +102,7 @@ let display_of_cli = function | "block" -> BlockDisplay | "net" -> NetDisplay | str -> - failwith - (sprintf (f_ "%s: display should be %s") - str "task|pcpu|block|net") + failwithf (f_"%s: display should be %s") str "task|pcpu|block|net" let cli_of_display = function | TaskDisplay -> "task" | PCPUDisplay -> "pcpu" @@ -129,14 +126,17 @@ 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 let script_mode = ref false +let stream_mode = ref false +let block_in_bytes = ref false (* Tuple of never-changing data returned by start_up function. *) type setup = - Libvirt.ro C.t * bool * bool * bool * C.node_info * string * + Libvirt.ro C.t * bool * bool * bool * bool * C.node_info * string * (int * int * int) (* Function to read command line arguments and go into curses mode. *) @@ -144,7 +144,7 @@ let start_up () = (* Read command line arguments. *) let rec set_delay newdelay = if newdelay <= 0. then - failwith (s_ "-d: cannot set a negative delay"); + failwith (s_"-d: cannot set a negative delay"); delay := int_of_float (newdelay *. 1000.) and set_uri = function "" -> uri := None | u -> uri := Some u and set_sort order = sort_order := sort_order_of_cli order @@ -157,52 +157,64 @@ let start_up () = and no_init_file () = init_file := NoInitFile and set_init_file filename = init_file := InitFile filename and set_end_time time = end_time := Some ((!parse_date_time) time) + and display_version () = + printf "virt-top %s ocaml-libvirt %s\n" + Virt_top_version.version Libvirt_version.version; + exit 0 in let argspec = Arg.align [ "-1", Arg.Unit set_pcpu_mode, - " " ^ s_ "Start by displaying pCPUs (default: tasks)"; + " " ^ s_"Start by displaying pCPUs (default: tasks)"; "-2", Arg.Unit set_net_mode, - " " ^ s_ "Start by displaying network interfaces"; + " " ^ s_"Start by displaying network interfaces"; "-3", Arg.Unit set_block_mode, - " " ^ s_ "Start by displaying block devices"; + " " ^ s_"Start by displaying block devices"; "-b", Arg.Set batch_mode, - " " ^ s_ "Batch mode"; + " " ^ s_"Batch mode"; "-c", Arg.String set_uri, - "uri " ^ s_ "Connect to URI (default: Xen)"; + "uri " ^ s_"Connect to URI (default: Xen)"; "--connect", Arg.String set_uri, - "uri " ^ s_ "Connect to URI (default: Xen)"; + "uri " ^ s_"Connect to URI (default: Xen)"; "--csv", Arg.String set_csv, - "file " ^ s_ "Log statistics to CSV file"; + "file " ^ s_"Log statistics to CSV file"; "--no-csv-cpu", Arg.Clear csv_cpu, - " " ^ s_ "Disable CPU stats in CSV"; + " " ^ 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"; + " " ^ s_"Disable block device stats in CSV"; "--no-csv-net", Arg.Clear csv_net, - " " ^ s_ "Disable net stats in CSV"; + " " ^ s_"Disable net stats in CSV"; "-d", Arg.Float set_delay, - "delay " ^ s_ "Delay time interval (seconds)"; + "delay " ^ s_"Delay time interval (seconds)"; "--debug", Arg.Set_string debug_file, - "file " ^ s_ "Send debug messages to file"; + "file " ^ s_"Send debug messages to file"; "--end-time", Arg.String set_end_time, - "time " ^ s_ "Exit at given time"; + "time " ^ s_"Exit at given time"; "--hist-cpu", Arg.Set_int historical_cpu_delay, - "secs " ^ s_ "Historical CPU delay"; + "secs " ^ s_"Historical CPU delay"; "--init-file", Arg.String set_init_file, - "file " ^ s_ "Set name of init file"; + "file " ^ s_"Set name of init file"; "--no-init-file", Arg.Unit no_init_file, - " " ^ s_ "Do not read init file"; + " " ^ s_"Do not read init file"; "-n", Arg.Set_int iterations, - "iterations " ^ s_ "Number of iterations to run"; + "iterations " ^ s_"Number of iterations to run"; "-o", Arg.String set_sort, - "sort " ^ sprintf (f_ "Set sort order (%s)") "cpu|mem|time|id|name"; + "sort " ^ sprintf (f_"Set sort order (%s)") "cpu|mem|time|id|name"; "-s", Arg.Set secure_mode, - " " ^ s_ "Secure (\"kiosk\") mode"; + " " ^ s_"Secure (\"kiosk\") mode"; "--script", Arg.Set script_mode, - " " ^ s_ "Run from a script (no user interface)"; + " " ^ s_"Run from a script (no user interface)"; + "--stream", Arg.Set stream_mode, + " " ^ s_"dump output to stdout (no userinterface)"; + "--block-in-bytes", Arg.Set block_in_bytes, + " " ^ s_"show block device load in bytes rather than reqs"; + "--version", Arg.Unit display_version, + " " ^ s_"Display version number and exit"; ] in let anon_fun str = - raise (Arg.Bad (sprintf (f_ "%s: unknown parameter") str)) in - let usage_msg = s_ "virt-top : a 'top'-like utility for virtualization + raise (Arg.Bad (sprintf (f_"%s: unknown parameter") str)) in + let usage_msg = s_"virt-top : a 'top'-like utility for virtualization SUMMARY virt-top [-options] @@ -224,15 +236,18 @@ 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 | _, "secure", b -> secure_mode := bool_of_string b | _, "script", b -> script_mode := bool_of_string b + | _, "stream", b -> stream_mode := bool_of_string b + | _, "block-in-bytes", b -> block_in_bytes := bool_of_string b | _, "end-time", t -> set_end_time t | _, "overwrite-init-file", "false" -> no_init_file () | lineno, key, _ -> - eprintf (f_ "%s:%d: configuration item ``%s'' ignored\n%!") + eprintf (f_"%s:%d: configuration item ``%s'' ignored\n%!") filename lineno key ) config in @@ -257,7 +272,7 @@ OPTIONS" in prerr_endline (Libvirt.Virterror.to_string err); (* If non-root and no explicit connection URI, print a warning. *) if Unix.geteuid () <> 0 && name = None then ( - print_endline (s_ "NB: If you want to monitor a local Xen hypervisor, you usually need to be root"); + print_endline (s_"NB: If you want to monitor a local Xen hypervisor, you usually need to be root"); ); exit 1 in @@ -284,7 +299,7 @@ OPTIONS" in | "" -> (* No debug file specified, send stderr to /dev/null unless * we're in script mode. *) - if not !script_mode then ( + if not !script_mode && not !stream_mode then ( let fd = Unix.openfile "/dev/null" [Unix.O_WRONLY] 0o644 in Unix.dup2 fd Unix.stderr; Unix.close fd @@ -298,14 +313,14 @@ OPTIONS" in ); (* Curses voodoo (see ncurses(3)). *) - if not !script_mode then ( - initscr (); - cbreak (); - noecho (); + if not !script_mode && not !stream_mode then ( + ignore (initscr ()); + ignore (cbreak ()); + ignore (noecho ()); nonl (); let stdscr = stdscr () in - intrflush stdscr false; - keypad stdscr true; + ignore (intrflush stdscr false); + ignore (keypad stdscr true); () ); @@ -314,7 +329,7 @@ OPTIONS" in * main_loop. See virt_top_main.ml. *) (conn, - !batch_mode, !script_mode, !csv_enabled, (* immutable modes *) + !batch_mode, !script_mode, !csv_enabled, !stream_mode, (* immutable modes *) node_info, hostname, libvirt_version (* info that doesn't change *) ) @@ -332,17 +347,17 @@ let show_state = function let sleep = Unix.sleep (* Sleep in milliseconds. *) -let usleep n = +let millisleep n = ignore (Unix.select [] [] [] (float n /. 1000.)) (* The curses getstr/getnstr functions are just weird. * This helper function also enables echo temporarily. *) let get_string maxlen = - echo (); + ignore (echo ()); let str = String.create maxlen in let ok = getstr str in (* Safe because binding calls getnstr. *) - noecho (); + ignore (noecho ()); if not ok then "" else ( (* Chop at first '\0'. *) @@ -360,9 +375,16 @@ let message_lineno = 3 let header_lineno = 4 let domains_lineno = 5 +(* Easier to use versions of curses functions addstr, mvaddstr, etc. *) +let move y x = ignore (move y x) +let refresh () = ignore (refresh ()) +let addch c = ignore (addch (int_of_char c)) +let addstr s = ignore (addstr s) +let mvaddstr y x s = ignore (mvaddstr y x s) + (* Print in the "message area". *) let clear_msg () = move message_lineno 0; clrtoeol () -let print_msg str = clear_msg (); mvaddstr message_lineno 0 str; () +let print_msg str = clear_msg (); mvaddstr message_lineno 0 str (* Intermediate "domain + stats" structure that we use to collect * everything we know about a domain within the collect function. @@ -384,9 +406,17 @@ and rd_active = { (* The following are since the last slice, or 0 if cannot be calculated: *) rd_cpu_time : float; (* CPU time used in nanoseconds. *) rd_percent_cpu : float; (* CPU time as percent of total. *) + rd_mem_bytes : int64; (* Memory usage in bytes *) + rd_mem_percent: int64; (* Memory usage as percent of total *) (* The following are since the last slice, or None if cannot be calc'd: *) rd_block_rd_reqs : int64 option; (* Number of block device read rqs. *) rd_block_wr_reqs : int64 option; (* Number of block device write rqs. *) + rd_block_rd_bytes : int64 option; (* Number of bytes block device read *) + rd_block_wr_bytes : int64 option; (* Number of bytes block device write *) + (* _info fields includes the number considering --block_in_bytes option *) + rd_block_rd_info : int64 option; (* Block device read info for user *) + rd_block_wr_info : int64 option; (* Block device read info for user *) + rd_net_rx_bytes : int64 option; (* Number of bytes received. *) rd_net_tx_bytes : int64 option; (* Number of bytes transmitted. *) } @@ -426,7 +456,7 @@ let collect, clear_pcpu_display_data = Hashtbl.clear last_vcpu_info in - let collect (conn, _, _, _, node_info, _, _) = + let collect (conn, _, _, _, _, node_info, _, _) = (* Number of physical CPUs (some may be disabled). *) let nr_pcpus = C.maxcpus_of_node_info node_info in @@ -486,7 +516,10 @@ let collect, clear_pcpu_display_data = rd_prev_block_stats = prev_block_stats; rd_prev_interface_stats = prev_interface_stats; rd_cpu_time = 0.; rd_percent_cpu = 0.; + rd_mem_bytes = 0L; rd_mem_percent = 0L; rd_block_rd_reqs = None; rd_block_wr_reqs = None; + rd_block_rd_bytes = None; rd_block_wr_bytes = None; + rd_block_rd_info = None; rd_block_wr_info = None; rd_net_rx_bytes = None; rd_net_tx_bytes = None; }) with @@ -518,9 +551,14 @@ let collect, clear_pcpu_display_data = let cpu_time = Int64.to_float (rd.rd_info.D.cpu_time -^ prev_info.D.cpu_time) in let percent_cpu = 100. *. cpu_time /. total_cpu in + let mem_usage = rd.rd_info.D.memory in + let mem_percent = + 100L *^ rd.rd_info.D.memory /^ node_info.C.memory in let rd = { rd with rd_cpu_time = cpu_time; - rd_percent_cpu = percent_cpu } in + rd_percent_cpu = percent_cpu; + rd_mem_bytes = mem_usage; + rd_mem_percent = mem_percent} in name, Active rd (* For all other domains we can't calculate it, so leave as 0 *) | rd -> rd @@ -548,10 +586,23 @@ let collect, clear_pcpu_display_data = block_stats.D.rd_req -^ prev_block_stats.D.rd_req in let write_reqs = block_stats.D.wr_req -^ prev_block_stats.D.wr_req in + let read_bytes = + block_stats.D.rd_bytes -^ prev_block_stats.D.rd_bytes in + let write_bytes = + block_stats.D.wr_bytes -^ prev_block_stats.D.wr_bytes in let rd = { rd with rd_block_rd_reqs = Some read_reqs; - rd_block_wr_reqs = Some write_reqs } in + rd_block_wr_reqs = Some write_reqs; + rd_block_rd_bytes = Some read_bytes; + rd_block_wr_bytes = Some write_bytes; + } in + let rd = { rd with + rd_block_rd_info = if !block_in_bytes then + rd.rd_block_rd_bytes else rd.rd_block_rd_reqs; + rd_block_wr_info = if !block_in_bytes then + rd.rd_block_wr_bytes else rd.rd_block_wr_reqs; + } in name, Active rd (* For all other domains we can't calculate it, so leave as None. *) | rd -> rd @@ -736,7 +787,7 @@ let redraw = let historical_cpu = ref [] in let historical_cpu_last_time = ref (Unix.gettimeofday ()) in fun - (_, _, _, _, node_info, _, _) (* setup *) + (_, _, _, _, _, node_info, _, _) (* setup *) (doms, time, printable_time, nr_pcpus, total_cpu, total_cpu_per_pcpu, @@ -748,12 +799,13 @@ let redraw = let lines, cols = get_size () in (* Time. *) - mvaddstr top_lineno 0 ("virt-top " ^ printable_time ^ " - "); + mvaddstr top_lineno 0 (sprintf "virt-top %s - " printable_time); (* Basic node_info. *) - addstr (sprintf "%s %d/%dCPU %dMHz %LdMB " - node_info.C.model node_info.C.cpus nr_pcpus node_info.C.mhz - (node_info.C.memory /^ 1024L)); + addstr + (sprintf "%s %d/%dCPU %dMHz %LdMB " + node_info.C.model node_info.C.cpus nr_pcpus node_info.C.mhz + (node_info.C.memory /^ 1024L)); (* Save the cursor position for when we come to draw the * historical CPU times (down in this function). *) @@ -834,8 +886,12 @@ let redraw = (* Print domains. *) attron A.reverse; - mvaddstr header_lineno 0 - (pad cols " ID S RDRQ WRRQ RXBY TXBY %CPU %MEM TIME NAME"); + let header_string = if !block_in_bytes + then " ID S RDBY WRBY RXBY TXBY %CPU %MEM TIME NAME" + else " ID S RDRQ WRRQ RXBY TXBY %CPU %MEM TIME NAME" + in + mvaddstr header_lineno 0 + (pad cols header_string); attroff A.reverse; let rec loop lineno = function @@ -843,14 +899,12 @@ let redraw = | (name, Active rd) :: doms -> if lineno < lines then ( let state = show_state rd.rd_info.D.state in - let rd_req = Show.int64_option rd.rd_block_rd_reqs in - let wr_req = Show.int64_option rd.rd_block_wr_reqs in + let rd_req = Show.int64_option rd.rd_block_rd_info in + let wr_req = Show.int64_option rd.rd_block_wr_info in let rx_bytes = Show.int64_option rd.rd_net_rx_bytes in let tx_bytes = Show.int64_option rd.rd_net_tx_bytes in let percent_cpu = Show.percent rd.rd_percent_cpu in - let percent_mem = - 100L *^ rd.rd_info.D.memory /^ node_info.C.memory in - let percent_mem = Int64.to_float percent_mem in + let percent_mem = Int64.to_float rd.rd_mem_percent in let percent_mem = Show.percent percent_mem in let time = Show.time rd.rd_info.D.cpu_time in @@ -900,7 +954,7 @@ let redraw = let cpu_time = pcpus_cpu_time.(p) in (* ns used on this CPU *) let percent_cpu = 100. *. cpu_time /. total_cpu_per_pcpu in addstr (Show.percent percent_cpu); - addch 32; + addch ' '; List.iteri ( fun di (domid, name, _, _, _, _, _) -> @@ -1143,14 +1197,15 @@ let redraw = total_cpu_time, total_memory, total_domU_memory) = totals in mvaddstr summary_lineno 0 - (sprintf (f_ "%d domains, %d active, %d running, %d sleeping, %d paused, %d inactive D:%d O:%d X:%d") - count active running blocked paused inactive shutdown shutoff - crashed); + (sprintf + (f_"%d domains, %d active, %d running, %d sleeping, %d paused, %d inactive D:%d O:%d X:%d") + count active running blocked paused inactive shutdown shutoff crashed); (* Total %CPU used, and memory summary. *) let percent_cpu = 100. *. total_cpu_time /. total_cpu in mvaddstr (summary_lineno+1) 0 - (sprintf (f_ "CPU: %2.1f%% Mem: %Ld MB (%Ld MB by guests)") + (sprintf + (f_"CPU: %2.1f%% Mem: %Ld MB (%Ld MB by guests)") percent_cpu (total_memory /^ 1024L) (total_domU_memory /^ 1024L)); (* Time to grab another historical %CPU for the list? *) @@ -1162,7 +1217,7 @@ let redraw = (* Display historical CPU time. *) let () = - let x, y = historical_cursor in (* Yes, it's a bug in ocaml-curses *) + let y, x = historical_cursor in let maxwidth = cols - x in let line = String.concat " " @@ -1172,8 +1227,7 @@ let redraw = () in move message_lineno 0; (* Park cursor in message area, as with top. *) - refresh (); (* Refresh the display. *) - () + refresh () (* Refresh the display. *) (* Write CSV header row. *) let write_csv_header () = @@ -1188,13 +1242,17 @@ 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_block then [ "Block RDRQ"; "Block WRRQ"; ] 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 + then [ "Block RDBY"; "Block WRBY"; ] else []) @ (if !csv_net then [ "Net RXBY"; "Net TXBY" ] else []) ) (* Write summary data to CSV file. *) let append_csv - (_, _, _, _, node_info, hostname, _) (* setup *) + (_, _, _, _, _, node_info, hostname, _) (* setup *) (doms, _, printable_time, nr_pcpus, total_cpu, _, @@ -1242,9 +1300,12 @@ 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_reqs; - string_of_int64_option rd.rd_block_wr_reqs; + string_of_int64_option rd.rd_block_rd_info; + string_of_int64_option rd.rd_block_wr_info; ] else []) @ (if !csv_net then [ string_of_int64_option rd.rd_net_rx_bytes; @@ -1255,49 +1316,120 @@ let append_csv (!csv_write) (summary_fields @ domain_fields) +let dump_stdout + (_, _, _, _, _, node_info, hostname, _) (* setup *) + (doms, + _, printable_time, + nr_pcpus, total_cpu, _, + totals, + _) (* state *) = + + (* Header for this iteration *) + printf "virt-top time %s Host %s %s %d/%dCPU %dMHz %LdMB \n" + printable_time hostname node_info.C.model node_info.C.cpus nr_pcpus + node_info.C.mhz (node_info.C.memory /^ 1024L); + (* dump domain information one by one *) + let rd, wr = if !block_in_bytes then "RDBY", "WRBY" else "RDRQ", "WRRQ" + in + printf " ID S %s %s RXBY TXBY %%CPU %%MEM TIME NAME\n" rd wr; + + (* sort by ID *) + let doms = + let compare = + (function + | Active {rd_domid = id1 }, Active {rd_domid = id2} -> + compare id1 id2 + | Active _, Inactive -> -1 + | Inactive, Active _ -> 1 + | Inactive, Inactive -> 0) + in + let cmp (name1, dom1) (name2, dom2) = compare(dom1, dom2) in + List.sort ~cmp doms in + (*Print domains *) + let dump_domain = fun name rd + -> begin + let state = show_state rd.rd_info.D.state in + let rd_req = if rd.rd_block_rd_info = None then " 0" + else Show.int64_option rd.rd_block_rd_info in + let wr_req = if rd.rd_block_wr_info = None then " 0" + else Show.int64_option rd.rd_block_wr_info in + let rx_bytes = if rd.rd_net_rx_bytes = None then " 0" + else Show.int64_option rd.rd_net_rx_bytes in + let tx_bytes = if rd.rd_net_tx_bytes = None then " 0" + else Show.int64_option rd.rd_net_tx_bytes in + let percent_cpu = Show.percent rd.rd_percent_cpu in + let percent_mem = Int64.to_float rd.rd_mem_percent in + let percent_mem = Show.percent percent_mem in + let time = Show.time rd.rd_info.D.cpu_time in + printf "%5d %c %s %s %s %s %s %s %s %s\n" + rd.rd_domid state rd_req wr_req rx_bytes tx_bytes + percent_cpu percent_mem time name; + end + in + List.iter ( + function + | name, Active dom -> dump_domain name dom + | name, Inactive -> () + ) doms; + flush stdout + (* Main loop. *) -let rec main_loop ((_, batch_mode, script_mode, csv_enabled, _, _, _) +let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _) as setup) = if csv_enabled then write_csv_header (); while not !quit do let state = collect setup in (* Collect stats. *) - if not script_mode then redraw setup state; (* Redraw display. *) + (* Redraw display. *) + if not script_mode && not stream_mode then redraw setup state; if csv_enabled then append_csv setup state; (* Update CSV file. *) + if stream_mode then dump_stdout setup state; (* dump to stdout *) (* Clear up unused virDomainPtr objects. *) Gc.compact (); - (* Get next key. This does the sleep. *) - if not batch_mode && not script_mode then - get_key_press setup; - (* Max iterations? *) if !iterations >= 0 then ( decr iterations; if !iterations = 0 then quit := true ); - (* End time? *) - (match !end_time with - | None -> () - | Some end_time -> - let (_, time, _, _, _, _, _, _) = state in - let delay_secs = float !delay /. 1000. in - if end_time <= time +. delay_secs then quit := true - ); - - (* Batch mode or script mode. We didn't call get_key_press above, so - * we didn't sleep. Sleep now, unless we are about to quit. + (* End time? We might need to adjust the precise delay down if + * the delay would be longer than the end time (RHBZ#637964). Note + * 'delay' is in milliseconds. *) - if batch_mode || script_mode then - if not !quit then - usleep !delay; + let delay = + match !end_time with + | None -> + (* No --end-time option, so use the current delay. *) + !delay + | Some end_time -> + let (_, time, _, _, _, _, _, _) = state in + let delay_secs = float !delay /. 1000. in + if end_time <= time +. delay_secs then ( + quit := true; + let delay = int_of_float (1000. *. (end_time -. time)) in + if delay >= 0 then delay else 0 + ) else + !delay in + (*eprintf "adjusted delay = %d\n%!" delay;*) + + (* Get next key. This does the sleep. *) + if not batch_mode && not script_mode && not stream_mode then + get_key_press setup delay + else ( + (* Batch mode, script mode, stream mode. We didn't call + * get_key_press, so we didn't sleep. Sleep now, unless we are + * about to quit. + *) + if not !quit || !end_time <> None then + millisleep delay + ) done -and get_key_press setup = - (* Read the next key, waiting up to !delay milliseconds. *) - timeout !delay; +and get_key_press setup delay = + (* Read the next key, waiting up to 'delay' milliseconds. *) + timeout delay; let k = getch () in timeout (-1); (* Reset to blocking mode. *) @@ -1316,25 +1448,26 @@ and get_key_press setup = else if k = Char.code '2' then toggle_net_display () else if k = Char.code '3' then toggle_block_display () else if k = Char.code 'W' then write_init_file () + else if k = Char.code 'B' then toggle_block_in_bytes_mode () else unknown_command k ) and change_delay () = print_msg - (sprintf (f_ "Change delay from %.1f to: ") (float !delay /. 1000.)); + (sprintf (f_"Change delay from %.1f to: ") (float !delay /. 1000.)); let str = get_string 16 in (* Try to parse the number. *) let error = try let newdelay = float_of_string str in if newdelay <= 0. then ( - print_msg (s_ "Delay must be > 0"); true + print_msg (s_"Delay must be > 0"); true ) else ( delay := int_of_float (newdelay *. 1000.); false ) with Failure "float_of_string" -> - print_msg (s_ "Not a valid number"); true in + print_msg (s_"Not a valid number"); true in refresh (); sleep (if error then 2 else 1) @@ -1342,8 +1475,8 @@ and change_sort_order () = clear (); let lines, cols = get_size () in - mvaddstr top_lineno 0 (s_ "Set sort order for main display"); - mvaddstr summary_lineno 0 (s_ "Type key or use up and down cursor keys."); + mvaddstr top_lineno 0 (s_"Set sort order for main display"); + mvaddstr summary_lineno 0 (s_"Type key or use up and down cursor keys."); attron A.reverse; mvaddstr header_lineno 0 (pad cols "KEY Sort field"); @@ -1461,6 +1594,12 @@ and toggle_block_display () = (* key 3 *) | TaskDisplay | NetDisplay -> BlockDisplay | BlockDisplay -> TaskDisplay +and toggle_block_in_bytes_mode () = (* key B *) + block_in_bytes := + match !block_in_bytes with + | false -> true + | true -> false + (* Write an init file. *) and write_init_file () = match !init_file with @@ -1492,8 +1631,8 @@ and _write_init_file filename = let fp = fprintf in let nl () = fp chan "\n" in - let () = fp chan (f_ "# %s virt-top configuration file\n") rcfile in - let () = fp chan (f_ "# generated on %s by %s\n") printable_date_time username in + let () = fp chan (f_"# %s virt-top configuration file\n") rcfile in + let () = fp chan (f_"# generated on %s by %s\n") printable_date_time username in nl (); fp chan "display %s\n" (cli_of_display !display_mode); fp chan "delay %g\n" (float !delay /. 1000.); @@ -1507,13 +1646,13 @@ and _write_init_file filename = if !batch_mode = true then fp chan "batch true\n"; if !secure_mode = true then fp chan "secure true\n"; nl (); - output_string chan (s_ "# To send debug and error messages to a file, uncomment next line\n"); + output_string chan (s_"# To send debug and error messages to a file, uncomment next line\n"); fp chan "#debug virt-top.out\n"; nl (); - output_string chan (s_ "# Enable CSV output to the named file\n"); + output_string chan (s_"# Enable CSV output to the named file\n"); fp chan "#csv virt-top.csv\n"; nl (); - output_string chan (s_ "# To protect this file from being overwritten, uncomment next line\n"); + output_string chan (s_"# To protect this file from being overwritten, uncomment next line\n"); fp chan "#overwrite-init-file false\n"; close_out chan; @@ -1525,18 +1664,20 @@ and _write_init_file filename = (* Rename filename.new to filename. *) Unix.rename (filename ^ ".new") filename; - print_msg (sprintf (f_ "Wrote settings to %s") filename); + print_msg (sprintf (f_"Wrote settings to %s") filename); refresh (); sleep 2 with | Sys_error err -> - print_msg (s_ "Error" ^ ": " ^ err); refresh (); sleep 2 + print_msg (s_"Error" ^ ": " ^ err); + refresh (); sleep 2 | Unix.Unix_error (err, fn, str) -> - print_msg (s_ ("Error" ^ ": " ^ Unix.error_message err ^ fn ^ str)); + print_msg (s_"Error" ^ ": " ^ + (Unix.error_message err) ^ " " ^ fn ^ " " ^ str); refresh (); sleep 2 -and show_help (_, _, _, _, _, hostname, +and show_help (_, _, _, _, _, _, hostname, (libvirt_major, libvirt_minor, libvirt_release)) = clear (); @@ -1545,7 +1686,7 @@ and show_help (_, _, _, _, _, hostname, (* Banner at the top of the screen. *) let banner = - sprintf (f_ "virt-top %s ocaml-libvirt %s libvirt %d.%d.%d by Red Hat") + sprintf (f_"virt-top %s ocaml-libvirt %s libvirt %d.%d.%d by Red Hat") Virt_top_version.version Libvirt_version.version libvirt_major libvirt_minor libvirt_release in @@ -1556,18 +1697,20 @@ and show_help (_, _, _, _, _, hostname, (* Status. *) mvaddstr 1 0 - (sprintf (f_ "Delay: %.1f secs; Batch: %s; Secure: %s; Sort: %s") + (sprintf + (f_"Delay: %.1f secs; Batch: %s; Secure: %s; Sort: %s") (float !delay /. 1000.) - (if !batch_mode then "On" else "Off") - (if !secure_mode then "On" else "Off") + (if !batch_mode then s_"On" else s_"Off") + (if !secure_mode then s_"On" else s_"Off") (printable_sort_order !sort_order)); mvaddstr 2 0 - (sprintf (f_ "Connect: %s; Hostname: %s") - (match !uri with None -> "default" | Some s -> s) + (sprintf + (f_"Connect: %s; Hostname: %s") + (match !uri with None -> s_"default" | Some s -> s) hostname); (* Misc keys on left. *) - let banner = pad 38 (s_ "MAIN KEYS") in + let banner = pad 38 (s_"MAIN KEYS") in attron A.reverse; mvaddstr header_lineno 1 banner; attroff A.reverse; @@ -1579,28 +1722,29 @@ and show_help (_, _, _, _, _, hostname, let key keys description = let lineno = get_lineno () in move lineno 1; attron A.bold; addstr keys; attroff A.bold; - move lineno 10; addstr description; () + move lineno 10; addstr description in - key "space ^L" (s_ "Update display"); - key "q" (s_ "Quit"); - key "d s" (s_ "Set update interval"); - key "h" (s_ "Help"); + key "space ^L" (s_"Update display"); + key "q" (s_"Quit"); + key "d s" (s_"Set update interval"); + key "h" (s_"Help"); + key "B" (s_"toggle block info req/bytes"); (* Sort order. *) ignore (get_lineno ()); - let banner = pad 38 (s_ "SORTING") in + let banner = pad 38 (s_"SORTING") in attron A.reverse; mvaddstr (get_lineno ()) 1 banner; attroff A.reverse; - key "P" (s_ "Sort by %CPU"); - key "M" (s_ "Sort by %MEM"); - key "T" (s_ "Sort by TIME"); - key "N" (s_ "Sort by ID"); - key "F" (s_ "Select sort field"); + key "P" (s_"Sort by %CPU"); + key "M" (s_"Sort by %MEM"); + key "T" (s_"Sort by TIME"); + key "N" (s_"Sort by ID"); + key "F" (s_"Select sort field"); (* Display modes on right. *) - let banner = pad 39 (s_ "DISPLAY MODES") in + let banner = pad 39 (s_"DISPLAY MODES") in attron A.reverse; mvaddstr header_lineno 40 banner; attroff A.reverse; @@ -1612,20 +1756,20 @@ and show_help (_, _, _, _, _, hostname, let key keys description = let lineno = get_lineno () in move lineno 40; attron A.bold; addstr keys; attroff A.bold; - move lineno 49; addstr description; () + move lineno 49; addstr description in - key "0" (s_ "Domains display"); - key "1" (s_ "Toggle physical CPUs"); - key "2" (s_ "Toggle network interfaces"); - key "3" (s_ "Toggle block devices"); + key "0" (s_"Domains display"); + key "1" (s_"Toggle physical CPUs"); + key "2" (s_"Toggle network interfaces"); + key "3" (s_"Toggle block devices"); (* Update screen and wait for key press. *) mvaddstr (lines-1) 0 - (s_ "More help in virt-top(1) man page. Press any key to return."); + (s_"More help in virt-top(1) man page. Press any key to return."); refresh (); ignore (getch ()) and unknown_command k = - print_msg (s_ "Unknown command - try 'h' for help"); + print_msg (s_"Unknown command - try 'h' for help"); refresh (); sleep 1