Driver: add a counter for compiling assets

Author: panglesd

src/driver/compile.ml

@@ -11,29 +11,34 @@ let mk_byhash (pkgs : Odoc_unit.t list) =
     Util.StringMap.empty pkgs
 
 let init_stats (units : Odoc_unit.t list) =
-  let total, total_impl, non_hidden, mlds, indexes =
+  let total, total_impl, non_hidden, mlds, assets, indexes =
     List.fold_left
-      (fun (total, total_impl, non_hidden, mlds, indexes) (unit : Odoc_unit.t) ->
+      (fun (total, total_impl, non_hidden, mlds, assets, 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 assets =
+          match unit.kind with `Asset -> assets + 1 | _ -> assets
+        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, indexes))
-      (0, 0, 0, 0, Fpath.Set.empty)
+        (total, total_impl, non_hidden, mlds, assets, indexes))
+      (0, 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_assets assets;
   Atomic.set Stats.stats.total_indexes (Fpath.Set.cardinal indexes)
 
 open Eio.Std
@@ -155,6 +160,7 @@ let compile ?partial ~partial_dir ?linked_dir:_ (all : Odoc_unit.t list) =
     | `Asset ->
         Odoc.compile_asset ~output_dir:unit.output_dir ~parent_id:unit.parent_id
           ~name:(Fpath.filename unit.input_file);
+        Atomic.incr Stats.stats.compiled_assets;
         Ok unit
     | `Mld ->
         let includes = Fpath.Set.of_list unit.include_dirs in
@@ -199,7 +205,7 @@ let link : compiled list -> _ =
         (match c.kind with
         | `Intf _ -> Atomic.incr Stats.stats.linked_units
         | `Mld -> Atomic.incr Stats.stats.linked_mlds
-        | `Asset -> () (* TODO *)
+        | `Asset -> ()
         | `Impl _ -> Atomic.incr Stats.stats.linked_impls);
         c
   in

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_assets = Atomic.get Stats.stats.total_assets in
   let total_indexes = Atomic.get Stats.stats.total_indexes in
   let bar message total =
     let open Progress.Line in
@@ -474,19 +475,22 @@ let render_stats env nprocs =
       dline "Compiling" total
       ++ dline "Compiling impls" total_impls
       ++ dline "Compiling pages" total_mlds
+      ++ dline "Compiling assets" total_assets
       ++ dline "Linking" non_hidden
       ++ dline "Linking impls" total_impls
       ++ dline "Linking mlds" total_mlds
       ++ dline "Indexes" total_indexes
       ++ dline "HTML" (total_impls + non_hidden + total_mlds)
       ++ line (procs nprocs)
       ++ descriptions)
-    (fun comp compimpl compmld link linkimpl linkmld indexes html procs descr ->
-      let rec inner (a, b, c, d, e, f, i, g, h) =
+    (fun comp compimpl compmld compassets link linkimpl linkmld indexes html
+         procs descr ->
+      let rec inner (a, b, c, j, d, e, f, i, g, h) =
         Eio.Time.sleep clock 0.1;
         let a' = Atomic.get Stats.stats.compiled_units in
         let b' = Atomic.get Stats.stats.compiled_impls in
         let c' = Atomic.get Stats.stats.compiled_mlds in
+        let j' = Atomic.get Stats.stats.compiled_assets in
         let d' = Atomic.get Stats.stats.linked_units in
         let e' = Atomic.get Stats.stats.linked_impls in
         let f' = Atomic.get Stats.stats.linked_mlds in
@@ -499,16 +503,17 @@ let render_stats env nprocs =
         comp (a' - a);
         compimpl (b' - b);
         compmld (c' - c);
+        compassets (j' - j);
         link (d' - d);
         linkimpl (e' - e);
         linkmld (f' - f);
         indexes (i' - i);
         html (g' - g);
         procs (h' - h);
         if g' < non_hidden + total_impls + total_mlds then
-          inner (a', b', c', d', e', f', i', g', h')
+          inner (a', b', c', j', d', e', f', i', g', h')
       in
-      inner (0, 0, 0, 0, 0, 0, 0, 0, 0))
+      inner (0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
 
 let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
     odoc_bin voodoo package_name blessed dune_style =

src/driver/stats.ml

@@ -6,11 +6,13 @@ type stats = {
   mutable total_units : int Atomic.t;
   mutable total_impls : int Atomic.t;
   mutable total_mlds : int Atomic.t;
+  mutable total_assets : 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;
   mutable compiled_mlds : int Atomic.t;
+  mutable compiled_assets : int Atomic.t;
   mutable linked_units : int Atomic.t;
   mutable linked_impls : int Atomic.t;
   mutable linked_mlds : int Atomic.t;
@@ -25,11 +27,13 @@ let stats =
     total_units = Atomic.make 0;
     total_impls = Atomic.make 0;
     total_mlds = Atomic.make 0;
+    total_assets = Atomic.make 0;
     total_indexes = Atomic.make 0;
     non_hidden_units = Atomic.make 0;
     compiled_units = Atomic.make 0;
     compiled_impls = Atomic.make 0;
     compiled_mlds = Atomic.make 0;
+    compiled_assets = Atomic.make 0;
     linked_units = Atomic.make 0;
     linked_impls = Atomic.make 0;
     linked_mlds = Atomic.make 0;