more tracing

src/client/opamAuxCommands.ml

@@ -395,6 +395,7 @@ let simulate_local_pinnings ?quiet ?(for_view=false) st to_pin =
 
 let simulate_autopin st ?quiet ?(for_view=false) ?locked ?recurse ?subpath
     atom_or_local_list =
+  OpamTrace.with_span "AuxCommands.simulate_autopin" @@ fun () ->
   let atoms, to_pin, obsolete_pins, already_pinned_set =
     autopin_aux st ?quiet ~for_view ?recurse ?subpath ?locked atom_or_local_list
   in

src/client/opamCommands.ml

@@ -935,6 +935,7 @@ let show cli =
   let show global_options fields show_empty raw where
       list_files file normalise no_lint just_file all_versions sort atom_locs
       () =
+  OpamTrace.with_span "Commands.show" @@ fun () ->
     let print_just_file opamf opam =
       if not no_lint then OpamFile.OPAM.print_errors opam;
       let opam =

src/client/opamListCommand.ml

@@ -715,6 +715,7 @@ let display st format packages =
     OpamConsole.print_table ?cut:format.wrap stdout ~sep:format.separator
 
 let get_switch_state gt rt =
+  OpamTrace.with_span "ListCommand.get_switch_state" @@ fun () ->
   match OpamStateConfig.get_switch_opt () with
   | None -> OpamSwitchState.load_virtual gt rt
   | Some sw -> OpamSwitchState.load `Lock_none gt rt sw

src/core/opamProcess.ml

@@ -501,7 +501,7 @@ let empty_result = {
 
 (* XXX: the function might block for ever for some channels kinds *)
 let read_lines f =
-  OpamTrace.with_span "process.read_lines"
+  OpamTrace.with_span "Process.read_lines"
       ~data:["f", `String f] @@ fun () ->
   try
     let ic = open_in f in
@@ -756,7 +756,11 @@ let dry_wait_one = function
   | _ -> raise (Invalid_argument "dry_wait_one")
 
 let run command =
-  OpamTrace.with_span "process.run" ~data:["cmd", `String command.cmd] @@ fun () ->
+  OpamTrace.with_span "Process.run"
+      ~data:["cmd", `String command.cmd;
+             "args", `String (String.concat " " command.args)]
+  @@ fun () ->
+
   let command =
     { command with
       cmd_stdin = OpamStd.Option.Op.(command.cmd_stdin ++ Some (not Sys.win32)) }

src/state/opamSysInteract.ml

@@ -380,7 +380,7 @@ let yum_cmd = lazy begin
 end
 
 let packages_status ?(env=OpamVariable.Map.empty) config packages =
-  OpamTrace.with_span "sys-interact.packages-status" @@ fun () ->
+  OpamTrace.with_span "sys-interact.packages_status" @@ fun () ->
   let (+++) pkg set = OpamSysPkg.Set.add (OpamSysPkg.of_string pkg) set in
   (* Some package managers don't permit to request on available packages. In
      this case, we consider all non installed packages as [available]. *)
@@ -470,7 +470,7 @@ let packages_status ?(env=OpamVariable.Map.empty) config packages =
   in
   let compute_sets_for_arch ~pacman =
     let get_avail_w_virtuals () =
-      OpamTrace.with_span "comput-sets-for-archs" @@ fun () ->
+      OpamTrace.with_span "SysInteract.compute-sets-for-archs" @@ fun () ->
       let package_provided str =
         OpamSysPkg.of_string
           (match OpamStd.String.cut_at str '=' with
@@ -496,9 +496,12 @@ let packages_status ?(env=OpamVariable.Map.empty) config packages =
       *)
       (* Discard stderr to not have it pollute output. Plus, exit code is the
          number of packages not found. *)
-      run_command ~discard_err:true pacman ["-Si"]
-      |> snd
-      |> List.fold_left (fun (avail, provides, latest) l ->
+      let _, p = run_command ~discard_err:true pacman ["-Si"] in
+
+      OpamTrace.with_span "parse_pacman_output"
+          ~data:["n", `Float (float_of_int (List.length p))]
+      @@ fun () ->
+      List.fold_left (fun (avail, provides, latest) l ->
           match OpamStd.String.split l ' ' with
           | "Name"::":"::p::_ ->
             p +++ avail, provides, Some (OpamSysPkg.of_string p)
@@ -512,7 +515,7 @@ let packages_status ?(env=OpamVariable.Map.empty) config packages =
             in
             ps ++ avail, provides, None
           | _ -> avail, provides, latest)
-        (OpamSysPkg.Set.empty, OpamSysPkg.Map.empty, None)
+        (OpamSysPkg.Set.empty, OpamSysPkg.Map.empty, None) p
       |> (fun (a,p,_) -> a,p)
     in
     let get_installed str_pkgs =
@@ -522,6 +525,8 @@ let packages_status ?(env=OpamVariable.Map.empty) config packages =
          >extra/cmark 0.29.0-1
          >    CommonMark parsing and rendering library and program in C
       *)
+      OpamTrace.with_span "SysInteract.get_installed" @@ fun () ->
+
       let re_pkg =
         Re.(compile @@ seq
               [ bol;