master...de2aaca · distributed-process

distributed-process/distributed-process.cabal+6−6

since splitsnapshots

unifiedsplit

@@ -37,7 +37,6 @@ Library

37 transformers >= 0.2 && < 0.4,

38 mtl >= 2.0 && < 2.2,

39 data-accessor >= 0.2 && < 0.3,

40− bytestring >= 0.9 && < 0.11,

41 containers >= 0.4 && < 0.6,

40 containers >= 0.4 && < 0.6,

42 old-locale >= 1.0 && < 1.1,

41 old-locale >= 1.0 && < 1.1,

43 time >= 1.2 && < 1.5,

42 time >= 1.2 && < 1.5,

@@ -46,7 +45,8 @@ Library

46 ghc-prim >= 0.2 && < 0.4,

45 ghc-prim >= 0.2 && < 0.4,

47 distributed-static >= 0.1 && < 0.2,

46 distributed-static >= 0.1 && < 0.2,

48 rank1dynamic >= 0.1 && < 0.2,

47 rank1dynamic >= 0.1 && < 0.2,

49− syb >= 0.3 && < 0.4

48+ syb >= 0.3 && < 0.4,

49+ not-bytestring

50 Exposed-modules: Control.Distributed.Process,

51 Control.Distributed.Process.Serializable,

52 Control.Distributed.Process.Closure,

@@ -82,7 +82,6 @@ Test-Suite TestCH

82 transformers >= 0.2 && < 0.4,

83 mtl >= 2.0 && < 2.2,

84 data-accessor >= 0.2 && < 0.3,

85− bytestring >= 0.9 && < 0.11,

86 containers >= 0.4 && < 0.6,

85 containers >= 0.4 && < 0.6,

87 old-locale >= 1.0 && < 1.1,

86 old-locale >= 1.0 && < 1.1,

88 time >= 1.2 && < 1.5,

87 time >= 1.2 && < 1.5,

@@ -91,7 +90,8 @@ Test-Suite TestCH

91 ghc-prim >= 0.2 && < 0.4,

90 ghc-prim >= 0.2 && < 0.4,

92 ansi-terminal >= 0.5 && < 0.6,

91 ansi-terminal >= 0.5 && < 0.6,

93 distributed-static >= 0.1 && < 0.2,

92 distributed-static >= 0.1 && < 0.2,

94− rank1dynamic >= 0.1 && < 0.2

93+ rank1dynamic >= 0.1 && < 0.2,

94+ not-bytestring

95 Extensions: RankNTypes,

96 ScopedTypeVariables,

97 FlexibleInstances,

@@ -115,7 +115,6 @@ Test-Suite TestClosure

115 transformers >= 0.2 && < 0.4,

116 mtl >= 2.0 && < 2.2,

117 data-accessor >= 0.2 && < 0.3,

118− bytestring >= 0.9 && < 0.11,

119 containers >= 0.4 && < 0.6,

118 containers >= 0.4 && < 0.6,

120 old-locale >= 1.0 && < 1.1,

119 old-locale >= 1.0 && < 1.1,

121 time >= 1.2 && < 1.5,

120 time >= 1.2 && < 1.5,

@@ -125,7 +124,8 @@ Test-Suite TestClosure

125 ansi-terminal >= 0.5 && < 0.6,

124 ansi-terminal >= 0.5 && < 0.6,

126 distributed-static >= 0.1 && < 0.2,

125 distributed-static >= 0.1 && < 0.2,

127 rank1dynamic >= 0.1 && < 0.2,

126 rank1dynamic >= 0.1 && < 0.2,

128− syb >= 0.3 && < 0.4

127+ syb >= 0.3 && < 0.4,

128+ not-bytestring

129 Other-modules: TestAuxiliary

130 Extensions: RankNTypes,

131 ScopedTypeVariables,

distributed-process/src/Control/Distributed/Process.hs+13−6

@@ -294,14 +294,14 @@ spawn nid proc = do

294 `seqCP` proc

295 mPid <- receiveWait

296 [ matchIf (\(DidSpawn ref _) -> ref == sRef)

297− (\(DidSpawn _ pid) -> return $ Just pid)

297+ (\(DidSpawn _ pid) -> return $ Right pid)

298 , matchIf (\(NodeMonitorNotification ref _ _) -> ref == mRef)

299− (\_ -> return Nothing)

299+ (\(NodeMonitorNotification _ _ err) -> return $ Left err)

300 ]

301 unmonitor mRef

302 case mPid of

303− Nothing -> fail "spawn: remote node failed"

303+ Left err -> fail $ "spawn: remote node failed: " ++ show err

304− Just pid -> send pid () >> return pid

304+ Right pid -> send pid () >> return pid

305

306-- | Spawn a process and link to it

307--

@@ -343,8 +343,15 @@ call dict nid proc = do

343 (\(ProcessMonitorNotification _ _ reason) -> return (Left reason))

344 ]

345 case mResult of

346+ Right a -> do

347+ -- Wait for the monitor message so that we the mailbox doesn't grow

348+ receiveWait

349+ [ matchIf (\(ProcessMonitorNotification ref _ _) -> ref == mRef)

350+ (\(ProcessMonitorNotification {}) -> return ())

351+ ]

346− Right a -> unmonitor mRef >> return a

352+ return a

353+ Left err ->

347− Left err -> fail $ "call: remote process died: " ++ show err

354+ fail $ "call: remote process died: " ++ show err

348

355

349-- | Spawn a child process, have the child link to the parent and the parent

356-- | Spawn a child process, have the child link to the parent and the parent

350-- monitor the child

357-- monitor the child

distributed-process/src/Control/Distributed/Process/Internal/Closure/BuiltIn.hs+2−2

@@ -23,8 +23,8 @@ module Control.Distributed.Process.Internal.Closure.BuiltIn

23 , cpNewChan

24 ) where

25

26−import Data.ByteString.Lazy (ByteString)

26+import Data.NotByteString.Lazy (ByteString)

27−import Data.Binary (decode, encode)

27+import Data.NotByteString.Lazy.Binary (decode, encode)

28import Data.Rank1Typeable (Typeable, ANY, ANY1, ANY2, ANY3, ANY4)

29import Data.Rank1Dynamic (toDynamic)

30import Control.Distributed.Static

distributed-process/src/Control/Distributed/Process/Internal/Closure/TH.hs+1−1

@@ -39,7 +39,7 @@ import Language.Haskell.TH

39 , funD

40 , sigD

41 )

42−import Data.Binary (encode)

42+import Data.NotByteString.Lazy.Binary (encode)

43import Data.Generics (everywhereM, mkM, gmapM)

44import Data.Rank1Dynamic (toDynamic)

45import Data.Rank1Typeable

distributed-process/src/Control/Distributed/Process/Internal/Node.hs+6−5

@@ -6,9 +6,10 @@ module Control.Distributed.Process.Internal.Node

6 ) where

7

8import Data.Accessor ((^.), (^=))

9−import Data.Binary (Binary, encode)

9+import Data.Binary (Binary)

10+import Data.NotByteString.Lazy.Binary (encode)

10−import qualified Data.ByteString.Lazy as BSL (toChunks)

11+import qualified Data.NotByteString.Lazy as BSL (toChunks)

11−import qualified Data.ByteString as BSS (ByteString)

12+import qualified Data.NotByteString as BSS (ByteString)

12import Control.Distributed.Process.Internal.StrictMVar (withMVar, modifyMVar_)

13import Control.Distributed.Process.Internal.StrictMVar (withMVar, modifyMVar_)

13import Control.Concurrent.Chan (writeChan)

14import Control.Concurrent.Chan (writeChan)

14import Control.Monad (unless)

15import Control.Monad (unless)

@@ -44,8 +45,8 @@ sendPayload node from to payload = do

44 Just conn -> do

45 Just conn -> do

45 didSend <- NT.send conn payload

46 didSend <- NT.send conn payload

46 case didSend of

47 case didSend of

47− Left _ -> return False

48+ Left _err -> return False

48− Right _ -> return True

49+ Right () -> return True

49 Nothing -> return False

50 Nothing -> return False

50 unless didSend $

51 unless didSend $

51 writeChan (localCtrlChan node) NCMsg

52 writeChan (localCtrlChan node) NCMsg

distributed-process/src/Control/Distributed/Process/Internal/Primitives.hs+1−1

@@ -65,7 +65,7 @@ module Control.Distributed.Process.Internal.Primitives

65import Prelude hiding (catch)

66#endif

67

68−import Data.Binary (decode)

68+import Data.NotByteString.Lazy.Binary (decode)

69import Data.Time.Clock (getCurrentTime)

70import Data.Time.Format (formatTime)

71import System.Locale (defaultTimeLocale)

distributed-process/src/Control/Distributed/Process/Internal/Types.hs+4−3

@@ -64,9 +64,10 @@ module Control.Distributed.Process.Internal.Types

64import Data.Map (Map)

65import Data.Int (Int32)

66import Data.Typeable (Typeable)

67−import Data.Binary (Binary(put, get), putWord8, getWord8, encode)

67+import Data.Binary (Binary(put, get), putWord8, getWord8)

68+import Data.NotByteString.Lazy.Binary (encode)

68−import qualified Data.ByteString as BSS (ByteString, concat)

69+import qualified Data.NotByteString as BSS (ByteString, concat)

69−import qualified Data.ByteString.Lazy as BSL

70+import qualified Data.NotByteString.Lazy as BSL

70 ( ByteString

71 ( ByteString

71 , toChunks

72 , toChunks

72 , splitAt

73 , splitAt

distributed-process/src/Control/Distributed/Process/Node.hs+12−2

@@ -14,8 +14,8 @@ import Prelude hiding (catch)

14#endif

15

16import System.IO (fixIO, hPutStrLn, stderr)

17−import qualified Data.ByteString.Lazy as BSL (fromChunks)

17+import qualified Data.NotByteString.Lazy as BSL (fromChunks)

18−import Data.Binary (decode)

18+import Data.NotByteString.Lazy.Binary (decode)

19import Data.Map (Map)

20import qualified Data.Map as Map

21 ( empty

@@ -65,6 +65,7 @@ import qualified Network.Transport as NT

65 , address

66 , closeEndPoint

67 , ConnectionId

68+ , Connection

68 )

69 )

69import Data.Accessor (Accessor, accessor, (^.), (^=), (^:))

70import Data.Accessor (Accessor, accessor, (^.), (^=), (^:))

70import qualified Data.Accessor.Container as DAC (mapDefault, mapMaybe)

71import qualified Data.Accessor.Container as DAC (mapDefault, mapMaybe)

@@ -89,6 +90,7 @@ import Control.Distributed.Process.Internal.Types

89 , localPidCounter

90 , localPidCounter

90 , localPidUnique

91 , localPidUnique

91 , localProcessWithId

92 , localProcessWithId

93+ , localConnections

92 , MonitorRef(..)

94 , MonitorRef(..)

93 , ProcessMonitorNotification(..)

95 , ProcessMonitorNotification(..)

94 , NodeMonitorNotification(..)

96 , NodeMonitorNotification(..)

@@ -214,6 +216,7 @@ forkProcess node proc = modifyMVar (localState node) $ \st -> do

214 -- [Unified: Table 4, rules termination and exiting]

216 -- [Unified: Table 4, rules termination and exiting]

215 modifyMVar_ (localState node) $

217 modifyMVar_ (localState node) $

216 return . (localProcessWithId lpid ^= Nothing)

218 return . (localProcessWithId lpid ^= Nothing)

219+ . (localConnections ^: removeConnectionsFrom (ProcessIdentifier pid))

217 writeChan (localCtrlChan node) NCMsg

220 writeChan (localCtrlChan node) NCMsg

218 { ctrlMsgSender = ProcessIdentifier pid

221 { ctrlMsgSender = ProcessIdentifier pid

219 , ctrlMsgSignal = Died (ProcessIdentifier pid) reason

222 , ctrlMsgSignal = Died (ProcessIdentifier pid) reason

@@ -236,6 +239,13 @@ forkProcess node proc = modifyMVar (localState node) $ \st -> do

236 , pid

239 , pid

237 )

240 )

238

241

242+-- | Remove connections from 'ident' (typically because 'ident' has terminated)

243+removeConnectionsFrom :: Identifier

244+ -> Map (Identifier, Identifier) NT.Connection

245+ -> Map (Identifier, Identifier) NT.Connection

246+removeConnectionsFrom ident =

247+ Map.filterWithKey $ \(fr, _to) _conn -> fr /= ident

248+

239handleIncomingMessages :: LocalNode -> IO ()

249handleIncomingMessages :: LocalNode -> IO ()

240handleIncomingMessages node = go [] Map.empty Map.empty Set.empty

250handleIncomingMessages node = go [] Map.empty Map.empty Set.empty

241 where

251 where

distributed-process/src/Control/Distributed/Process/Serializable.hs+6−6

@@ -15,12 +15,12 @@ import Data.Typeable.Internal (TypeRep(TypeRep))

15import Numeric (showHex)

16import Control.Exception (throw)

17import GHC.Fingerprint.Type (Fingerprint(..))

18−import Data.ByteString (ByteString)

18+import Data.NotByteString (ByteString)

19−import qualified Data.ByteString as BS

19+import qualified Data.NotByteString as BS

20−import qualified Data.ByteString.Internal as BSI ( unsafeCreate

20+import qualified Data.NotByteString.Internal as BSI ( unsafeCreate

21− , inlinePerformIO

21+ , inlinePerformIO

22− , toForeignPtr

22+ , toForeignPtr

23− )

23+ )

24import Foreign.Storable (pokeByteOff, peekByteOff, sizeOf)

25import Foreign.ForeignPtr (withForeignPtr)

26

distributed-static/distributed-static.cabal+2−2

@@ -29,8 +29,8 @@ Library

29 Build-Depends: base >= 4 && < 5,

30 rank1dynamic >= 0.1 && < 0.2,

31 containers >= 0.4 && < 0.6,

32− bytestring >= 0.9 && < 0.11,

33− binary >= 0.5 && < 0.6

32+ binary >= 0.5 && < 0.6,

33+ not-bytestring

34 HS-Source-Dirs: src

35 Extensions: DeriveDataTypeable,

36 ScopedTypeVariables

distributed-static/src/Control/Distributed/Static.hs+2−3

@@ -228,10 +228,9 @@ import Data.Binary

228 , Get

229 , putWord8

230 , getWord8

231− , encode

232− , decode

233 )

231 )

232+import Data.NotByteString.Lazy.Binary (decode, encode)

234−import Data.ByteString.Lazy (ByteString, empty)

233+import Data.NotByteString.Lazy (ByteString, empty)

235import Data.Map (Map)

234import Data.Map (Map)

236import qualified Data.Map as Map (lookup, empty, insert)

235import qualified Data.Map as Map (lookup, empty, insert)

237import Control.Applicative ((<$>), (<*>))

236import Control.Applicative ((<$>), (<*>))

network-transport-tcp/network-transport-tcp.cabal+5−3

@@ -25,8 +25,9 @@ Library

25 network-transport >= 0.2 && < 0.3,

26 data-accessor >= 0.2 && < 0.3,

27 containers >= 0.4 && < 0.6,

28+ network >= 2.3 && < 2.4,

28 bytestring >= 0.9 && < 0.11,

29 bytestring >= 0.9 && < 0.11,

29− network >= 2.3 && < 2.4

30+ not-bytestring

30 Exposed-modules: Network.Transport.TCP,

31 Exposed-modules: Network.Transport.TCP,

31 Network.Transport.TCP.Internal

32 Network.Transport.TCP.Internal

32 Extensions: CPP

33 Extensions: CPP

@@ -40,11 +41,12 @@ Test-Suite TestTCP

40 network-transport >= 0.2 && < 0.3,

41 network-transport >= 0.2 && < 0.3,

41 data-accessor >= 0.2 && < 0.3,

42 data-accessor >= 0.2 && < 0.3,

42 containers >= 0.4 && < 0.6,

43 containers >= 0.4 && < 0.6,

43− bytestring >= 0.9 && < 0.11,

44 network >= 2.3 && < 2.4,

45 random >= 1.0 && < 1.1,

46 ansi-terminal >= 0.5 && < 0.6,

47− mtl >= 2.0 && < 2.2

47+ mtl >= 2.0 && < 2.2,

48+ bytestring >= 0.9 && < 0.11,

49+ not-bytestring

48 Other-modules: TestAuxiliary,

50 Other-modules: TestAuxiliary,

49 TestTransport,

51 TestTransport,

50 Traced

52 Traced

network-transport-tcp/src/Network/Transport/TCP.hs+5−5

@@ -66,7 +66,7 @@ import qualified Network.Socket as N ( HostName

66 , sOMAXCONN

67 , AddrInfo

68 )

69−import Network.Socket.ByteString (sendMany)

69+import Data.NotByteString.NBS (sendMany)

70import Control.Concurrent (forkIO, ThreadId, killThread, myThreadId)

71import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan)

72import Control.Concurrent.MVar ( MVar

@@ -95,9 +95,9 @@ import Control.Exception ( IOException

95 , fromException

96 )

97import Data.IORef (IORef, newIORef, writeIORef, readIORef)

98−import Data.ByteString (ByteString)

98+import Data.NotByteString (ByteString)

99−import qualified Data.ByteString as BS (concat)

99+import qualified Data.NotByteString as BS (concat)

100−import qualified Data.ByteString.Char8 as BSC (pack, unpack, split)

100+import qualified Data.NotByteString.Char8 as BSC (pack, unpack, split)

101import Data.Int (Int32)

102import Data.IntMap (IntMap)

103import qualified Data.IntMap as IntMap (empty)

@@ -1155,7 +1155,7 @@ setupRemoteEndPoint params (ourEndPoint, theirEndPoint) hints = do

1155 { remoteSocket = sock

1156 , _remoteOutgoing = 0

1157 , _remoteIncoming = IntSet.empty

1158− , sendOn = sendMany sock

1158+ , sendOn = sendMany sock

1159 , _pendingCtrlRequests = IntMap.empty

1160 , _nextCtrlRequestId = 0

1161 }

network-transport-tcp/src/Network/Transport/TCP/Internal.hs+3−3

@@ -28,13 +28,13 @@ import qualified Network.Socket as N ( HostName

28 , accept

29 , sClose

30 )

31−import qualified Network.Socket.ByteString as NBS (recv)

31+import qualified Data.NotByteString.NBS as NBS (recv)

32import Control.Concurrent (ThreadId)

33import Control.Monad (forever, when)

34import Control.Exception (SomeException, catch, bracketOnError, throwIO, mask_)

35import Control.Applicative ((<$>))

36−import Data.ByteString (ByteString)

36+import Data.NotByteString (ByteString)

37−import qualified Data.ByteString as BS (length, concat, null)

37+import qualified Data.NotByteString as BS (length, concat, null)

38import Data.Int (Int32)

39

40-- | Start a server at the specified address.

network-transport/network-transport.cabal+2−2

@@ -66,8 +66,8 @@ Source-Repository head

66Library

67 Build-Depends: base >= 4.3 && < 5,

68 binary >= 0.5 && < 0.6,

69− bytestring >= 0.9 && < 0.11,

70− transformers >= 0.2 && < 0.4

69+ transformers >= 0.2 && < 0.4,

70+ not-bytestring

71 Exposed-Modules: Network.Transport,

72 Network.Transport.Util

73 Network.Transport.Internal

network-transport/src/Network/Transport.hs+2−2

@@ -22,8 +22,8 @@ module Network.Transport ( -- * Types

22 , EventErrorCode(..)

23 ) where

24

25−import Data.ByteString (ByteString)

25+import Data.NotByteString (ByteString)

26−import qualified Data.ByteString.Char8 as BSC (unpack)

26+import qualified Data.NotByteString.Char8 as BSC (unpack)

27import Control.Exception (Exception)

28import Data.Typeable (Typeable)

29import Data.Binary (Binary)

network-transport/src/Network/Transport/Internal.hs+5−5

@@ -25,11 +25,11 @@ import Prelude hiding (catch)

25import Foreign.Storable (pokeByteOff, peekByteOff)

26import Foreign.C (CInt(..), CShort(..))

27import Foreign.ForeignPtr (withForeignPtr)

28−import Data.ByteString (ByteString)

28+import Data.NotByteString (ByteString)

29−import qualified Data.ByteString as BS (length)

29+import qualified Data.NotByteString as BS (length)

30−import qualified Data.ByteString.Internal as BSI ( unsafeCreate

30+import qualified Data.NotByteString.Internal as BSI ( unsafeCreate

31− , toForeignPtr

31+ , toForeignPtr

32− , inlinePerformIO)

32+ , inlinePerformIO)

33import Control.Monad.IO.Class (MonadIO, liftIO)

34import Control.Exception ( IOException

35 , SomeException

not-bytestring/LICENSEnew file+30

@@ -0,0 +1,30 @@

2+

4+

5+Redistribution and use in source and binary forms, with or without

6+modification, are permitted provided that the following conditions are met:

7+

8+ * Redistributions of source code must retain the above copyright

9+ notice, this list of conditions and the following disclaimer.

10+

11+ * Redistributions in binary form must reproduce the above

12+ copyright notice, this list of conditions and the following

13+ disclaimer in the documentation and/or other materials provided

14+ with the distribution.

15+

16+ * Neither the name of Edsko de Vries nor the names of other

17+ contributors may be used to endorse or promote products derived

18+ from this software without specific prior written permission.

19+

20+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

21+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

22+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

23+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

24+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

25+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

26+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

27+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

28+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

29+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

30+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

not-bytestring/Setup.hsnew file+2

@@ -0,0 +1,2 @@

1+import Distribution.Simple

2+main = defaultMain

not-bytestring/not-bytestring.cabalnew file+34

@@ -0,0 +1,34 @@

1+-- Initial not-bytestring.cabal generated by cabal init. For further

2+-- documentation, see http://haskell.org/cabal/users-guide/

3+

4+name: not-bytestring

5+version: 0.1.0.0

6+synopsis: Not bytestring

7+-- description:

8+homepage: http://github.com/haskell-distribute/distributed-process

9+license: BSD3

10+license-file: LICENSE

11+author: Edsko de Vries

12+maintainer: edsko@well-typed.com

13+-- copyright:

14+category: Data

15+build-type: Simple

16+cabal-version: >=1.8

17+

18+library

19+ exposed-modules: Data.NotByteString

20+ Data.NotByteString.Internal

21+ Data.NotByteString.Char8

22+ Data.NotByteString.Lazy

23+ Data.NotByteString.Lazy.Char8

24+ Data.NotByteString.NBS

25+ Data.NotByteString.Lazy.Binary

26+ build-depends: base ==4.5.*,

27+ bytestring >= 0.9 && < 0.11,

28+ binary >= 0.5 && < 0.6,

29+ network >= 2.3 && < 2.4

30+ hs-source-dirs: src

31+ ghc-options: -Wall

32+ extensions: GeneralizedNewtypeDeriving,

33+ DeriveDataTypeable,

34+ BangPatterns

not-bytestring/src/Data/NotByteString.hsnew file+85

@@ -0,0 +1,85 @@

1+module Data.NotByteString

2+ ( ByteString(Nil, Cons)

3+ , fromString

4+ , toString

5+ , fromByteString

6+ , toByteString

7+ , length

8+ , concat

9+ , null

10+ , empty

11+ , splitAt

12+ , foldr

13+ , foldl'

14+ , (++)

15+ ) where

16+

17+import Prelude hiding (length, null, concat, splitAt, foldr, (++), reverse)

18+import qualified Prelude (length, null, splitAt, foldr)

19+import Data.Binary (Binary(get, put))

20+import Data.Typeable (Typeable)

21+import qualified Data.ByteString as BS (ByteString)

22+import qualified Data.ByteString.Char8 as BSC (pack, foldr)

23+import Control.Applicative ((<$>))

24+

25+data ByteString = Nil | Cons {-# UNPACK #-} !Char !ByteString

26+ deriving (Typeable, Eq, Ord)

27+

28+instance Show ByteString where

29+ show = toString

30+

31+instance Binary ByteString where

32+ get = fromByteString <$> get

33+ put = put . toByteString

34+

35+foldl' :: (a -> Char -> a) -> a -> ByteString -> a

36+foldl' f = go

37+ where

38+ go !acc Nil = acc

39+ go !acc (Cons c cs) = go (acc `f` c) cs

40+

41+foldr :: (Char -> a -> a) -> a -> ByteString -> a

42+foldr f e = go

43+ where

44+ go Nil = e

45+ go (Cons c cs) = c `f` go cs

46+

47+toString :: ByteString -> String

48+toString = foldr (:) []

49+

50+fromString :: String -> ByteString

51+fromString = Prelude.foldr Cons Nil

52+

53+fromByteString :: BS.ByteString -> ByteString

54+fromByteString = BSC.foldr Cons Nil

55+

56+toByteString :: ByteString -> BS.ByteString

57+toByteString = BSC.pack . toString

58+

59+length :: ByteString -> Int

60+length = foldl' (\l _ -> l + 1) 0

61+

62+(++) :: ByteString -> ByteString -> ByteString

63+xs ++ ys = foldr Cons ys xs

64+

65+concat :: [ByteString] -> ByteString

66+concat = Prelude.foldr (++) empty

67+

68+null :: ByteString -> Bool

69+null = foldr (\_ _ -> False) True

70+

71+empty :: ByteString

72+empty = Nil

73+

74+reverse :: ByteString -> ByteString

75+reverse = go Nil

76+ where

77+ go acc Nil = acc

78+ go acc (Cons c cs) = go (Cons c acc) cs

79+

80+splitAt :: Int -> ByteString -> (ByteString, ByteString)

81+splitAt = go Nil

82+ where

83+ go acc 0 cs = (reverse acc, cs)

84+ go acc _ Nil = (reverse acc, Nil)

85+ go acc n (Cons c cs) = go (Cons c acc) (n - 1) cs

not-bytestring/src/Data/NotByteString/Char8.hsnew file+24

@@ -0,0 +1,24 @@

1+module Data.NotByteString.Char8

2+ ( pack

3+ , unpack

4+ , split

5+ ) where

6+

7+import Data.NotByteString

8+ ( ByteString

9+ , fromString

10+ , toString

11+ , fromByteString

12+ , toByteString

13+ )

14+import qualified Data.ByteString.Char8 as BSC (split)

15+

16+pack :: String -> ByteString

17+pack = fromString

18+

19+unpack :: ByteString -> String

20+unpack = toString

21+

22+-- TODO: Avoid roundtrip

23+split :: Char -> ByteString -> [ByteString]

24+split c = map fromByteString . BSC.split c . toByteString

not-bytestring/src/Data/NotByteString/Internal.hsnew file+24

@@ -0,0 +1,24 @@

1+module Data.NotByteString.Internal

2+ ( unsafeCreate

3+ , toForeignPtr

4+ , inlinePerformIO

5+ ) where

6+

7+import Data.NotByteString (ByteString, fromByteString, toByteString)

8+import Foreign.Ptr (Ptr)

9+import Foreign.ForeignPtr (ForeignPtr)

10+import Data.Word (Word8)

11+import qualified Data.ByteString.Internal as BSI

12+ ( unsafeCreate

13+ , toForeignPtr

14+ , inlinePerformIO

15+ )

16+

17+unsafeCreate :: Int -> (Ptr Word8 -> IO ()) -> ByteString

18+unsafeCreate i f = fromByteString $ BSI.unsafeCreate i f

19+

20+toForeignPtr :: ByteString -> (ForeignPtr Word8, Int, Int)

21+toForeignPtr = BSI.toForeignPtr . toByteString

22+

23+inlinePerformIO :: IO a -> a

24+inlinePerformIO = BSI.inlinePerformIO

not-bytestring/src/Data/NotByteString/Lazy.hsnew file+101

@@ -0,0 +1,101 @@

1+module Data.NotByteString.Lazy

2+ ( ByteString(Nil, Cons)

3+ , fromString

4+ , toString

5+ , fromByteString

6+ , toByteString

7+ , length

8+ , concat

9+ , null

10+ , empty

11+ , splitAt

12+ , foldr

13+ , foldl'

14+ , (++)

15+ , toChunks

16+ , fromChunks

17+ ) where

18+

19+import Prelude hiding (length, null, concat, splitAt, foldr, (++), reverse)

20+import qualified Prelude (length, null, splitAt, foldr)

21+import Data.Binary (Binary(get, put))

22+import Data.Typeable (Typeable)

23+import qualified Data.ByteString.Lazy as BSL (ByteString)

24+import qualified Data.ByteString.Lazy.Char8 as BSLC (pack, foldr)

25+import qualified Data.NotByteString as Strict (ByteString(Nil, Cons), foldr)

26+import Control.Applicative ((<$>))

27+

28+data ByteString = Nil | Cons {-# UNPACK #-} !Char ByteString

29+ deriving (Typeable, Eq, Ord)

30+

31+instance Show ByteString where

32+ show = toString

33+

34+instance Binary ByteString where

35+ get = fromByteString <$> get

36+ put = put . toByteString

37+

38+foldl' :: (a -> Char -> a) -> a -> ByteString -> a

39+foldl' f = go

40+ where

41+ go !acc Nil = acc

42+ go !acc (Cons c cs) = go (acc `f` c) cs

43+

44+foldr :: (Char -> a -> a) -> a -> ByteString -> a

45+foldr f e = go

46+ where

47+ go Nil = e

48+ go (Cons c cs) = c `f` go cs

49+

50+toString :: ByteString -> String

51+toString = foldr (:) []

52+

53+fromString :: String -> ByteString

54+fromString = Prelude.foldr Cons Nil

55+

56+fromByteString :: BSL.ByteString -> ByteString

57+fromByteString = BSLC.foldr Cons Nil

58+

59+toByteString :: ByteString -> BSL.ByteString

60+toByteString = BSLC.pack . toString

61+

62+length :: ByteString -> Int

63+length = foldl' (\l _ -> l + 1) 0

64+

65+(++) :: ByteString -> ByteString -> ByteString

66+xs ++ ys = foldr Cons ys xs

67+

68+concat :: [ByteString] -> ByteString

69+concat = Prelude.foldr (++) empty

70+

71+null :: ByteString -> Bool

72+null = foldr (\_ _ -> False) True

73+

74+empty :: ByteString

75+empty = Nil

76+

77+reverse :: ByteString -> ByteString

78+reverse = go Nil

79+ where

80+ go acc Nil = acc

81+ go acc (Cons c cs) = go (Cons c acc) cs

82+

83+splitAt :: Int -> ByteString -> (ByteString, ByteString)

84+splitAt = go Nil

85+ where

86+ go acc 0 cs = (reverse acc, cs)

87+ go acc _ Nil = (reverse acc, Nil)

88+ go acc n (Cons c cs) = go (Cons c acc) (n - 1) cs

89+

90+toStrict :: ByteString -> Strict.ByteString

91+toStrict = foldr Strict.Cons Strict.Nil

92+

93+fromStrict :: Strict.ByteString -> ByteString

94+fromStrict = Strict.foldr Cons Nil

95+

96+-- | This does not preserve laziness

97+toChunks :: ByteString -> [Strict.ByteString]

98+toChunks = return . toStrict

99+

100+fromChunks :: [Strict.ByteString] -> ByteString

101+fromChunks = concat . map fromStrict

not-bytestring/src/Data/NotByteString/Lazy/Binary.hsnew file+14

@@ -0,0 +1,14 @@

1+module Data.NotByteString.Lazy.Binary

2+ ( encode

3+ , decode

4+ ) where

5+

6+import Data.NotByteString.Lazy (ByteString, fromByteString, toByteString)

7+import Data.Binary (Binary)

8+import qualified Data.Binary as Binary (encode, decode)

9+

10+encode :: Binary a => a -> ByteString

11+encode = fromByteString . Binary.encode

12+

13+decode :: Binary a => ByteString -> a

14+decode = Binary.decode . toByteString

not-bytestring/src/Data/NotByteString/Lazy/Char8.hsnew file+24

@@ -0,0 +1,24 @@

1+module Data.NotByteString.Lazy.Char8

2+ ( pack

3+ , unpack

4+ , split

5+ ) where

6+

7+import Data.NotByteString.Lazy

8+ ( ByteString

9+ , fromString

10+ , toString

11+ , fromByteString

12+ , toByteString

13+ )

14+import qualified Data.ByteString.Lazy.Char8 as BSC (split)

15+

16+pack :: String -> ByteString

17+pack = fromString

18+

19+unpack :: ByteString -> String

20+unpack = toString

21+

22+-- TODO: Avoid roundtrip

23+split :: Char -> ByteString -> [ByteString]

24+split c = map fromByteString . BSC.split c . toByteString

not-bytestring/src/Data/NotByteString/NBS.hsnew file+15

@@ -0,0 +1,15 @@

1+module Data.NotByteString.NBS

2+ ( recv

3+ , sendMany

4+ ) where

5+

6+import Control.Applicative ((<$>))

7+import Data.NotByteString (ByteString, fromByteString, toByteString)

8+import Network.Socket (Socket)

9+import qualified Network.Socket.ByteString as NSB (recv, sendMany)

10+

11+recv :: Socket -> Int -> IO ByteString

12+recv sock n = fromByteString <$> NSB.recv sock n

13+

14+sendMany :: Socket -> [ByteString] -> IO ()

15+sendMany sock = NSB.sendMany sock . map toByteString