From d5df1bc9fdad2b33818e0b20bdef5836cfa8570e Mon Sep 17 00:00:00 2001 From: Ramana Kumar Date: Sun, 12 Nov 2017 09:20:35 +1100 Subject: [PATCH] Make some minor tweaks to ProcessMultiplexor.sml --- tools/Holmake/poly/ProcessMultiplexor.sml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Holmake/poly/ProcessMultiplexor.sml b/tools/Holmake/poly/ProcessMultiplexor.sml index 9037844d44..83fcebe8a6 100644 --- a/tools/Holmake/poly/ProcessMultiplexor.sml +++ b/tools/Holmake/poly/ProcessMultiplexor.sml @@ -89,7 +89,7 @@ struct let open Posix.IO val (flags,_) = getfl fd - val rdr = mkTextReader { fd = fd, name = "", initBlkMode = true } + val rdr = mkTextReader { fd = fd, name = "", initBlkMode = not(O.allSet(O.nonblock,flags)) } in TextIO.mkInstream (TextIO.StreamIO.mkInstream (rdr, "")) end @@ -219,9 +219,9 @@ struct fun fill_workq monitorfn (acc as (cmds, wl : 'a worklist)) = let - val {current_jobs,current_state,genjob,...} = wl + val {current_jobs,current_state,genjob,worklimit,...} = wl in - if Binarymap.numItems(#current_jobs wl) >= #worklimit wl then acc + if Binarymap.numItems current_jobs >= worklimit then acc else case genjob current_state of NoMoreJobs s' => (cmds, updstate s' wl)