git.iko.soy/distributed-process
on master help sign in
Fix compilation warnings.
0579726Alexander 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
@@ -273,7 +273,7 @@ module Control.Distributed.Process.Management
273 , mxDropTable
273 , mxDropTable
274 ) where
274 ) where
275
275
276−import Control.Applicative ((<$>))
276+import Control.Applicative
277import Control.Concurrent.STM (atomically)
277import Control.Concurrent.STM (atomically)
278import Control.Concurrent.STM.TChan
278import Control.Concurrent.STM.TChan
279 ( readTChan
279 ( readTChan
@@ -288,7 +288,6 @@ import Control.Distributed.Process.Internal.Primitives
288 , matchAny
288 , matchAny
289 , matchSTM
289 , matchSTM
290 , unwrapMessage
290 , unwrapMessage
291− , onException
292 , register
291 , register
293 , whereis
292 , whereis
294 , die
293 , die
@@ -317,12 +316,14 @@ import Control.Distributed.Process.Management.Internal.Types
317import Control.Distributed.Process.Serializable (Serializable)
316import Control.Distributed.Process.Serializable (Serializable)
318import Control.Monad.IO.Class (liftIO)
317import Control.Monad.IO.Class (liftIO)
319import Control.Monad.Reader (ask)
318import Control.Monad.Reader (ask)
319+import Control.Monad.Catch (onException)
320import qualified Control.Monad.State as ST
320import qualified Control.Monad.State as ST
321 ( get
321 ( get
322 , modify
322 , modify
323 , lift
323 , lift
324 , runStateT
324 , runStateT
325 )
325 )
326+import Prelude
326
327
327-- | Publishes an arbitrary @Serializable@ message to the management event bus.
328-- | Publishes an arbitrary @Serializable@ message to the management event bus.
328-- Note that /no attempt is made to force the argument/, therefore it is very
329-- 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
@@ -199,7 +192,6 @@ import Control.Distributed.Process.Management.Internal.Types
199import Control.Distributed.Process.Serializable (Serializable)
192import Control.Distributed.Process.Serializable (Serializable)
200import Control.Distributed.Process.Internal.Messaging
193import Control.Distributed.Process.Internal.Messaging
201 ( sendBinary
194 ( sendBinary
202− , sendPayload
203 , closeImplicitReconnections
195 , closeImplicitReconnections
204 , impliesDeathOf
196 , impliesDeathOf
205 )
197 )
@@ -208,7 +200,6 @@ import Control.Distributed.Process.Internal.Primitives
208 , receiveWait
200 , receiveWait
209 , match
201 , match
210 , sendChan
202 , sendChan
211− , try
212 , unwrapMessage
203 , unwrapMessage
213 )
204 )
214import Control.Distributed.Process.Internal.Types (SendPort, Tracer(..))
205import Control.Distributed.Process.Internal.Types (SendPort, Tracer(..))
@@ -218,7 +209,9 @@ import qualified Control.Distributed.Process.Internal.StrictContainerAccessors a
218 ( mapMaybe
209 ( mapMaybe
219 , mapDefault
210 , mapDefault
220 )
211 )
212+import Control.Monad.Catch (try)
221import Unsafe.Coerce
213import Unsafe.Coerce
214+import Prelude
222
215
223--------------------------------------------------------------------------------
216--------------------------------------------------------------------------------
224-- Initialization --
217-- Initialization --
@@ -314,8 +307,6 @@ startServiceProcesses node = do
314 -- process which uses 'send' or other primitives which are traced.
307 -- process which uses 'send' or other primitives which are traced.
315 register "trace.logger" logger
308 register "trace.logger" logger
316 where
309 where
317− fork = forkProcess node
318−
319 loop = do
310 loop = do
320 receiveWait
311 receiveWait
321 [ match $ \((time, pid, string) ::(String, ProcessId, String)) -> do
312 [ match $ \((time, pid, string) ::(String, ProcessId, String)) -> do