X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fvirt_mem_utils.ml;h=8eb312abe1b98815fef58891faead64d22f2f127;hb=d8fa024d7e4d25b99c1e71acc8fa330d3ef4195c;hp=db759dd981d3d1af072add3f3c3ba22e84ff787c;hpb=5ce06c3326a2672e82dc656b35eb7a3e6616539a;p=virt-mem.git

diff --git a/lib/virt_mem_utils.ml b/lib/virt_mem_utils.ml
index db759dd..8eb312a 100644
--- a/lib/virt_mem_utils.ml
+++ b/lib/virt_mem_utils.ml
@@ -57,9 +57,9 @@ let architecture_of_string = function
 		  str)
 
 let endian_of_architecture = function
-  | I386 | X86_64 -> Bitmatch.LittleEndian
-  | IA64 -> Bitmatch.LittleEndian (* XXX usually? *)
-  | PPC | PPC64 | SPARC | SPARC64 -> Bitmatch.BigEndian
+  | I386 | X86_64 -> Bitstring.LittleEndian
+  | IA64 -> Bitstring.LittleEndian (* XXX usually? *)
+  | PPC | PPC64 | SPARC | SPARC64 -> Bitstring.BigEndian
 
 type wordsize =
   | W32 | W64
@@ -95,3 +95,61 @@ let frequency xs =
   in
   let xs = loop xs in
   List.rev (List.sort compare xs)
+
+let rec uniq ?(cmp = Pervasives.compare) = function
+  | [] -> []
+  | [x] -> [x]
+  | x :: y :: xs when cmp x y = 0 ->
+      uniq (x :: xs)
+  | x :: y :: xs ->
+      x :: uniq (y :: xs)
+
+let sort_uniq ?cmp xs =
+  let xs = ExtList.List.sort ?cmp xs in
+  let xs = uniq ?cmp xs in
+  xs
+
+(* Pad a string to a fixed width (from virt-top, but don't truncate). *)
+let pad width str =
+  let n = String.length str in
+  if n >= width then str
+  else (* if n < width then *) str ^ String.make (width-n) ' '
+
+(* General binary tree type.  Data 'a is stored in the leaves and 'b
+ * is stored in the nodes.
+ *)
+type ('a,'b) binary_tree =
+  | Leaf of 'a
+  | Node of ('a,'b) binary_tree * 'b * ('a,'b) binary_tree
+
+(* This prints out the binary tree in graphviz dot format. *)
+let print_binary_tree leaf_printer node_printer tree =
+  (* Assign a unique, fixed label to each node. *)
+  let label =
+    let i = ref 0 in
+    let hash = Hashtbl.create 13 in
+    fun node ->
+      try Hashtbl.find hash node
+      with Not_found ->
+	let i = incr i; !i in
+	let label = "n" ^ string_of_int i in
+	Hashtbl.add hash node label;
+	label
+  in
+  (* Recursively generate the graphviz file. *)
+  let rec print = function
+    | (Leaf a as leaf) ->
+	eprintf "  %s [shape=box, label=\"%s\"];\n"
+	  (label leaf) (leaf_printer a)
+    | (Node (left,b,right) as node) ->
+	eprintf "  %s [label=\"%s\"];\n"
+	  (label node) (node_printer b);
+	eprintf "  %s -> %s [tailport=sw];\n" (label node) (label left);
+	eprintf "  %s -> %s [tailport=se];\n" (label node) (label right);
+	print left;
+	print right;
+  in
+  eprintf "/* Use 'dot -Tpng foo.dot > foo.png' to convert to a png file. */\n";
+  eprintf "digraph G {\n";
+  print tree;
+  eprintf "}\n%!"