Rename find_usages_from_stats as find_cpu_usages.

[virt-top.git] / virt-top / virt_top.ml

diff --git a/virt-top/virt_top.ml b/virt-top/virt_top.ml
index b304766..eafad95 100644 (file)
--- a/virt-top/virt_top.ml
+++ b/virt-top/virt_top.ml
@@ -226,6 +226,24 @@ OPTIONS" in
   (* Read the init file. *)
   let try_to_read_init_file filename =
     let config = read_config_file filename in
+    (* Replacement functions that raise better errors when
+     * parsing the init file.
+     *)
+    let int_of_string s =
+      try int_of_string s
+      with Invalid_argument _ ->
+        failwithf (f_"%s: could not parse '%s' in init file: expecting an integer")
+          filename s in
+    let float_of_string s =
+      try float_of_string s
+      with Invalid_argument _ ->
+        failwithf (f_"%s: could not parse '%s' in init file: expecting a number")
+          filename s in
+    let bool_of_string s =
+      try bool_of_string s
+      with Invalid_argument _ ->
+        failwithf (f_"%s: could not parse '%s' in init file: expecting %s")
+          filename s "true|false" in
     List.iter (
       function
       | _, "display", mode -> display_mode := display_of_cli mode
@@ -653,12 +671,12 @@ let collect, clear_pcpu_display_data =
              (try
                 let domid = rd.rd_domid in
                 let maplen = C.cpumaplen nr_pcpus in
-                let cpu_stats = D.get_cpu_stats rd.rd_dom nr_pcpus in
-                let rec find_usages_from_stats = function
+                let cpu_stats = D.get_cpu_stats rd.rd_dom in
+                let rec find_cpu_usages = function
                   | ("cpu_time", D.TypedFieldUInt64 usages) :: _ -> usages
-                  | _ :: params -> find_usages_from_stats params
+                  | _ :: params -> find_cpu_usages params
                   | [] -> 0L in
-                let pcpu_usages = Array.map find_usages_from_stats cpu_stats in
+                let pcpu_usages = Array.map find_cpu_usages cpu_stats in
                 let maxinfo = rd.rd_info.D.nr_virt_cpu in
                 let nr_vcpus, vcpu_infos, cpumaps =
                   D.get_vcpus rd.rd_dom maxinfo maplen in