X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ps%2Fvirt_ps.ml;h=07e5e76bba4b9fb37abf2dccd100077a7adce182;hb=6d60df50895e83763a20c4ec62ef0ec334cd7676;hp=41e8af7ab00dd09af3a0eb79e4531eed0c8bce4b;hpb=df3b931012515e3f0e7b741d000f4930dbea0a79;p=virt-mem.git

diff --git a/ps/virt_ps.ml b/ps/virt_ps.ml
index 41e8af7..07e5e76 100644
--- a/ps/virt_ps.ml
+++ b/ps/virt_ps.ml
@@ -23,14 +23,33 @@ open Virt_mem_gettext.Gettext
 open Virt_mem_utils
 open Virt_mem_types
 
+open Kernel
 
+let run debug { addrmap = addrmap } =
+  (* Grab all the task_struct structures. *)
+  let tasks = AddrMap.fold (
+    fun _ v tasks ->
+      match v with
+      | _, Some (_, _, Task_struct task) -> task :: tasks
+      | _ -> tasks
+  ) addrmap [] in
 
-let run debug ({ mem = mem }, ksymmap, _) =
-  ()
+  (* Sort tasks by PID. *)
+  let cmp { task_struct_pid = p1 } { task_struct_pid = p2 } = compare p1 p2 in
+  let tasks = List.sort cmp tasks in
+
+  printf "  PID STAT COMMAND\n";
+
+  List.iter (
+    fun { task_struct_pid = pid; task_struct_comm = comm } ->
+      let comm = truncate_c_string comm in
+      printf "%5Ld      %s\n" pid comm
+  ) tasks
 
 let summary = s_"list processes in virtual machine"
 let description = s_"\
 virt-ps prints a process listing for virtual machines running under
 libvirt."
 
-let () = Virt_mem.register "ps" summary description ~run
+let () =
+  Virt_mem.register "ps" summary description ~needs_tasks:true ~run