Driver: Show what is being done

Author: panglesd

src/driver/odoc_driver.ml

@@ -459,6 +459,12 @@ let render_stats env nprocs =
     let open Progress.Line in
     list [ lpad 16 (const "Processes"); bar total; count_to total ]
   in
+  let description =
+    let open Progress.Line in
+    string
+  in
+  let descriptions = Multi.lines (List.init nprocs (fun _ -> description)) in
+
   let non_hidden = Atomic.get Stats.stats.non_hidden_units in
 
   let dline x y = Multi.line (bar x y) in
@@ -472,8 +478,9 @@ let render_stats env nprocs =
       ++ dline "Linking mlds" total_mlds
       ++ 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 ->
+      ++ 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) =
         Eio.Time.sleep clock 0.1;
         let a' = Atomic.get Stats.stats.compiled_units in
@@ -485,7 +492,9 @@ let render_stats env nprocs =
         let i' = Atomic.get Stats.stats.generated_indexes in
         let g' = Atomic.get Stats.stats.generated_units in
         let h' = Atomic.get Stats.stats.processes in
-
+        List.iteri
+          (fun i descr -> descr (Atomic.get Stats.stats.process_activity.(i)))
+          descr;
         comp (a' - a);
         compimpl (b' - b);
         compmld (c' - c);
@@ -508,6 +517,7 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
   Eio.Switch.run @@ fun sw ->
   if verbose then Logs.set_level (Some Logs.Debug);
   Logs.set_reporter (Logs_fmt.reporter ());
+  Stats.init_nprocs nb_workers;
   let () = Worker_pool.start_workers env sw nb_workers in
 
   let all =

src/driver/stats.ml

@@ -16,6 +16,7 @@ type stats = {
   mutable generated_indexes : int Atomic.t;
   mutable generated_units : int Atomic.t;
   mutable processes : int Atomic.t;
+  mutable process_activity : string Atomic.t Array.t;
 }
 
 let stats =
@@ -33,8 +34,12 @@ let stats =
     generated_units = Atomic.make 0;
     generated_indexes = Atomic.make 0;
     processes = Atomic.make 0;
+    process_activity = [||];
   }
 
+let init_nprocs nprocs =
+  stats.process_activity <- Array.init nprocs (fun _ -> Atomic.make "idle")
+
 let pp_stats fmt stats =
   Fmt.pf fmt
     "Total units: %d\n\

src/driver/worker_pool.ml

@@ -17,13 +17,13 @@ let stream : t = Eio.Stream.create 0
 let handle_job env request output_file = Run.run env request output_file
 
 let rec run_worker env id : unit =
-  let { request; output_file; description = _ }, reply =
-    Eio.Stream.take stream
-  in
+  let { request; output_file; description }, reply = Eio.Stream.take stream in
   Atomic.incr Stats.stats.processes;
+  Atomic.set Stats.stats.process_activity.(id) description;
   (try
      let result = handle_job env request output_file in
      Atomic.decr Stats.stats.processes;
+     Atomic.set Stats.stats.process_activity.(id) "idle";
      Promise.resolve reply (Ok result)
    with e -> Promise.resolve_error reply e);
   run_worker env id
@@ -41,7 +41,7 @@ let start_workers env sw n =
           `Stop_daemon
         with Stdlib.Exit -> `Stop_daemon)
   in
-  for i = 1 to n do
-    spawn_worker (Printf.sprintf "%d" i)
+  for i = 0 to n - 1 do
+    spawn_worker i
   done;
   ()