git.iko.soy/distributed-process
on master help sign in
Merge pull request #6 from acfoltzer/master

Fixes made for the distributed-process with strict bytestrings

commit4e42a1ef69b3c55a6361b2e145cec0cafbfb600e authorRyan Newton <rrnewton@gmail.com> dateSat 25 Feb 2012, 02:35 (15 years ago) parentff8d9c64341d5d
2 files changed+14−4
compare with master
unifiedsplit
distributed-process/src/Control/Distributed/Process.hs+9−3 examples/DemoTransport.hs+5−1
distributed-process/src/Control/Distributed/Process.hs+9−3
@@ -1,4 +1,4 @@
1−{-# LANGUAGE ExplicitForAll, ScopedTypeVariables #-}
1+{-# LANGUAGE CPP, ExplicitForAll, ScopedTypeVariables #-}
22
33module Control.Distributed.Process (
44 -- * Processes
@@ -27,8 +27,6 @@ module Control.Distributed.Process (
2727import qualified Network.Transport as Trans
2828import Network.Transport (Transport)
2929
30−import qualified Data.ByteString.Lazy.Char8 as BS
31−import Data.ByteString.Lazy.Char8 (ByteString)
3230import qualified Data.IntMap as IntMap
3331import Data.IntMap (IntMap)
3432import Control.Applicative
@@ -41,6 +39,14 @@ import Data.Typeable
4139
4240import Debug.Trace
4341
42+#ifndef LAZY
43+import qualified Data.ByteString.Char8 as BS
44+import Data.ByteString.Char8 (ByteString)
45+#else
46+import qualified Data.ByteString.Lazy.Char8 as BS
47+import Data.ByteString.Lazy.Char8 (ByteString)
48+#endif
49+
4450------------------------
4551-- Cloud Haskell layer
4652--
examples/DemoTransport.hs+5−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE NamedFieldPuns #-}
1+{-# LANGUAGE CPP, NamedFieldPuns #-}
22module Main where
33
44import Network.Transport
@@ -9,7 +9,11 @@ import Network.Transport.TCP (mkTransport, TCPConfig (..))
99import Control.Concurrent
1010import Control.Monad
1111
12+#ifndef LAZY
13+import qualified Data.ByteString.Char8 as BS
14+#else
1215import qualified Data.ByteString.Lazy.Char8 as BS
16+#endif
1317
1418import Data.IORef
1519import Debug.Trace