@@ -2,8 +2,6 @@
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3{-# LANGUAGE LambdaCase #-}
3{-# LANGUAGE LambdaCase #-}
4{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE MagicHash #-}
6−{-# LANGUAGE UnboxedTuples #-}
7-----------------------------------------------------------------------------
5-----------------------------------------------------------------------------
9-- Module : Language.Javascript.JSaddle.Run
7-- Module : Language.Javascript.JSaddle.Run
@@ -37,59 +35,43 @@ module Language.Javascript.JSaddle.Run (
39#ifdef ghcjs_HOST_OS
37#ifdef ghcjs_HOST_OS
40−import Language.Javascript.JSaddle.Types (JSM, syncPoint, syncAfter)
38+import Language.Javascript.JSaddle.Types (JSM)
41import qualified JavaScript.Web.AnimationFrame as GHCJS
39import qualified JavaScript.Web.AnimationFrame as GHCJS
42 (waitForAnimationFrame)
40 (waitForAnimationFrame)
44−import Control.Exception (throwIO, evaluate)
42+import Control.Exception (throwIO)
45−import Control.Monad (void, when, zipWithM_)
43+import Control.Monad (void, when, forever, zipWithM_)
46import Control.Monad.IO.Class (MonadIO(..))
44import Control.Monad.IO.Class (MonadIO(..))
47import Control.Monad.Trans.Reader (ask, runReaderT)
45import Control.Monad.Trans.Reader (ask, runReaderT)
48import Control.Monad.STM (atomically)
46import Control.Monad.STM (atomically)
49−import Control.Concurrent (forkIO, myThreadId)
47+import Control.Concurrent (forkIO)
50import Control.Concurrent.STM.TChan
48import Control.Concurrent.STM.TChan
51 (tryReadTChan, TChan, readTChan, writeTChan, newTChanIO)
49 (tryReadTChan, TChan, readTChan, writeTChan, newTChanIO)
52import Control.Concurrent.STM.TVar
50import Control.Concurrent.STM.TVar
53 (writeTVar, readTVar, readTVarIO, modifyTVar', newTVarIO)
51 (writeTVar, readTVar, readTVarIO, modifyTVar', newTVarIO)
54import Control.Concurrent.MVar
52import Control.Concurrent.MVar
55− (tryTakeMVar, MVar, putMVar, takeMVar, newMVar, newEmptyMVar, readMVar, modifyMVar)
53+ (tryTakeMVar, MVar, putMVar, takeMVar, newEmptyMVar, readMVar)
57import System.IO.Unsafe (unsafeInterleaveIO)
55import System.IO.Unsafe (unsafeInterleaveIO)
58import System.Mem.Weak (addFinalizer)
56import System.Mem.Weak (addFinalizer)
61−import GHC.Base (IO(..), mkWeak#)
62−import GHC.Conc (ThreadId(..))
63import Data.Monoid ((<>))
58import Data.Monoid ((<>))
64−import qualified Data.Text as T (unpack, pack)
59+import qualified Data.Text as T (unpack)
65import qualified Data.Map as M (lookup, delete, insert, empty, size)
60import 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)
61import Data.Time.Clock (getCurrentTime,diffUTCTime)
69− (mkWeakIORef, newIORef, atomicWriteIORef, readIORef)
62+import Data.IORef (newIORef, atomicWriteIORef, readIORef)
71import Language.Javascript.JSaddle.Types
64import Language.Javascript.JSaddle.Types
72 (Command(..), AsyncCommand(..), Result(..), BatchResults(..), Results(..), JSContextRef(..), JSVal(..),
65 (Command(..), AsyncCommand(..), Result(..), BatchResults(..), Results(..), JSContextRef(..), JSVal(..),
73− Object(..), JSValueReceived(..), JSM(..), Batch(..), JSValueForSend(..), syncPoint, syncAfter, sendCommand)
66+ Object(..), JSValueReceived(..), JSM(..), Batch(..), JSValueForSend(..))
74import Language.Javascript.JSaddle.Exception (JSException(..))
67import Language.Javascript.JSaddle.Exception (JSException(..))
68+-- import Language.Javascript.JSaddle.Native.Internal (wrapJSVal)
75−import Control.DeepSeq (force, deepseq)
69+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(..))
70import GHC.Stats (getGCStatsEnabled, getGCStats, GCStats(..))
80−#endif
71+import Data.Maybe (isJust)
81import Data.Foldable (forM_)
72import 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
75-- | Enable (or disable) JSaddle logging
94enableLogging :: Bool -> JSM ()
76enableLogging :: Bool -> JSM ()
95#ifdef ghcjs_HOST_OS
77#ifdef ghcjs_HOST_OS
@@ -100,6 +82,27 @@ enableLogging v = do
100 liftIO $ f v
82 liftIO $ f v
85+-- | Forces execution of pending asyncronous code
91+ SyncResult <- sendCommand Sync
95+-- | Forces execution of pending asyncronous code after performing `f`
96+syncAfter :: JSM a -> JSM a
103-- | On GHCJS this is 'JavaScript.Web.AnimationFrame.waitForAnimationFrame'.
106-- | On GHCJS this is 'JavaScript.Web.AnimationFrame.waitForAnimationFrame'.
104-- On GHC it will delay the execution of the current batch of asynchronous
107-- 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
108-- command when they are sent to JavaScript. It will not delay the Haskell
@@ -125,12 +128,17 @@ nextAnimationFrame f = do
125 syncAfter (f t)
128 syncAfter (f t)
127#ifndef ghcjs_HOST_OS
130#ifndef ghcjs_HOST_OS
131+sendCommand :: Command -> JSM Result
133+ s <- doSendCommand <$> JSM ask
128sendLazyCommand :: (JSValueForSend -> AsyncCommand) -> JSM JSVal
136sendLazyCommand :: (JSValueForSend -> AsyncCommand) -> JSM JSVal
129sendLazyCommand cmd = do
137sendLazyCommand cmd = do
130 nextRefTVar <- nextRef <$> JSM ask
138 nextRefTVar <- nextRef <$> JSM ask
131 n <- liftIO . atomically $ do
139 n <- liftIO . atomically $ do
132 n <- subtract 1 <$> readTVar nextRefTVar
140 n <- subtract 1 <$> readTVar nextRefTVar
133− writeTVar nextRefTVar $! n
141+ writeTVar nextRefTVar n
135 s <- doSendAsyncCommand <$> JSM ask
143 s <- doSendAsyncCommand <$> JSM ask
136 liftIO $ s (cmd $ JSValueForSend n)
144 liftIO $ s (cmd $ JSValueForSend n)
@@ -143,45 +151,34 @@ sendAsyncCommand cmd = do
144runJavaScript :: (Batch -> IO ()) -> JSM () -> IO (Results -> IO (), Results -> IO Batch, IO ())
152runJavaScript :: (Batch -> IO ()) -> JSM () -> IO (Results -> IO (), Results -> IO Batch, IO ())
145runJavaScript sendBatch entryPoint = do
153runJavaScript sendBatch entryPoint = do
146− contextId' <- randomIO
147 startTime' <- getCurrentTime
154 startTime' <- getCurrentTime
148 recvMVar <- newEmptyMVar
155 recvMVar <- newEmptyMVar
149 lastAsyncBatch <- newEmptyMVar
156 lastAsyncBatch <- newEmptyMVar
150 commandChan <- newTChanIO
157 commandChan <- newTChanIO
151 callbacks <- newTVarIO M.empty
158 callbacks <- newTVarIO M.empty
152 nextRef' <- newTVarIO 0
159 nextRef' <- newTVarIO 0
153− finalizerThreads' <- newMVar S.empty
154− animationFrameHandlers' <- newMVar []
155 loggingEnabled <- newIORef False
160 loggingEnabled <- newIORef False
156− liveRefs' <- newMVar S.empty
157 let ctx = JSContextRef {
161 let ctx = JSContextRef {
158− contextId = contextId'
159− , startTime = startTime'
162+ startTime = startTime'
160− , doSendCommand = \cmd -> cmd `deepseq` do
163+ , doSendCommand = \cmd -> cmd `deepseq` do
161− result <- newEmptyMVar
164+ result <- newEmptyMVar
162− atomically $ writeTChan commandChan (Right (cmd, result))
165+ atomically $ writeTChan commandChan (Right (cmd, result))
163− unsafeInterleaveIO $
166+ unsafeInterleaveIO $
164− takeMVar result >>= \case
167+ takeMVar result >>= \case
165− (ThrowJSValue v) -> do
166− jsval <- wrapJSVal' ctx v
167− throwIO $ JSException jsval
168+ (ThrowJSValue (JSValueReceived v)) -> throwIO $ JSException (JSVal v)
168− r -> return r
169+ r -> return r
169− , doSendAsyncCommand = \cmd -> cmd `deepseq` atomically (writeTChan commandChan $ Left cmd)
170+ , 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)
171+ , addCallback = \(Object (JSVal val)) cb -> atomically $ modifyTVar' callbacks (M.insert val cb)
172+ , freeCallback = \(Object (JSVal val)) -> atomically $ modifyTVar' callbacks (M.delete val)
173− , nextRef = nextRef'
173+ , nextRef = nextRef'
174− , doEnableLogging = atomicWriteIORef loggingEnabled
174+ , doEnableLogging = atomicWriteIORef loggingEnabled
175− , finalizerThreads = finalizerThreads'
176− , animationFrameHandlers = animationFrameHandlers'
177− , liveRefs = liveRefs'
179− processResults :: Bool -> Results -> IO ()
176+ let processResults :: Bool -> Results -> IO ()
180 processResults syncCallbacks = \case
177 processResults syncCallbacks = \case
181 (ProtocolError err) -> error $ "Protocol error : " <> T.unpack err
178 (ProtocolError err) -> error $ "Protocol error : " <> T.unpack err
182− (Callback n br (JSValueReceived fNumber) f this a) -> do
179+ (Callback n br f this a) -> do
183 putMVar recvMVar (n, br)
180 putMVar recvMVar (n, br)
184− f' <- runReaderT (unJSM $ wrapJSVal f) ctx
181+ f'@(JSVal fNumber) <- runReaderT (unJSM $ wrapJSVal f) ctx
185 this' <- runReaderT (unJSM $ wrapJSVal this) ctx
182 this' <- runReaderT (unJSM $ wrapJSVal this) ctx
186 args <- runReaderT (unJSM $ mapM wrapJSVal a) ctx
183 args <- runReaderT (unJSM $ mapM wrapJSVal a) ctx
187 logInfo (("Call " <> show fNumber <> " ") <>)
184 logInfo (("Call " <> show fNumber <> " ") <>)
@@ -206,11 +203,11 @@ runJavaScript sendBatch entryPoint = do
206 logInfo s =
203 logInfo s =
207 readIORef loggingEnabled >>= \case
204 readIORef loggingEnabled >>= \case
208 True -> do
205 True -> do
209− currentBytesUsedStr <- getRTSStatsEnabled >>= \case
206+ currentBytesUsedStr <- getGCStatsEnabled >>= \case
210− True -> show . currentBytesUsed <$> getRTSStats
207+ True -> show . currentBytesUsed <$> getGCStats
211 False -> return "??"
208 False -> return "??"
212 cbCount <- M.size <$> readTVarIO callbacks
209 cbCount <- M.size <$> readTVarIO callbacks
213− putStrLn . s $ "M " <> currentBytesUsedStr <> " CB " <> show cbCount <> " "
210+ putStrLn . s $ "M " <> currentBytesUsedStr <> "CB " <> show cbCount
214 False -> return ()
211 False -> return ()
215 _ <- forkIO . numberForeverFromM_ 1 $ \nBatch ->
212 _ <- forkIO . numberForeverFromM_ 1 $ \nBatch ->
216 readBatch nBatch commandChan >>= \case
213 readBatch nBatch commandChan >>= \case
@@ -220,26 +217,19 @@ runJavaScript sendBatch entryPoint = do
220 putMVar lastAsyncBatch batch
217 putMVar lastAsyncBatch batch
221 sendBatch batch
218 sendBatch batch
222 takeResult recvMVar nBatch >>= \case
219 takeResult recvMVar nBatch >>= \case
223− (n, _) | n /= nBatch -> error $ "Unexpected jsaddle results (expected batch " <> show nBatch <> ", got batch " <> show n <> ")"
220+ (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"
221+ (_, Success results) | length results /= length resultMVars -> error "Unexpected number of jsaddle results"
227− zipWithM_ putMVar resultMVars results
222+ | otherwise -> zipWithM_ putMVar resultMVars results
228− forM_ callbacksToFree $ \(JSValueReceived val) ->
229− atomically (modifyTVar' callbacks (M.delete val))
230− (_, Failure callbacksToFree results exception err) -> do
223+ (_, Failure results exception) -> do
231− -- The exception will only be rethrown in Haskell if/when one of the
224+ -- The exception will only be rethrown in Haskell if/when one of the
232− -- missing results (if any) is evaluated.
225+ -- missing results (if any) is evaluated.
233− putStrLn "A JavaScript exception was thrown! (may not reach Haskell code)"
226+ putStrLn "A JavaScript exception was thrown! (may not reach Haskell code)"
235− zipWithM_ putMVar resultMVars $ results <> repeat (ThrowJSValue exception)
227+ zipWithM_ putMVar resultMVars $ results <> repeat (ThrowJSValue exception)
236− forM_ callbacksToFree $ \(JSValueReceived val) ->
237− atomically (modifyTVar' callbacks (M.delete val))
238 return (asyncResults, syncResults, runReaderT (unJSM entryPoint) ctx)
228 return (asyncResults, syncResults, runReaderT (unJSM entryPoint) ctx)
240 numberForeverFromM_ :: (Monad m, Enum n) => n -> (n -> m a) -> m ()
230 numberForeverFromM_ :: (Monad m, Enum n) => n -> (n -> m a) -> m ()
241 numberForeverFromM_ !n f = do
231 numberForeverFromM_ !n f = do
243 numberForeverFromM_ (succ n) f
233 numberForeverFromM_ (succ n) f
244 takeResult recvMVar nBatch =
234 takeResult recvMVar nBatch =
245 takeMVar recvMVar >>= \case
235 takeMVar recvMVar >>= \case
@@ -273,39 +263,12 @@ runJavaScript sendBatch entryPoint = do
273 loopAnimation (Left asyncCmd) (cmds, resultMVars) =
263 loopAnimation (Left asyncCmd) (cmds, resultMVars) =
274 atomically (readTChan chan) >>= \cmd -> loopAnimation cmd (Left asyncCmd:cmds, resultMVars)
264 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
266wrapJSVal :: JSValueReceived -> JSM JSVal
282−wrapJSVal v = do
267+wrapJSVal (JSValueReceived ref) = do
283− ctx <- JSM ask
268+ -- TODO make sure this ref has not already been wrapped (perhaps only in debug version)
284− liftIO $ wrapJSVal' ctx v
269+ 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) $
270+ when (ref >= 5) $ do
290−#ifdef JSADDLE_CHECK_WRAPJSVAL
271+ 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
272+ 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)
273+ return result