Changeset 14337 for src/Pugs/Prim.hs

Timestamp:

10/17/06 08:25:35 (2 years ago)

Author:

audreyt

svk:copy_cache_prev:

21206

Message:

* Remove Judy from the Pugs build process.

This is a pervasive change to avoid GC issues completely
before the release, as the nature of addForeignPtrFinalizer's
weird interaction with GHC is not fully diagnosed.

Also, TVar/IORef based storage, which was exceedingly slow
in GHC 6.4, now actually compares competitively with Judy maps.
Judy is still more memory efficient and may be faster on some
architectures, but its re-incoporation will have to wait until
after release and a fuller understanding of its use of FFI/GC.

Files:

• src/Pugs/Prim.hs (modified) (4 diffs)

src/Pugs/Prim.hs

@@ -40 +40 @@
 import Control.Exception (ioErrors)
 
-import qualified Judy.CollectionsM as C
---import qualified Judy.StrMap         as H
-
 import Pugs.Prim.Keyed
 import Pugs.Prim.Yaml
@@ -58 +55 @@
 import GHC.Unicode
 import qualified UTF8 as Str
+import qualified Data.HashTable as H
 
 constMacro :: Exp -> [Val] -> Eval Val
@@ -1281 +1279 @@
     defs    <- fromVal =<< fetch "attrs"
 
-    attrs   <- liftIO $ (C.new :: IO IHash)
+    attrs   <- liftIO $ H.new (==) H.hashString
     writeIVar (IHash attrs) (named `Map.union` defs)
     uniq    <- newObjectId
@@ -1300 +1298 @@
     (VObject o) <- fromVal t
     attrs   <- readIVar (IHash $ objAttrs o)
-    attrs'   <- liftIO $ (C.new :: IO IHash)
+    attrs'  <- liftIO $ H.new (==) H.hashString
     uniq    <- newObjectId
     writeIVar (IHash attrs') (named `Map.union` attrs)