Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for the changes in communication algorithm and reduce delay #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for the changes in communication algorithm and reduce delay #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3a66fe
wip: read one message, starting with size
dfordivam Jan 16, 2020
01334b7
Process messages in chunks
dfordivam Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/Language/Javascript/JSaddle/Wasm.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,16 @@ run _ entryPoint = do
receiveDataMessage = loop
where
loop = do
threadDelay (100)
try (BSIO.hGetLine jsInOut)
threadDelay 1
try (BSIO.hGetNonBlocking jsInOut 4)
>>= \case
(Left (ex :: IOException)) -> loop
(Right v) -> return $ BS.fromStrict v
(Right v)
| BSIO.null v -> loop
| otherwise -> do
-- Somehow we get this size in reverse!!
let size = Binary.decode (BS.reverse $ BS.fromStrict v) :: Word32
BS.fromStrict <$> BSIO.hGetNonBlocking jsInOut (fromIntegral size)

-- When to exit? never?
waitTillClosed = forever $ do
Expand All @@ -76,13 +81,15 @@ run _ entryPoint = do
waitTillClosed

processIncomingMsgs :: (Results -> IO ()) -> ByteString -> IO ()
processIncomingMsgs cont msgs = do
let
size = Binary.decode (BS.take 4 msgs) :: Word32
(thisMsg, rest) = BS.splitAt (fromIntegral $ 4 + size) msgs
case decode (BS.drop 4 thisMsg) of
Nothing -> error $ "jsaddle Results decode failed : " <> show thisMsg
Just r -> cont r
case BS.length rest of
0 -> return ()
_ -> processIncomingMsgs cont rest
processIncomingMsgs cont msgs = if (BS.length msgs < 5)
then error $ "processIncomingMsgs: no more data while looping: " <> show msgs
else do
let
size = Binary.decode (BS.take 4 msgs) :: Word32
(thisMsg, rest) = BS.splitAt (fromIntegral $ 4 + size) msgs
case decode (BS.drop 4 thisMsg) of
Nothing -> error $ "jsaddle Results decode failed : " <> show thisMsg
Just r -> cont r
case BS.length rest of
0 -> return ()
_ -> processIncomingMsgs cont rest