git.iko.soy/distributed-process
on master help sign in
Fixed bug in Network.Transport.TCP
commit6074b2674f83fa57c596e7ee45fbf27baab3a2db authorEdsko de Vries <edsko@edsko.net> dateThu 12 Jul 2012, 14:12 (14 years ago) parent00ef03f
2 files changed+2−9
compare with master
unifiedsplit
distributed-process/tests/TestClosure.hs+1−8 network-transport-tcp/src/Network/Transport/TCP/Internal.hs+1−1
distributed-process/tests/TestClosure.hs+1−8
@@ -39,10 +39,7 @@ wait = liftIO . threadDelay
3939-- | First argument indicates empty closure environment
4040typedPingServer :: () -> ReceivePort (SendPort ()) -> Process ()
4141typedPingServer () rport = forever $ do
42− us <- getSelfPid
43− liftIO . putStrLn $ "Ping server " ++ show us ++ " waiting"
4442 sport <- receiveChan rport
45− liftIO . putStrLn $ "Ping server " ++ show us ++ " replying on " ++ show (sendPortId sport)
4643 sendChan sport ()
4744
4845remotable [ 'factorial
@@ -297,11 +294,7 @@ testSpawnChannel transport rtable = do
297294 ($(mkClosure 'typedPingServer) ())
298295 (sendReply, receiveReply) <- newChan
299296 sendChan pingServer sendReply
300− sendChan pingServer sendReply
301− liftIO . putStrLn $ "client waiting for ping server to reply on " ++ show (sendPortId sendReply)
302− () <- receiveChan receiveReply
303− liftIO . putStrLn $ "client got reply"
304− return ()
297+ receiveChan receiveReply
305298
306299main :: IO ()
307300main = do
network-transport-tcp/src/Network/Transport/TCP/Internal.hs+1−1
@@ -104,7 +104,7 @@ tryCloseSocket sock = void . tryIO $
104104recvExact :: N.Socket -- ^ Socket to read from
105105 -> Int32 -- ^ Number of bytes to read
106106 -> IO [ByteString]
107−recvExact _ len | len <= 0 = throwIO (userError "recvExact: Negative length")
107+recvExact _ len | len < 0 = throwIO (userError "recvExact: Negative length")
108108recvExact sock len = go [] len
109109 where
110110 go :: [ByteString] -> Int32 -> IO [ByteString]