Fix parallelization and bump to v0.3.0.

diff --git a/haeredes.cabal b/haeredes.cabal
index f008f767b992f760b6337edc5fec2fe0920df631..e171258ed9ea54338061ad639562ea0fc8334b27 100644 (file)
--- a/haeredes.cabal
+++ b/haeredes.cabal
@@ -1,5 +1,5 @@
 name:           haeredes
-version:        0.2.0
+version:        0.3.0
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:    Michael Orlitzky <michael@orlitzky.com>

diff --git a/src/Main.hs b/src/Main.hs
index a5dc79466067f0dc70fc529169f55d111ae13b96..679a1ac1fe1d0dc3cf684420596676dde91e10e5 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,7 +2,7 @@ module Main
 where
 
 import Control.Concurrent.ParallelIO.Global (
-  parallel,
+  parallelInterleaved,
   stopGlobalPool )
 import Control.Monad (unless)
 import qualified Data.ByteString.Char8 as BS (
@@ -113,10 +113,17 @@ main = do
                           NS{} -> lookupNS'
                           MX{} -> lookupMX'
 
-  _ <- withResolver rs $ \resolver -> do
-         -- Bad stuff happens if we try to run these lookups in parallel
-         -- instead of the reports.
-         records <- mapM (lookup_function resolver) nrml_domains
-         parallel (map (report nrml_delegates) records)
+  let lookup' d = withResolver rs $ \resolver ->
+                    lookup_function resolver d
+
+  -- Construct a list of [IO whatever]. The withResolver calls
+  -- are the ones that should be run in parallel.
+  let actions = map lookup' nrml_domains
+
+  -- Run the lookup actions in parallel.
+  results <- parallelInterleaved actions
+
+  -- Output the results.
+  _ <- mapM (report nrml_delegates) results
 
   stopGlobalPool