X-Git-Url: http://git.annexia.org/?p=virt-mem.git;a=blobdiff_plain;f=lib%2Fvirt_mem.ml;h=14456336e636dba69fec7315ba3d076ae529e342;hp=384a089bd6bc1564f42fda57220db04d2a7a459b;hb=c6362265f3247c19a9791e2bae65e2c6747ecdf7;hpb=ed07f2e8b46362e4e9bc03d41fff69cf5cc05e0e;ds=sidebyside

diff --git a/lib/virt_mem.ml b/lib/virt_mem.ml
index 384a089..1445633 100644
--- a/lib/virt_mem.ml
+++ b/lib/virt_mem.ml
@@ -236,8 +236,9 @@ let start usage_msg =
 
 	  if !def_text_addr = 0L then
 	    failwith
-	      (sprintf (f_"%s: use -T to define kernel load address for this image")
-		 name);
+	      (sprintf (f_"%s: use -T to define kernel load address for this image") name);
+
+	  let start_t = gettimeofday () in
 
 	  (* Read the kernel memory.
 	   * Maximum 64K can be read over remote connections.
@@ -254,6 +255,12 @@ let start usage_msg =
 	  in
 	  loop 0;
 
+	  if debug then (
+	    let end_t = gettimeofday () in
+	    eprintf "timing: downloading kernel took %f seconds\n%!"
+	      (end_t -. start_t)
+	  );
+
 	  (* Map the virtual memory. *)
 	  let mem = MMap.of_string str !def_text_addr in
 
@@ -337,12 +344,22 @@ let start usage_msg =
 	(* Searching for <NUL>string<NUL> *)
 	let common_ksyms_nul = List.map (sprintf "\000%s\000") common_ksyms in
 
+	let start_t = gettimeofday () in
+
 	(* Search for these strings in the memory image. *)
 	let ksym_strings = List.map (MMap.find_all mem) common_ksyms_nul in
 	let ksym_strings = List.concat ksym_strings in
 	(* Adjust found addresses to start of the string (skip <NUL>). *)
 	let ksym_strings = List.map Int64.succ ksym_strings in
 
+	if debug then (
+	  let end_t = gettimeofday () in
+	  eprintf "timing: searching for common_ksyms took %f seconds\n%!"
+	    (end_t -. start_t)
+	);
+
+	let start_t = gettimeofday () in
+
 	(* For any we found, try to look up the symbol table
 	 * base addr and size.
 	 *)
@@ -404,11 +421,11 @@ let start usage_msg =
 	let ksymtabs = List.filter (fun (_, size) -> size > 64L) ksymtabs in
 
 	if debug then (
-	  printf "%s: candidate symbol tables at:\n" name;
+	  eprintf "%s: candidate symbol tables at:\n" name;
 	  List.iter (
 	    fun (addr, size) ->
-	      printf "\t%Lx\t%Lx\t%!" addr size;
-	      printf "first symbol: %s\n%!"
+	      eprintf "\t%Lx\t%Lx\t%!" addr size;
+	      eprintf "first symbol: %s\n%!"
 		(MMap.get_string mem
 		   (MMap.follow_pointer mem
 		      (MMap.succ_long mem addr)))
@@ -427,7 +444,7 @@ let start usage_msg =
 
 	  | (_, (ksymtab_addr, ksymtab_size)) :: _ ->
 	      if debug then
-		printf
+		eprintf
 		  "%s: Kernel symbol table found at %Lx, size %Lx bytes\n%!"
 		  name ksymtab_addr ksymtab_size;
 
@@ -459,6 +476,14 @@ let start usage_msg =
 	      lookup_ksym
 	in
 
+	if debug then (
+	  let end_t = gettimeofday () in
+	  eprintf "timing: searching for ordinary ksyms took %f seconds\n%!"
+	    (end_t -. start_t)
+	);
+
+	let start_t = gettimeofday () in
+
 	(* Now try to find the /proc/kallsyms table.  This is in an odd
 	 * compressed format (but not a very successful compression
 	 * format).  However if it exists we know that it will contain
@@ -489,7 +514,7 @@ let start usage_msg =
 	     * If found, jump backwards by length and check all addresses.
 	     *)
 	    if debug then
-	      printf "%s: testing candidate kallsyms at %Lx\n" name addr;
+	      eprintf "%s: testing candidate kallsyms at %Lx\n" name addr;
 	    let rec loop addr =
 	      let addrp = MMap.follow_pointer mem addr in
 	      if MMap.is_mapped mem addrp then
@@ -516,7 +541,7 @@ let start usage_msg =
 		      (* ok! *)
 		      let names_addr = MMap.succ_long mem end_addr in
 		      if debug then
-			printf "%s: candidate kallsyms found at %Lx (names_addr at %Lx, num_entries %d)\n"
+			eprintf "%s: candidate kallsyms found at %Lx (names_addr at %Lx, num_entries %d)\n"
 			  name start_addr names_addr num_entries;
 		      Some (start_addr, num_entries, names_addr)
 		  in
@@ -553,7 +578,7 @@ let start usage_msg =
 			let names_addr = names_addr +^ Int64.of_int len +^ 2L in
 			let sym_value = MMap.follow_pointer mem start_addr in
 			let start_addr = MMap.succ_long mem start_addr in
-			(*printf "%S -> %Lx\n" name sym_value;*)
+			(*eprintf "%S -> %Lx\n" name sym_value;*)
 			names := (name, sym_value) :: !names;
 			loop names_addr start_addr (num-1)
 		      )
@@ -591,15 +616,15 @@ let start usage_msg =
 	) ksym_addrs in
 
 	if debug then (
-	  printf "%s: candidate kallsyms at:\n" name;
+	  eprintf "%s: candidate kallsyms at:\n" name;
 	  List.iter (
 	    function
 	    | (start_addr, num_entries, names_addr, Uncompressed _) ->
-		printf "\t%Lx %d entries names_addr=%Lx old-style\n%!"
+		eprintf "\t%Lx %d entries names_addr=%Lx old-style\n%!"
 		  start_addr num_entries names_addr
 	    | (start_addr, num_entries, names_addr,
 	       Compressed (_, markers_addr)) ->
-		printf "\t%Lx %d entries names_addr=%Lx markers_addr=%Lx\n%!"
+		eprintf "\t%Lx %d entries names_addr=%Lx markers_addr=%Lx\n%!"
 		  start_addr num_entries names_addr markers_addr
 	  ) kallsymtabs
 	);
@@ -664,7 +689,7 @@ let start usage_msg =
 		   *)
 		  (*let typ = name.[0] in*)
 		  let name = String.sub name 1 (String.length name - 1) in
-		  (*printf "%S -> %Lx\n" name sym_value;*)
+		  (*eprintf "%S -> %Lx\n" name sym_value;*)
 		  Some (name, sym_value)
 	      ) compressed_names in
 
@@ -677,6 +702,12 @@ let start usage_msg =
 
 	      lookup_ksym in
 
+	if debug then (
+	  let end_t = gettimeofday () in
+	  eprintf "timing: searching for kallsyms took %f seconds\n%!"
+	    (end_t -. start_t)
+	);
+
 	(* Just wrap the lookup_ksym call in something which prints
 	 * the query when debug is set.
 	 *)
@@ -685,10 +716,10 @@ let start usage_msg =
 	    let lookup_ksym sym =
 	      try
 		let value = lookup_ksym sym in
-		printf "lookup_ksym %S = %Lx\n%!" sym value;
+		eprintf "lookup_ksym %S = %Lx\n%!" sym value;
 		value
 	      with Not_found ->
-		printf "lookup_ksym %S failed\n%!" sym;
+		eprintf "lookup_ksym %S failed\n%!" sym;
 		raise Not_found
 	    in
 	    lookup_ksym