X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-df%2Fvirt_df.ml;h=f8f34ab6b52a041c220ac323ccc51c07244ef048;hp=b992e1b95484a302dc06f9918a05b913bad82655;hb=81294675f6a5058a3381871f1dc99c806922d77c;hpb=40c683ea4c9d921a6fe23c2639125261b92da472

diff --git a/virt-df/virt_df.ml b/virt-df/virt_df.ml
index b992e1b..f8f34ab 100644
--- a/virt-df/virt_df.ml
+++ b/virt-df/virt_df.ml
@@ -81,6 +81,7 @@ type domain = {
   dom_name : string;			(* Domain name. *)
   dom_id : int option;			(* Domain ID (if running). *)
   dom_disks : disk list;		(* Domain disks. *)
+  dom_lv_filesystems : filesystem list;	(* Domain LV filesystems. *)
 }
 and disk = {
   (* From the XML ... *)
@@ -97,7 +98,7 @@ and disk_content =
   [ `Unknown				(* Not probed or unknown. *)
   | `Partitions of partitions		(* Contains partitions. *)
   | `Filesystem of filesystem		(* Contains a filesystem directly. *)
-  | `PhysicalVolume of string		(* Contains an LVM PV. *)
+  | `PhysicalVolume of pv		(* Contains an LVM PV. *)
   ]
 
 (* Partitions. *)
@@ -116,7 +117,7 @@ and partition_status = Bootable | Nonbootable | Malformed | NullEntry
 and partition_content =
   [ `Unknown				(* Not probed or unknown. *)
   | `Filesystem of filesystem		(* Filesystem. *)
-  | `PhysicalVolume of string		(* Contains an LVM PV. *)
+  | `PhysicalVolume of pv		(* Contains an LVM PV. *)
   ]
 
 (* Filesystems (also swap devices). *)
@@ -134,6 +135,19 @@ and filesystem = {
   fs_inodes_used : int64;		(* Inodes in use. *)
 }
 
+(* Physical volumes. *)
+and pv = {
+  lvm_plugin_id : lvm_plugin_id;        (* The LVM plug-in. *)
+  pv_uuid : string;			(* UUID. *)
+}
+
+(* Logical volumes. *)
+and lv = {
+  lv_dev : device;			(* Logical volume device. *)
+}
+
+and lvm_plugin_id = string
+
 (* Convert partition, filesystem types to printable strings for debugging. *)
 let string_of_partition
     { part_status = status; part_type = typ; part_dev = dev } =
@@ -210,13 +224,37 @@ let probe_for_pv dev =
   let rec loop = function
     | [] -> None
     | (lvm_name, (probe_fn, _)) :: rest ->
-	if probe_fn dev then Some lvm_name else loop rest
+	try Some (probe_fn lvm_name dev)
+	with Not_found -> loop rest
   in
   let r = loop !lvm_types in
   if debug then (
     match r with
     | None -> eprintf "no PV found on %s\n%!" dev#name
-    | Some lvm_name ->
-	eprintf "%s contains a %s PV\n%!" dev#name lvm_name
+    | Some { lvm_plugin_id = name } ->
+	eprintf "%s contains a %s PV\n%!" dev#name name
   );
   r
+
+let list_lvs lvm_name devs =
+  let _, list_lvs_fn = List.assoc lvm_name !lvm_types in
+  list_lvs_fn devs
+
+(*----------------------------------------------------------------------*)
+
+(* This version by Isaac Trotts. *)
+let group_by ?(cmp = Pervasives.compare) ls =
+  let ls' =
+    List.fold_left
+      (fun acc (day1, x1) ->
+         match acc with
+             [] -> [day1, [x1]]
+           | (day2, ls2) :: acctl ->
+               if cmp day1 day2 = 0
+               then (day1, x1 :: ls2) :: acctl
+               else (day1, [x1]) :: acc)
+      []
+      ls
+  in
+  let ls' = List.rev ls' in
+  List.map (fun (x, xs) -> x, List.rev xs) ls'