CP-17268 simplify finding tmpdir, fix indentation

Signed-off-by: Christian Lindig <[email protected]>

Author: lindig

Makefile

@@ -98,11 +98,9 @@ release:
 	mv _oasis.tmp _oasis
 	oasis setup
 
-# make coverage 
-# prepares for building with coverage analysis
-#
-# make uncover
-# reverses the setup from "make coverage"
+# make coverage - prepares for building with coverage analysis
+# make uncover  - reverses the setup from "make coverage"
+# make report   - create coverage/index.html 
 
 coverage: _tags _tags.coverage 
 	test ! -f _tags.orig && mv _tags _tags.orig || true
@@ -111,5 +109,8 @@ coverage: _tags _tags.coverage
 uncover: _tags.orig
 	mv _tags.orig _tags
 
-.PHONY: default coverage uncover
+report:
+	bisect-ppx-report -I _build -html coverage /tmp/bisect-xenops*out
+
+.PHONY: report coverage uncover
 

libvirt/xenops_libvirt_main.ml

@@ -16,11 +16,13 @@ let specific_essential_paths = Path.hvm_guests @ Path.network_configuration
 
 (* Start the program with the libvirt backend *)
 let _ =
-  Coverage.init "xenopsd-libvirt";
+	Coverage.init "xenopsd-libvirt";
 	Xenops_interface.queue_name := !Xenops_interface.queue_name ^ ".libvirt";
 	Xenops_utils.set_root "xenopsd/libvirt";
 	Xenopsd.configure
 		~specific_essential_paths
 		();
 	Xenopsd.main
 		(module Xenops_server_libvirt: Xenops_server_plugin.S)
+
+(* vim: ts=2 sw=2 noet *)

profiling/coverage.ml

@@ -3,33 +3,16 @@
  *  where log files are written.
  *)
 
-let (//) = Filename.concat 
-
-let is_dir  = function 
-  | ""    -> false
-  | path  -> try Sys.is_directory path with Sys_error _ -> false
-
-(* [tmpdir] points to a directory for temporary files *)
-let tmpdir =
-  let getenv n = try Sys.getenv n with Not_found -> "" in
-  let dirs = 
-    [ getenv "TMP"
-    ; getenv "TEMP"
-    ; "/tmp"
-    ; "/usr/tmp"
-    ; "/var/tmp"
-    ] in
-  try
-    List.find is_dir dirs
-  with
-    Not_found -> failwith "can't find temp directory "^__LOC__
 
 (** [init name] sets up coverage profiling for binary [name]. You could 
  *  use [Sys.argv.(0)] for [name].
  *)
+
 let init name =
-  try 
-    ignore (Sys.getenv "BISECT_FILE") 
-  with Not_found ->
-    Unix.putenv "BISECT_FILE" (tmpdir // Printf.sprintf "bisect-%s-" name)
+  let (//)    = Filename.concat in
+  let tmpdir  = Filename.get_temp_dir_name () in
+    try 
+      ignore (Sys.getenv "BISECT_FILE") 
+    with Not_found ->
+      Unix.putenv "BISECT_FILE" (tmpdir // Printf.sprintf "bisect-%s-" name)
 

simulator/xenops_simulator_main.ml

@@ -14,7 +14,7 @@
 
 (* Start the program with the simulator backend *)
 let _ =
-  Coverage.init "xenops-simulator";
+	Coverage.init "xenops-simulator";
 	Xenops_interface.queue_name := !Xenops_interface.queue_name ^ ".simulator";
 	Xenops_utils.set_root "xenopsd/simulator";
 	Xenopsd.configure ();