Revert "Use threaded console, adapt for Windows (ocaml#7906) (ocaml#7927

)" This reverts commit 6665a24. Probe if removing PR7906 fixes stalling described in ocaml#8043
jonahbeckford · Jun 25, 2023 · 74a2b68 · 74a2b68
1 parent e6a7ca6
commit 74a2b68
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,7 @@
-3.8.2 (2023-06-16)
-------------------
+3.8.2-revert-PR7906 (2023-06-16)
+--------------------------------
 
-- Switch back to threaded console for all systems; fix unresponsive console on
+- *Reverted* Switch back to threaded console for all systems; fix unresponsive console on
   Windows (#7906, @nojb)
 
 - Respect `-p` / `--only-packages` for `melange.emit` artifacts (#7849, @anmonteiro)

diff --git a/src/dune_config_file/display.ml b/src/dune_config_file/display.ml
@@ -44,4 +44,4 @@ let console_backend = function
   | Simple { status_line; _ } -> (
     match status_line with
     | false -> Dune_console.Backend.dumb
-    | true -> Dune_threaded_console.progress ())
+    | true -> Dune_console.Backend.progress)
diff --git a/src/dune_threaded_console/dune_threaded_console.ml b/src/dune_threaded_console/dune_threaded_console.ml
@@ -61,8 +61,7 @@ let make (module Base : S) : (module Dune_console.Backend) =
     let start () =
       Base.start ();
       Dune_engine.Scheduler.spawn_thread @@ fun () ->
-      if not Sys.win32 then
-        ignore (Unix.sigprocmask SIG_UNBLOCK [ Signal.to_int Winch ] : int list);
+      ignore (Unix.sigprocmask SIG_UNBLOCK [ Signal.to_int Winch ] : int list);
       let last = ref (Unix.gettimeofday ()) in
       let frame_rate = 1. /. 60. in
       let cleanup () =