Driver: fix total number of indexes to compute in progress bars

Author: panglesd

src/driver/compile.ml

@@ -10,27 +10,30 @@ let mk_byhash (pkgs : Odoc_unit.intf Odoc_unit.unit list) =
     Util.StringMap.empty pkgs
 
 let init_stats (units : Odoc_unit.t list) =
-  let total, total_impl, non_hidden, mlds =
+  let total, total_impl, non_hidden, mlds, indexes =
     List.fold_left
-      (fun (total, total_impl, non_hidden, mlds) (unit : Odoc_unit.t) ->
+      (fun (total, total_impl, non_hidden, mlds, indexes) (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 indexes = Fpath.Set.add unit.index.output_file indexes in
         let non_hidden =
           match unit.kind with
           | `Intf { hidden = false; _ } -> non_hidden + 1
           | _ -> non_hidden
         in
         let mlds = match unit.kind with `Mld -> mlds + 1 | _ -> mlds in
-        (total, total_impl, non_hidden, mlds))
-      (0, 0, 0, 0) units
+        (total, total_impl, non_hidden, mlds, indexes))
+      (0, 0, 0, 0, Fpath.Set.empty)
+      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;
-  Atomic.set Stats.stats.total_mlds mlds
+  Atomic.set Stats.stats.total_mlds mlds;
+  Atomic.set Stats.stats.total_indexes (Fpath.Set.cardinal indexes)
 
 open Eio.Std
 

src/driver/odoc_driver.ml

@@ -451,6 +451,7 @@ let render_stats env nprocs =
   let total = Atomic.get Stats.stats.total_units in
   let total_impls = Atomic.get Stats.stats.total_impls in
   let total_mlds = Atomic.get Stats.stats.total_mlds in
+  let total_indexes = Atomic.get Stats.stats.total_indexes in
   let bar message total =
     let open Progress.Line in
     list [ lpad 16 (const message); bar total; count_to total ]
@@ -476,7 +477,7 @@ let render_stats env nprocs =
       ++ dline "Linking" non_hidden
       ++ dline "Linking impls" total_impls
       ++ dline "Linking mlds" total_mlds
-      ++ dline "Indexes" 10000 (* TODO *)
+      ++ dline "Indexes" total_indexes
       ++ dline "HTML" (total_impls + non_hidden + total_mlds)
       ++ line (procs nprocs)
       ++ descriptions)

src/driver/stats.ml

@@ -6,6 +6,7 @@ type stats = {
   mutable total_units : int Atomic.t;
   mutable total_impls : int Atomic.t;
   mutable total_mlds : int Atomic.t;
+  mutable total_indexes : int Atomic.t;
   mutable non_hidden_units : int Atomic.t;
   mutable compiled_units : int Atomic.t;
   mutable compiled_impls : int Atomic.t;
@@ -24,6 +25,7 @@ let stats =
     total_units = Atomic.make 0;
     total_impls = Atomic.make 0;
     total_mlds = Atomic.make 0;
+    total_indexes = Atomic.make 0;
     non_hidden_units = Atomic.make 0;
     compiled_units = Atomic.make 0;
     compiled_impls = Atomic.make 0;