git.iko.soy/distributed-process
on master help sign in
Fix compilation warnings.
86c2366Alexander Vershilov
src/Control/Distributed/Process/Debug.hs+3−7
compare with master
unifiedsplit
@@ -141,17 +141,14 @@ module Control.Distributed.Process.Debug
141 )
141 )
142 where
142 where
143
143
144−import Control.Applicative ((<$>))
144+import Control.Applicative
145import Control.Distributed.Process.Internal.Primitives
145import Control.Distributed.Process.Internal.Primitives
146 ( proxy
146 ( proxy
147− , finally
148 , die
147 , die
149 , whereis
148 , whereis
150 , send
149 , send
151 , receiveWait
150 , receiveWait
152 , matchIf
151 , matchIf
153− , finally
154− , try
155 , monitor
152 , monitor
156 )
153 )
157import Control.Distributed.Process.Internal.Types
154import Control.Distributed.Process.Internal.Types
@@ -196,12 +193,11 @@ import Control.Exception (SomeException)
196
193
197import Control.Monad.IO.Class (liftIO)
194import Control.Monad.IO.Class (liftIO)
198import Control.Monad.Reader (ask)
195import Control.Monad.Reader (ask)
196+import Control.Monad.Catch (finally, try)
199
197
200import Data.Binary()
198import Data.Binary()
201
199
202−#if ! MIN_VERSION_base(4,6,0)
203−import Prelude hiding (catch)
200+import Prelude
204−#endif
205
201
206--------------------------------------------------------------------------------
202--------------------------------------------------------------------------------
207-- Debugging/Tracing API --
203-- Debugging/Tracing API --
src/Control/Distributed/Process/Management.hs+3−2
@@ -242,7 +242,7 @@ module Control.Distributed.Process.Management
242 , liftMX
242 , liftMX
243 ) where
243 ) where
244
244
245−import Control.Applicative ((<$>))
245+import Control.Applicative
246import Control.Concurrent.STM (atomically)
246import Control.Concurrent.STM (atomically)
247import Control.Concurrent.STM.TChan
247import Control.Concurrent.STM.TChan
248 ( readTChan
248 ( readTChan
@@ -254,7 +254,6 @@ import Control.Distributed.Process.Internal.Primitives
254 , matchAny
254 , matchAny
255 , matchSTM
255 , matchSTM
256 , unwrapMessage
256 , unwrapMessage
257− , onException
258 , register
257 , register
259 , whereis
258 , whereis
260 , die
259 , die
@@ -281,12 +280,14 @@ import Control.Distributed.Process.Management.Internal.Types
281import Control.Distributed.Process.Serializable (Serializable)
280import Control.Distributed.Process.Serializable (Serializable)
282import Control.Monad.IO.Class (liftIO)
281import Control.Monad.IO.Class (liftIO)
283import Control.Monad.Reader (ask)
282import Control.Monad.Reader (ask)
283+import Control.Monad.Catch (onException)
284import qualified Control.Monad.State as ST
284import qualified Control.Monad.State as ST
285 ( get
285 ( get
286 , modify
286 , modify
287 , lift
287 , lift
288 , runStateT
288 , runStateT
289 )
289 )
290+import Prelude
290
291
291-- | Publishes an arbitrary @Serializable@ message to the management event bus.
292-- | Publishes an arbitrary @Serializable@ message to the management event bus.
292-- Note that /no attempt is made to force the argument/, therefore it is very
293-- Note that /no attempt is made to force the argument/, therefore it is very
src/Control/Distributed/Process/Management/Internal/Agent.hs+2−1
@@ -3,7 +3,7 @@
3
3
4module Control.Distributed.Process.Management.Internal.Agent where
4module Control.Distributed.Process.Management.Internal.Agent where
5
5
6−import Control.Applicative ((<$>))
6+import Control.Applicative
7import Control.Concurrent (forkIO)
7import Control.Concurrent (forkIO)
8import Control.Concurrent.MVar (MVar, newEmptyMVar, putMVar, takeMVar)
8import Control.Concurrent.MVar (MVar, newEmptyMVar, putMVar, takeMVar)
9import Control.Concurrent.STM (atomically)
9import Control.Concurrent.STM (atomically)
@@ -44,6 +44,7 @@ import Control.Monad (void)
44import Control.Monad.IO.Class (liftIO)
44import Control.Monad.IO.Class (liftIO)
45import Control.Monad.Reader (ask)
45import Control.Monad.Reader (ask)
46import GHC.Weak (Weak, deRefWeak)
46import GHC.Weak (Weak, deRefWeak)
47+import Prelude
47
48
48--------------------------------------------------------------------------------
49--------------------------------------------------------------------------------
49-- Agent Controller Implementation --
50-- Agent Controller Implementation --
src/Control/Distributed/Process/Management/Internal/Trace/Primitives.hs+2−1
@@ -28,7 +28,7 @@ module Control.Distributed.Process.Management.Internal.Trace.Primitives
28 , withRegisteredTracer
28 , withRegisteredTracer
29 ) where
29 ) where
30
30
31−import Control.Applicative ((<$>))
31+import Control.Applicative
32import Control.Distributed.Process.Internal.Primitives
32import Control.Distributed.Process.Internal.Primitives
33 ( whereis
33 ( whereis
34 , newChan
34 , newChan
@@ -67,6 +67,7 @@ import Control.Monad.IO.Class (liftIO)
67import Control.Monad.Reader (ask)
67import Control.Monad.Reader (ask)
68
68
69import qualified Data.Set as Set (fromList)
69import qualified Data.Set as Set (fromList)
70+import Prelude
70
71
71--------------------------------------------------------------------------------
72--------------------------------------------------------------------------------
72-- Main API --
73-- Main API --
src/Control/Distributed/Process/Node.hs+5−14
@@ -20,10 +20,6 @@ module Control.Distributed.Process.Node
20
20
21-- TODO: Calls to 'sendBinary' and co (by the NC) may stall the node controller.
21-- TODO: Calls to 'sendBinary' and co (by the NC) may stall the node controller.
22
22
23−#if ! MIN_VERSION_base(4,6,0)
24−import Prelude hiding (catch)
25−#endif
26−
27import System.IO (fixIO, hPutStrLn, stderr)
23import System.IO (fixIO, hPutStrLn, stderr)
28import System.Mem.Weak (Weak, deRefWeak)
24import System.Mem.Weak (Weak, deRefWeak)
29import qualified Data.ByteString.Lazy as BSL (fromChunks)
25import qualified Data.ByteString.Lazy as BSL (fromChunks)
@@ -52,7 +48,7 @@ import Data.Foldable (forM_)
52import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
48import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
53import Data.Typeable (Typeable)
49import Data.Typeable (Typeable)
54import Control.Category ((>>>))
50import Control.Category ((>>>))
55−import Control.Applicative (Applicative, (<$>))
51+import Control.Applicative
56import Control.Monad (void, when, join)
52import Control.Monad (void, when, join)
57import Control.Monad.IO.Class (MonadIO, liftIO)
53import Control.Monad.IO.Class (MonadIO, liftIO)
58import Control.Monad.State.Strict (MonadState, StateT, evalStateT, gets)
54import Control.Monad.State.Strict (MonadState, StateT, evalStateT, gets)
@@ -60,7 +56,6 @@ import qualified Control.Monad.State.Strict as StateT (get, put)
60import Control.Monad.Reader (MonadReader, ReaderT, runReaderT, ask)
56import Control.Monad.Reader (MonadReader, ReaderT, runReaderT, ask)
61import Control.Exception
57import Control.Exception
62 ( throwIO
58 ( throwIO
63− , AsyncException(ThreadKilled)
64 , SomeException
59 , SomeException
65 , Exception
60 , Exception
66 , throwTo
61 , throwTo
@@ -72,12 +67,11 @@ import qualified Control.Exception as Exception
72 , catches
67 , catches
73 , finally
68 , finally
74 )
69 )
75−import Control.Concurrent (forkIO, forkIOWithUnmask, killThread, myThreadId)
70+import Control.Concurrent (forkIO, forkIOWithUnmask, killThread)
76import Control.Distributed.Process.Internal.StrictMVar
71import Control.Distributed.Process.Internal.StrictMVar
77 ( newMVar
72 ( newMVar
78 , withMVar
73 , withMVar
79 , modifyMVarMasked
74 , modifyMVarMasked
80− , modifyMVar_
81 , modifyMVar
75 , modifyMVar
82 , newEmptyMVar
76 , newEmptyMVar
83 , putMVar
77 , putMVar
@@ -167,12 +161,11 @@ import Control.Distributed.Process.Internal.Types
167 , RegisterReply(..)
161 , RegisterReply(..)
168 , WhereIsReply(..)
162 , WhereIsReply(..)
169 , payloadToMessage
163 , payloadToMessage
170− , messageToPayload
171 , createUnencodedMessage
164 , createUnencodedMessage
172 , unsafeCreateUnencodedMessage
165 , unsafeCreateUnencodedMessage
173 , runLocalProcess
166 , runLocalProcess
174 , firstNonReservedProcessId
167 , firstNonReservedProcessId
175− , ImplicitReconnect(WithImplicitReconnect,NoImplicitReconnect)
168+ , ImplicitReconnect(WithImplicitReconnect)
176 )
169 )
177import Control.Distributed.Process.Management.Internal.Agent
170import Control.Distributed.Process.Management.Internal.Agent
178 ( mxAgentController
171 ( mxAgentController
@@ -195,7 +188,6 @@ import Control.Distributed.Process.Management.Internal.Types
195import Control.Distributed.Process.Serializable (Serializable)
188import Control.Distributed.Process.Serializable (Serializable)
196import Control.Distributed.Process.Internal.Messaging
189import Control.Distributed.Process.Internal.Messaging
197 ( sendBinary
190 ( sendBinary
198− , sendPayload
199 , closeImplicitReconnections
191 , closeImplicitReconnections
200 , impliesDeathOf
192 , impliesDeathOf
201 )
193 )
@@ -204,7 +196,6 @@ import Control.Distributed.Process.Internal.Primitives
204 , receiveWait
196 , receiveWait
205 , match
197 , match
206 , sendChan
198 , sendChan
207− , try
208 , unwrapMessage
199 , unwrapMessage
209 )
200 )
210import Control.Distributed.Process.Internal.Types (SendPort, Tracer(..))
201import Control.Distributed.Process.Internal.Types (SendPort, Tracer(..))
@@ -214,7 +205,9 @@ import qualified Control.Distributed.Process.Internal.StrictContainerAccessors a
214 ( mapMaybe
205 ( mapMaybe
215 , mapDefault
206 , mapDefault
216 )
207 )
208+import Control.Monad.Catch (try)
217import Unsafe.Coerce
209import Unsafe.Coerce
210+import Prelude
218
211
219--------------------------------------------------------------------------------
212--------------------------------------------------------------------------------
220-- Initialization --
213-- Initialization --
@@ -308,8 +301,6 @@ startServiceProcesses node = do
308 -- process which uses 'send' or other primitives which are traced.
301 -- process which uses 'send' or other primitives which are traced.
309 register "trace.logger" logger
302 register "trace.logger" logger
310 where
303 where
311− fork = forkProcess node
312−
313 loop = do
304 loop = do
314 receiveWait
305 receiveWait
315 [ match $ \((time, pid, string) ::(String, ProcessId, String)) -> do
306 [ match $ \((time, pid, string) ::(String, ProcessId, String)) -> do