Driver: use the list of odoc units to count the max stats

Author: panglesd

src/driver/compile.ml

@@ -9,35 +9,24 @@ let mk_byhash (pkgs : Odoc_unit.intf Odoc_unit.unit list) =
       | `Intf { hash; _ } -> Util.StringMap.add hash u acc)
     Util.StringMap.empty pkgs
 
-let init_stats (pkgs : Packages.t Util.StringMap.t) =
+let init_stats (units : Odoc_unit.t list) =
   let total, total_impl, non_hidden, mlds =
-    Util.StringMap.fold
-      (fun _pkg_name pkg acc ->
-        let tt, ti, nh, md =
-          List.fold_left
-            (fun (tt, ti, nh, md) (lib : Packages.libty) ->
-              List.fold_left
-                (fun (total, total_impl, non_hidden, mlds)
-                     (m : Packages.modulety) ->
-                  let total = total + 1 in
-                  let total_impl =
-                    match m.m_impl with
-                    | Some impl -> (
-                        match impl.mip_src_info with
-                        | Some _ -> total_impl + 1
-                        | None -> total_impl)
-                    | None -> total_impl
-                  in
-                  let non_hidden =
-                    if m.m_hidden then non_hidden else non_hidden + 1
-                  in
-                  (total, total_impl, non_hidden, mlds))
-                (tt, ti, nh, md) lib.modules)
-            acc pkg.Packages.libraries
+    List.fold_left
+      (fun (total, total_impl, non_hidden, mlds) (unit : Odoc_unit.t) ->
+        let total = match unit.kind with `Intf _ -> total + 1 | _ -> total in
+        let total_impl =
+          match unit.kind with `Impl _ -> total_impl + 1 | _ -> total_impl
+        in
+        let non_hidden =
+          match unit.kind with
+          | `Intf { hidden = false; _ } -> non_hidden + 1
+          | _ -> non_hidden
         in
-        (tt, ti, nh, md + List.length pkg.Packages.mlds))
-      pkgs (0, 0, 0, 0)
+        let mlds = match unit.kind with `Mld -> mlds + 1 | _ -> mlds in
+        (total, total_impl, non_hidden, mlds))
+      (0, 0, 0, 0) units
   in
+
   Atomic.set Stats.stats.total_units total;
   Atomic.set Stats.stats.total_impls total_impl;
   Atomic.set Stats.stats.non_hidden_units non_hidden;

src/driver/compile.mli

@@ -1,6 +1,6 @@
 type compiled
 
-val init_stats : Packages.set -> unit
+val init_stats : Odoc_unit.t list -> unit
 
 val compile :
   ?partial:Fpath.t ->

src/driver/indexes.ml

@@ -470,7 +470,7 @@ let render_stats env nprocs =
       ++ dline "Linking" non_hidden
       ++ dline "Linking impls" total_impls
       ++ dline "Linking mlds" total_mlds
-      ++ dline "Indexes" 10000
+      ++ dline "Indexes" 10000 (* TODO *)
       ++ dline "HTML" (total_impls + non_hidden + total_mlds)
       ++ line (procs nprocs))
     (fun comp compimpl compmld link linkimpl linkmld indexes html procs ->
@@ -537,7 +537,6 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
       | _ -> failwith "Error, expecting singleton library in voodoo mode"
     else None
   in
-  Compile.init_stats all;
   let () =
     Eio.Fiber.both
       (fun () ->
@@ -546,6 +545,7 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
           Odoc_unit.of_packages ~output_dir:odoc_dir ~linked_dir:odocl_dir
             ~index_dir:None all
         in
+        Compile.init_stats all;
         let compiled =
           Compile.compile ?partial ~partial_dir:odoc_dir ?linked_dir:odocl_dir
             all
@@ -559,10 +559,7 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
 
   Format.eprintf "Final stats: %a@.%!" Stats.pp_stats Stats.stats;
   Format.eprintf "Total time: %f@.%!" (Stats.total_time ());
-  if stats then Stats.bench_results html_dir;
-  let indexes = Util.StringMap.map (fun _i pkg -> Indexes.package pkg) all in
-
-  ignore indexes
+  if stats then Stats.bench_results html_dir
 
 let fpath_arg =
   let print ppf v = Fpath.pp ppf v in