Changeset 15364 for src/Pugs/Parser

Timestamp:

02/26/07 17:52:49 (21 months ago)

Author:

audreyt

Message:

* Pugs.Parser.Operators - Eliminate another space leak in

filterFun; heap usage during parsing should be back to
constant now.

Files:

• src/Pugs/Parser/Operator.hs (modified) (3 diffs)

src/Pugs/Parser/Operator.hs

@@ -182 +182 @@
 
 {-# NOINLINE _RefToFunction #-}
-_RefToFunction :: H.HashTable (TVar VRef) CurrentFunction
+_RefToFunction :: H.HashTable (TVar VRef) (Maybe CurrentFunction)
 _RefToFunction = unsafePerformIO (H.new (==) hashTVar)
 
@@ -189 +189 @@
 
 filterFun :: Var -> TVar VRef -> STM (Maybe CurrentFunction)
-filterFun var tvar = do
+filterFun var tvar = var `seq` do
     res <- unsafeIOToSTM (H.lookup _RefToFunction tvar)
     case res of
-        Just rv -> return (rv `seq` res)
+        Just rv -> return rv
         Nothing -> do
             ref <- readTVar tvar
@@ -199 +199 @@
                     | relevantToParsing (code_type cv) (code_assoc cv) -> do
                         let rv = MkCurrentFunction var (code_assoc cv) (code_params cv)
-                        unsafeIOToSTM (H.insert _RefToFunction tvar rv)
-                        return (rv `seq` Just rv)
+                            res = seq rv (Just rv)
+                        unsafeIOToSTM (H.insert _RefToFunction tvar res)
+                        return res
                 MkRef (IScalar sv)
                     | Just (VCode cv) <- scalar_const sv
                     , relevantToParsing (code_type cv) (code_assoc cv) -> do
                         let rv = MkCurrentFunction var (code_assoc cv) (code_params cv)
-                        unsafeIOToSTM (H.insert _RefToFunction tvar rv)
-                        return (rv `seq` Just rv)
-                _ -> return Nothing
+                            res = seq rv (Just rv)
+                        unsafeIOToSTM (H.insert _RefToFunction tvar res)
+                        return res
+                _ -> do
+                    unsafeIOToSTM (H.insert _RefToFunction tvar Nothing)
+                    return Nothing
 
 inScope :: Pkg -> Var -> Bool