@@ -1,9 +1,6 @@
1−{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
3{-# LANGUAGE LambdaCase #-}
2{-# LANGUAGE LambdaCase #-}
4{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE MagicHash #-}
6−{-# LANGUAGE UnboxedTuples #-}
7-----------------------------------------------------------------------------
4-----------------------------------------------------------------------------
9-- Module : Language.Javascript.JSaddle.Run
6-- Module : Language.Javascript.JSaddle.Run
@@ -37,58 +34,40 @@ module Language.Javascript.JSaddle.Run (
39#ifdef ghcjs_HOST_OS
36#ifdef ghcjs_HOST_OS
40−import Language.Javascript.JSaddle.Types (JSM, syncPoint, syncAfter)
37+import Language.Javascript.JSaddle.Types (JSM)
41import qualified JavaScript.Web.AnimationFrame as GHCJS
38import qualified JavaScript.Web.AnimationFrame as GHCJS
42 (waitForAnimationFrame)
39 (waitForAnimationFrame)
44−import Control.Exception (throwIO, evaluate)
41+import Control.Exception (throwIO)
45−import Control.Monad (void, when, zipWithM_)
42+import Control.Monad (void, when, forever, zipWithM_)
46import Control.Monad.IO.Class (MonadIO(..))
43import Control.Monad.IO.Class (MonadIO(..))
47import Control.Monad.Trans.Reader (ask, runReaderT)
44import Control.Monad.Trans.Reader (ask, runReaderT)
48import Control.Monad.STM (atomically)
45import Control.Monad.STM (atomically)
49−import Control.Concurrent (forkIO, myThreadId)
46+import Control.Concurrent (forkIO)
50import Control.Concurrent.STM.TChan
47import Control.Concurrent.STM.TChan
51 (tryReadTChan, TChan, readTChan, writeTChan, newTChanIO)
48 (tryReadTChan, TChan, readTChan, writeTChan, newTChanIO)
52import Control.Concurrent.STM.TVar
49import Control.Concurrent.STM.TVar
53 (writeTVar, readTVar, readTVarIO, modifyTVar', newTVarIO)
50 (writeTVar, readTVar, readTVarIO, modifyTVar', newTVarIO)
54import Control.Concurrent.MVar
51import Control.Concurrent.MVar
55− (tryTakeMVar, MVar, putMVar, takeMVar, newMVar, newEmptyMVar, readMVar, modifyMVar)
52+ (MVar, MVar, putMVar, takeMVar, newEmptyMVar)
57import System.IO.Unsafe (unsafeInterleaveIO)
54import System.IO.Unsafe (unsafeInterleaveIO)
58import System.Mem.Weak (addFinalizer)
55import System.Mem.Weak (addFinalizer)
61−import GHC.Base (IO(..), mkWeak#)
62−import GHC.Conc (ThreadId(..))
63import Data.Monoid ((<>))
57import Data.Monoid ((<>))
64−import qualified Data.Text as T (unpack, pack)
58+import qualified Data.Text as T (unpack)
65import qualified Data.Map as M (lookup, delete, insert, empty, size)
59import qualified Data.Map as M (lookup, delete, insert, empty, size)
66−import qualified Data.Set as S (empty, member, insert, delete)
67import Data.Time.Clock (getCurrentTime,diffUTCTime)
60import Data.Time.Clock (getCurrentTime,diffUTCTime)
69− (mkWeakIORef, newIORef, atomicWriteIORef, readIORef)
61+import Data.IORef (newIORef, atomicWriteIORef, readIORef)
71import Language.Javascript.JSaddle.Types
63import Language.Javascript.JSaddle.Types
72− (Command(..), AsyncCommand(..), Result(..), BatchResults(..), Results(..), JSContextRef(..), JSVal(..),
64+ (Command(..), AsyncCommand(..), Result(..), Results(..), JSContextRef(..), JSVal(..),
73− Object(..), JSValueReceived(..), JSM(..), Batch(..), JSValueForSend(..), syncPoint, syncAfter, sendCommand)
65+ Object(..), JSValueReceived(..), JSM(..), Batch(..), JSValueForSend(..))
74import Language.Javascript.JSaddle.Exception (JSException(..))
66import Language.Javascript.JSaddle.Exception (JSException(..))
67+-- import Language.Javascript.JSaddle.Native.Internal (wrapJSVal)
75−import Control.DeepSeq (force, deepseq)
68+import Control.DeepSeq (deepseq)
76−#if MIN_VERSION_base(4,11,0)
77−import GHC.Stats (getRTSStatsEnabled, getRTSStats, RTSStats(..), gcdetails_live_bytes, gc)
79import GHC.Stats (getGCStatsEnabled, getGCStats, GCStats(..))
69import GHC.Stats (getGCStatsEnabled, getGCStats, GCStats(..))
81−import Data.Foldable (forM_)
85−#if MIN_VERSION_base(4,11,0)
86−currentBytesUsed = gcdetails_live_bytes . gc
88−getRTSStatsEnabled = getGCStatsEnabled
89−getRTSStats = getGCStats
93-- | Enable (or disable) JSaddle logging
72-- | Enable (or disable) JSaddle logging
94enableLogging :: Bool -> JSM ()
73enableLogging :: Bool -> JSM ()
@@ -100,6 +79,27 @@ enableLogging v = do
100 liftIO $ f v
79 liftIO $ f v
82+-- | Forces execution of pending asyncronous code
88+ SyncResult <- sendCommand Sync
92+-- | Forces execution of pending asyncronous code after performing `f`
93+syncAfter :: JSM a -> JSM a
103-- | On GHCJS this is 'JavaScript.Web.AnimationFrame.waitForAnimationFrame'.
103-- | On GHCJS this is 'JavaScript.Web.AnimationFrame.waitForAnimationFrame'.
104-- On GHC it will delay the execution of the current batch of asynchronous
104-- On GHC it will delay the execution of the current batch of asynchronous
105-- command when they are sent to JavaScript. It will not delay the Haskell
105-- command when they are sent to JavaScript. It will not delay the Haskell
@@ -125,12 +125,17 @@ nextAnimationFrame f = do
125 syncAfter (f t)
125 syncAfter (f t)
127#ifndef ghcjs_HOST_OS
127#ifndef ghcjs_HOST_OS
128+sendCommand :: Command -> JSM Result
130+ s <- doSendCommand <$> JSM ask
128sendLazyCommand :: (JSValueForSend -> AsyncCommand) -> JSM JSVal
133sendLazyCommand :: (JSValueForSend -> AsyncCommand) -> JSM JSVal
129sendLazyCommand cmd = do
134sendLazyCommand cmd = do
130 nextRefTVar <- nextRef <$> JSM ask
135 nextRefTVar <- nextRef <$> JSM ask
131 n <- liftIO . atomically $ do
136 n <- liftIO . atomically $ do
132 n <- subtract 1 <$> readTVar nextRefTVar
137 n <- subtract 1 <$> readTVar nextRefTVar
133− writeTVar nextRefTVar $! n
138+ writeTVar nextRefTVar n
135 s <- doSendAsyncCommand <$> JSM ask
140 s <- doSendAsyncCommand <$> JSM ask
136 liftIO $ s (cmd $ JSValueForSend n)
141 liftIO $ s (cmd $ JSValueForSend n)
@@ -141,112 +146,66 @@ sendAsyncCommand cmd = do
141 s <- doSendAsyncCommand <$> JSM ask
146 s <- doSendAsyncCommand <$> JSM ask
142 liftIO $ s cmd
147 liftIO $ s cmd
144−runJavaScript :: (Batch -> IO ()) -> JSM () -> IO (Results -> IO (), Results -> IO Batch, IO ())
149+runJavaScript :: (Batch -> IO ()) -> JSM () -> IO (Results -> IO (), IO ())
145runJavaScript sendBatch entryPoint = do
150runJavaScript sendBatch entryPoint = do
146− contextId' <- randomIO
147 startTime' <- getCurrentTime
151 startTime' <- getCurrentTime
148 recvMVar <- newEmptyMVar
152 recvMVar <- newEmptyMVar
149− lastAsyncBatch <- newEmptyMVar
150 commandChan <- newTChanIO
153 commandChan <- newTChanIO
151 callbacks <- newTVarIO M.empty
154 callbacks <- newTVarIO M.empty
152 nextRef' <- newTVarIO 0
155 nextRef' <- newTVarIO 0
153− finalizerThreads' <- newMVar S.empty
154− animationFrameHandlers' <- newMVar []
155 loggingEnabled <- newIORef False
156 loggingEnabled <- newIORef False
156− liveRefs' <- newMVar S.empty
157 let ctx = JSContextRef {
157 let ctx = JSContextRef {
158− contextId = contextId'
159− , startTime = startTime'
158+ startTime = startTime'
160− , doSendCommand = \cmd -> cmd `deepseq` do
159+ , doSendCommand = \cmd -> cmd `deepseq` do
161− result <- newEmptyMVar
160+ result <- newEmptyMVar
162− atomically $ writeTChan commandChan (Right (cmd, result))
161+ atomically $ writeTChan commandChan (Right (cmd, result))
163− unsafeInterleaveIO $
162+ unsafeInterleaveIO $
164− takeMVar result >>= \case
163+ takeMVar result >>= \case
165− (ThrowJSValue v) -> do
166− jsval <- wrapJSVal' ctx v
167− throwIO $ JSException jsval
164+ (ThrowJSValue (JSValueReceived v)) -> throwIO $ JSException (JSVal v)
168− r -> return r
165+ r -> return r
169− , doSendAsyncCommand = \cmd -> cmd `deepseq` atomically (writeTChan commandChan $ Left cmd)
166+ , doSendAsyncCommand = \cmd -> cmd `deepseq` atomically (writeTChan commandChan $ Left cmd)
170− , addCallback = \(Object (JSVal ioref)) cb -> do
171− val <- readIORef ioref
172− atomically $ modifyTVar' callbacks (M.insert val cb)
167+ , addCallback = \(Object (JSVal val)) cb -> atomically $ modifyTVar' callbacks (M.insert val cb)
168+ , freeCallback = \(Object (JSVal val)) -> atomically $ modifyTVar' callbacks (M.delete val)
173− , nextRef = nextRef'
169+ , nextRef = nextRef'
174− , doEnableLogging = atomicWriteIORef loggingEnabled
170+ , doEnableLogging = atomicWriteIORef loggingEnabled
175− , finalizerThreads = finalizerThreads'
176− , animationFrameHandlers = animationFrameHandlers'
177− , liveRefs = liveRefs'
179− processResults :: Bool -> Results -> IO ()
180− processResults syncCallbacks = \case
172+ let processResults = \case
181 (ProtocolError err) -> error $ "Protocol error : " <> T.unpack err
173 (ProtocolError err) -> error $ "Protocol error : " <> T.unpack err
182− (Callback n br (JSValueReceived fNumber) f this a) -> do
174+ (Callback f this a) -> do
183− putMVar recvMVar (n, br)
175+ logInfo ("Call " <>)
184− f' <- runReaderT (unJSM $ wrapJSVal f) ctx
176+ f'@(JSVal fNumber) <- runReaderT (unJSM $ wrapJSVal f) ctx
185 this' <- runReaderT (unJSM $ wrapJSVal this) ctx
177 this' <- runReaderT (unJSM $ wrapJSVal this) ctx
186 args <- runReaderT (unJSM $ mapM wrapJSVal a) ctx
178 args <- runReaderT (unJSM $ mapM wrapJSVal a) ctx
187− logInfo (("Call " <> show fNumber <> " ") <>)
188 (M.lookup fNumber <$> liftIO (readTVarIO callbacks)) >>= \case
179 (M.lookup fNumber <$> liftIO (readTVarIO callbacks)) >>= \case
189 Nothing -> liftIO $ putStrLn "Callback called after it was freed"
180 Nothing -> liftIO $ putStrLn "Callback called after it was freed"
190− Just cb -> void . forkIO $ do
191− runReaderT (unJSM $ cb f' this' args) ctx
181+ Just cb -> void . forkIO $ runReaderT (unJSM $ cb f' this' args) ctx
192− when syncCallbacks $
193− doSendAsyncCommand ctx EndSyncBlock
194− Duplicate nBatch nExpected -> do
195− putStrLn $ "Error : Unexpected Duplicate. syncCallbacks=" <> show syncCallbacks <>
196− " nBatch=" <> show nBatch <> " nExpected=" <> show nExpected
197− void $ doSendCommand ctx Sync
198− BatchResults n br -> putMVar recvMVar (n, br)
182+ m -> putMVar recvMVar m
199− asyncResults :: Results -> IO ()
200− asyncResults results =
201− void . forkIO $ processResults False results
202− syncResults :: Results -> IO Batch
203− syncResults results = do
204− void . forkIO $ processResults True results
205− readMVar lastAsyncBatch
206 logInfo s =
183 logInfo s =
207 readIORef loggingEnabled >>= \case
184 readIORef loggingEnabled >>= \case
208 True -> do
185 True -> do
209− currentBytesUsedStr <- getRTSStatsEnabled >>= \case
186+ currentBytesUsedStr <- getGCStatsEnabled >>= \case
210− True -> show . currentBytesUsed <$> getRTSStats
187+ True -> show . currentBytesUsed <$> getGCStats
211 False -> return "??"
188 False -> return "??"
212 cbCount <- M.size <$> readTVarIO callbacks
189 cbCount <- M.size <$> readTVarIO callbacks
213− putStrLn . s $ "M " <> currentBytesUsedStr <> " CB " <> show cbCount <> " "
190+ putStrLn . s $ "M " <> currentBytesUsedStr <> "CB " <> show cbCount
214 False -> return ()
191 False -> return ()
215− _ <- forkIO . numberForeverFromM_ 1 $ \nBatch ->
216− readBatch nBatch commandChan >>= \case
192+ _ <- forkIO . forever $ readBatch commandChan >>= \case
217− (batch@(Batch cmds _ _), resultMVars) -> do
193+ (batch@(Batch cmds _), resultMVars) -> do
218 logInfo (\x -> "Sync " <> x <> show (length cmds, last cmds))
194 logInfo (\x -> "Sync " <> x <> show (length cmds, last cmds))
219− _ <- tryTakeMVar lastAsyncBatch
220− putMVar lastAsyncBatch batch
221 sendBatch batch
195 sendBatch batch
222− takeResult recvMVar nBatch >>= \case
196+ takeMVar recvMVar >>= \case
223− (n, _) | n /= nBatch -> error $ "Unexpected jsaddle results (expected batch " <> show nBatch <> ", got batch " <> show n <> ")"
224− (_, Success callbacksToFree results)
225− | length results /= length resultMVars -> error "Unexpected number of jsaddle results"
197+ Success results | length results /= length resultMVars -> error "Unexpected number of jsaddle results"
227− zipWithM_ putMVar resultMVars results
198+ | otherwise -> zipWithM_ putMVar resultMVars results
228− forM_ callbacksToFree $ \(JSValueReceived val) ->
229− atomically (modifyTVar' callbacks (M.delete val))
230− (_, Failure callbacksToFree results exception err) -> do
199+ Failure results exception -> do
231 -- The exception will only be rethrown in Haskell if/when one of the
200 -- The exception will only be rethrown in Haskell if/when one of the
232 -- missing results (if any) is evaluated.
201 -- missing results (if any) is evaluated.
233 putStrLn "A JavaScript exception was thrown! (may not reach Haskell code)"
202 putStrLn "A JavaScript exception was thrown! (may not reach Haskell code)"
235 zipWithM_ putMVar resultMVars $ results <> repeat (ThrowJSValue exception)
203 zipWithM_ putMVar resultMVars $ results <> repeat (ThrowJSValue exception)
236− forM_ callbacksToFree $ \(JSValueReceived val) ->
204+ _ -> error "Unexpected jsaddle results"
237− atomically (modifyTVar' callbacks (M.delete val))
238− return (asyncResults, syncResults, runReaderT (unJSM entryPoint) ctx)
205+ return (processResults, runReaderT (unJSM entryPoint) ctx)
240− numberForeverFromM_ :: (Monad m, Enum n) => n -> (n -> m a) -> m ()
241− numberForeverFromM_ !n f = do
243− numberForeverFromM_ (succ n) f
244− takeResult recvMVar nBatch =
245− takeMVar recvMVar >>= \case
246− (n, _) | n < nBatch -> takeResult recvMVar nBatch
248− readBatch :: Int -> TChan (Either AsyncCommand (Command, MVar Result)) -> IO (Batch, [MVar Result])
207+ readBatch :: TChan (Either AsyncCommand (Command, MVar Result)) -> IO (Batch, [MVar Result])
249− readBatch nBatch chan = do
208+ readBatch chan = do
250 first <- atomically $ readTChan chan -- We want at least one command to send
209 first <- atomically $ readTChan chan -- We want at least one command to send
251 loop first ([], [])
210 loop first ([], [])
@@ -257,55 +216,28 @@ runJavaScript sendBatch entryPoint = do
257 let cmds = Right syncCmd:cmds'
216 let cmds = Right syncCmd:cmds'
258 resultMVars = resultMVar:resultMVars'
217 resultMVars = resultMVar:resultMVars'
259 atomically (tryReadTChan chan) >>= \case
218 atomically (tryReadTChan chan) >>= \case
260− Nothing -> return (Batch (reverse cmds) False nBatch, reverse resultMVars)
219+ Nothing -> return (Batch (reverse cmds) False, reverse resultMVars)
261 Just cmd -> loop cmd (cmds, resultMVars)
220 Just cmd -> loop cmd (cmds, resultMVars)
262 loop (Left asyncCmd) (cmds', resultMVars) = do
221 loop (Left asyncCmd) (cmds', resultMVars) = do
263 let cmds = Left asyncCmd:cmds'
222 let cmds = Left asyncCmd:cmds'
264 atomically (tryReadTChan chan) >>= \case
223 atomically (tryReadTChan chan) >>= \case
265− Nothing -> return (Batch (reverse cmds) False nBatch, reverse resultMVars)
224+ Nothing -> return (Batch (reverse cmds) False, reverse resultMVars)
266 Just cmd -> loop cmd (cmds, resultMVars)
225 Just cmd -> loop cmd (cmds, resultMVars)
267 -- When we have seen a SyncWithAnimationFrame command only a synchronous command should end the batch
226 -- When we have seen a SyncWithAnimationFrame command only a synchronous command should end the batch
268 loopAnimation :: Either AsyncCommand (Command, MVar Result) -> ([Either AsyncCommand Command], [MVar Result]) -> IO (Batch, [MVar Result])
227 loopAnimation :: Either AsyncCommand (Command, MVar Result) -> ([Either AsyncCommand Command], [MVar Result]) -> IO (Batch, [MVar Result])
269 loopAnimation (Right (Sync, resultMVar)) (cmds, resultMVars) =
228 loopAnimation (Right (Sync, resultMVar)) (cmds, resultMVars) =
270− return (Batch (reverse (Right Sync:cmds)) True nBatch, reverse (resultMVar:resultMVars))
229+ return (Batch (reverse (Right Sync:cmds)) True, reverse (resultMVar:resultMVars))
271 loopAnimation (Right (syncCmd, resultMVar)) (cmds, resultMVars) =
230 loopAnimation (Right (syncCmd, resultMVar)) (cmds, resultMVars) =
272 atomically (readTChan chan) >>= \cmd -> loopAnimation cmd (Right syncCmd:cmds, resultMVar:resultMVars)
231 atomically (readTChan chan) >>= \cmd -> loopAnimation cmd (Right syncCmd:cmds, resultMVar:resultMVars)
273 loopAnimation (Left asyncCmd) (cmds, resultMVars) =
232 loopAnimation (Left asyncCmd) (cmds, resultMVars) =
274 atomically (readTChan chan) >>= \cmd -> loopAnimation cmd (Left asyncCmd:cmds, resultMVars)
233 atomically (readTChan chan) >>= \cmd -> loopAnimation cmd (Left asyncCmd:cmds, resultMVars)
276−addThreadFinalizer :: ThreadId -> IO () -> IO ()
277−addThreadFinalizer t@(ThreadId t#) (IO finalizer) =
278− IO $ \s -> case mkWeak# t# t finalizer s of { (# s1, _ #) -> (# s1, () #) }
281wrapJSVal :: JSValueReceived -> JSM JSVal
235wrapJSVal :: JSValueReceived -> JSM JSVal
282−wrapJSVal v = do
236+wrapJSVal (JSValueReceived ref) = do
283− ctx <- JSM ask
237+ -- TODO make sure this ref has not already been wrapped (perhaps only in debug version)
284− liftIO $ wrapJSVal' ctx v
238+ let result = JSVal ref
286−wrapJSVal' :: JSContextRef -> JSValueReceived -> IO JSVal
287−wrapJSVal' ctx (JSValueReceived n) = do
288− ref <- liftIO $ newIORef n
289− when (n >= 5 || n < 0) $
239+ when (ref >= 5) $ do
290−#ifdef JSADDLE_CHECK_WRAPJSVAL
240+ ctx <- JSM ask
291− do lr <- takeMVar $ liveRefs ctx
294− putStrLn $ "JS Value Ref " <> show n <> " already wrapped"
295− putMVar (liveRefs ctx) lr
296− else putMVar (liveRefs ctx) =<< evaluate (S.insert n lr)
298− void . mkWeakIORef ref $ do
299− ft <- takeMVar $ finalizerThreads ctx
301− let tname = T.pack $ show t
302− doSendAsyncCommand ctx $ FreeRef tname $ JSValueForSend n
241+ liftIO . addFinalizer result $ doSendAsyncCommand ctx $ FreeRef $ JSValueForSend ref
303− if tname `S.member` ft
304− then putMVar (finalizerThreads ctx) ft
306− addThreadFinalizer t $ do
307− modifyMVar (finalizerThreads ctx) $ \s -> return (S.delete tname s, ())
308− doSendAsyncCommand ctx $ FreeRefs tname
309− putMVar (finalizerThreads ctx) =<< evaluate (S.insert tname ft)
310− return (JSVal ref)
242+ return result