git.iko.soy/distributed-process
on master help sign in
Get rid of various compiler warnings
6f57fc1Tim Watson
src/Control/Distributed/Process.hs+1−17
compare with master
unifiedsplit
@@ -142,7 +142,6 @@ module Control.Distributed.Process
142import Prelude hiding (catch)
142import Prelude hiding (catch)
143#endif
143#endif
144
144
145−import Data.Typeable (Typeable)
146import Control.Monad.IO.Class (liftIO)
145import Control.Monad.IO.Class (liftIO)
147import Control.Applicative ((<$>))
146import Control.Applicative ((<$>))
148import Control.Monad.Reader (ask)
147import Control.Monad.Reader (ask)
@@ -152,8 +151,6 @@ import Control.Distributed.Static
152 , closure
151 , closure
153 , Static
152 , Static
154 , RemoteTable
153 , RemoteTable
155− , closureCompose
156− , staticClosure
157 )
154 )
158import Control.Distributed.Process.Internal.Types
155import Control.Distributed.Process.Internal.Types
159 ( NodeId(..)
156 ( NodeId(..)
@@ -177,21 +174,8 @@ import Control.Distributed.Process.Internal.Types
177 , RegisterReply(..)
174 , RegisterReply(..)
178 , LocalProcess(processNode)
175 , LocalProcess(processNode)
179 , Message
176 , Message
180− , nullProcessId
181− )
182−import Control.Distributed.Process.Serializable (Serializable, SerializableDict)
183−import Control.Distributed.Process.Internal.Closure.BuiltIn
184− ( sdictSendPort
185− , sndStatic
186− , idCP
187− , seqCP
188− , bindCP
189− , splitCP
190− , cpLink
191− , cpSend
192− , cpNewChan
193− , cpDelay
194 )
177 )
178+import Control.Distributed.Process.Serializable (Serializable)
195import Control.Distributed.Process.Internal.Primitives
179import Control.Distributed.Process.Internal.Primitives
196 ( -- Basic messaging
180 ( -- Basic messaging
197 send
181 send
src/Control/Distributed/Process/Debug.hs+3−15
@@ -135,34 +135,23 @@ import Control.Distributed.Process.Internal.Primitives
135 , die
135 , die
136 , whereis
136 , whereis
137 , send
137 , send
138− , newChan
139− , receiveChan
140 , receiveWait
138 , receiveWait
141 , matchIf
139 , matchIf
142 , finally
140 , finally
143 , try
141 , try
144 , monitor
142 , monitor
145− , say
146− )
147−import Control.Distributed.Process.Internal.Spawn
148− ( spawn
149 )
143 )
150import Control.Distributed.Process.Internal.Types
144import Control.Distributed.Process.Internal.Types
151− ( Tracer(..)
152− , LocalNode(..)
153− , ProcessId
145+ ( ProcessId
154 , Process
146 , Process
155 , LocalProcess(..)
147 , LocalProcess(..)
156− , SendPort(..)
157 , ProcessMonitorNotification(..)
148 , ProcessMonitorNotification(..)
158− , NodeId(..)
159 )
149 )
160import Control.Distributed.Process.Internal.Trace.Types
150import Control.Distributed.Process.Internal.Trace.Types
161 ( TraceArg(..)
151 ( TraceArg(..)
162 , TraceEvent(..)
152 , TraceEvent(..)
163 , TraceFlags(..)
153 , TraceFlags(..)
164 , TraceSubject(..)
154 , TraceSubject(..)
165− , TraceOk(..)
166 , defaultTraceFlags
155 , defaultTraceFlags
167 )
156 )
168import Control.Distributed.Process.Internal.Trace.Tracer
157import Control.Distributed.Process.Internal.Trace.Tracer
@@ -188,7 +177,6 @@ import Control.Distributed.Process.Internal.Trace.Primitives
188 )
177 )
189import qualified Control.Distributed.Process.Internal.Trace.Remote as Remote
178import qualified Control.Distributed.Process.Internal.Trace.Remote as Remote
190import Control.Distributed.Process.Node
179import Control.Distributed.Process.Node
191−import Control.Distributed.Process.Serializable
192
180
193import Control.Exception (SomeException)
181import Control.Exception (SomeException)
194
182
@@ -237,7 +225,7 @@ withTracer handler proc = do
237 stopTracing tracer previousTracer = do
225 stopTracing tracer previousTracer = do
238 case previousTracer of
226 case previousTracer of
239 Nothing -> return ()
227 Nothing -> return ()
240− Just p -> do
228+ Just _ -> do
241 ref <- monitor tracer
229 ref <- monitor tracer
242 send tracer TraceEvDisable
230 send tracer TraceEvDisable
243 receiveWait [
231 receiveWait [
@@ -260,7 +248,7 @@ traceProxy :: ProcessId -> (TraceEvent -> Process ()) -> Process ()
260traceProxy pid act = do
248traceProxy pid act = do
261 proxy pid $ \(ev :: TraceEvent) ->
249 proxy pid $ \(ev :: TraceEvent) ->
262 case ev of
250 case ev of
263− (TraceEvTakeover p) -> return False
251+ (TraceEvTakeover _) -> return False
264 TraceEvDisable -> die "disabled"
252 TraceEvDisable -> die "disabled"
265 _ -> act ev >> return True
253 _ -> act ev >> return True
266
254
src/Control/Distributed/Process/Internal/Primitives.hs+1−10
@@ -134,17 +134,8 @@ import Control.Distributed.Process.Internal.CQueue
134import Control.Distributed.Process.Serializable (Serializable, fingerprint)
134import Control.Distributed.Process.Serializable (Serializable, fingerprint)
135import Data.Accessor ((^.), (^:), (^=))
135import Data.Accessor ((^.), (^:), (^=))
136import Control.Distributed.Static
136import Control.Distributed.Static
137− ( RemoteTable
138− , registerStatic
139− , Static
137+ ( Static
140− , staticLabel
141− , staticApply
142 , Closure
138 , Closure
143− , closure
144− , closureApplyStatic
145− , closureApply
146− , staticCompose
147− , staticClosure
148 )
139 )
149import Data.Rank1Typeable (Typeable)
140import Data.Rank1Typeable (Typeable)
150import qualified Control.Distributed.Static as Static (unstatic, unclosure)
141import qualified Control.Distributed.Static as Static (unstatic, unclosure)
src/Control/Distributed/Process/Internal/Spawn.hs−6
@@ -8,10 +8,6 @@ module Control.Distributed.Process.Internal.Spawn
8 ) where
8 ) where
9
9
10import Data.Typeable (Typeable)
10import Data.Typeable (Typeable)
11−import Control.Monad.IO.Class (liftIO)
12−import Control.Applicative ((<$>))
13−import Control.Monad.Reader (ask)
14−import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar)
15import Control.Distributed.Static
11import Control.Distributed.Static
16 ( Static
12 ( Static
17 , Closure
13 , Closure
@@ -28,7 +24,6 @@ import Control.Distributed.Process.Internal.Types
28 , DidSpawn(..)
24 , DidSpawn(..)
29 , SendPort(..)
25 , SendPort(..)
30 , ReceivePort(..)
26 , ReceivePort(..)
31− , LocalProcess(processNode)
32 , nullProcessId
27 , nullProcessId
33 )
28 )
34import Control.Distributed.Process.Serializable (Serializable, SerializableDict)
29import Control.Distributed.Process.Serializable (Serializable, SerializableDict)
@@ -58,7 +53,6 @@ import Control.Distributed.Process.Internal.Primitives
58 , unmonitor
53 , unmonitor
59 , spawnAsync
54 , spawnAsync
60 , reconnect
55 , reconnect
61− , newChan
62 )
56 )
63
57
64-- | Spawn a process
58-- | Spawn a process
src/Control/Distributed/Process/Internal/Trace/Primitives.hs+1−27
@@ -28,29 +28,14 @@ module Control.Distributed.Process.Internal.Trace.Primitives
28 ) where
28 ) where
29
29
30import Control.Applicative ((<$>))
30import Control.Applicative ((<$>))
31−import Control.Distributed.Process.Internal.Closure.BuiltIn
32− ( cpEnableTraceRemote
33− )
34import Control.Distributed.Process.Internal.Primitives
31import Control.Distributed.Process.Internal.Primitives
35− ( proxy
36− , finally
37− , die
38− , whereis
32+ ( whereis
39− , send
40 , newChan
33 , newChan
41 , receiveChan
34 , receiveChan
42− , receiveWait
43− , matchIf
44− , finally
45− , try
46− , monitor
47− , getSelfPid
48− , relay
49 )
35 )
50import Control.Distributed.Process.Internal.Trace.Types
36import Control.Distributed.Process.Internal.Trace.Types
51 ( TraceArg(..)
37 ( TraceArg(..)
52 , TraceEvent(..)
38 , TraceEvent(..)
53− , SetTrace(..)
54 , TraceFlags(..)
39 , TraceFlags(..)
55 , TraceOk(..)
40 , TraceOk(..)
56 , TraceSubject(..)
41 , TraceSubject(..)
@@ -69,29 +54,18 @@ import qualified Control.Distributed.Process.Internal.Trace.Types as Tracer
69 , getTraceFlags
54 , getTraceFlags
70 , getCurrentTraceClient
55 , getCurrentTraceClient
71 )
56 )
72−import Control.Distributed.Process.Internal.Spawn
73− ( spawn
74− )
75import Control.Distributed.Process.Internal.Types
57import Control.Distributed.Process.Internal.Types
76 ( Tracer(..)
58 ( Tracer(..)
77 , Process
59 , Process
78 , ProcessId
60 , ProcessId
79 , LocalProcess(..)
61 , LocalProcess(..)
80 , LocalNode(localTracer)
62 , LocalNode(localTracer)
81− , Message
82 , SendPort
63 , SendPort
83− , NodeId
84− , createUnencodedMessage
85 )
64 )
86import Control.Distributed.Process.Serializable
65import Control.Distributed.Process.Serializable
87−import Control.Distributed.Static
88− ( RemoteTable
89− , registerStatic
90− )
91import Control.Monad.IO.Class (liftIO)
66import Control.Monad.IO.Class (liftIO)
92import Control.Monad.Reader (ask)
67import Control.Monad.Reader (ask)
93
68
94−import Data.Rank1Dynamic (toDynamic)
95import qualified Data.Set as Set (fromList)
69import qualified Data.Set as Set (fromList)
96
70
97--------------------------------------------------------------------------------
71--------------------------------------------------------------------------------
src/Control/Distributed/Process/Internal/Trace/Remote.hs+1−19
@@ -6,33 +6,17 @@ module Control.Distributed.Process.Internal.Trace.Remote
6 , remoteTable
6 , remoteTable
7 ) where
7 ) where
8
8
9−import Control.Applicative ((<$>))
10import Control.Distributed.Process.Internal.Closure.BuiltIn
9import Control.Distributed.Process.Internal.Closure.BuiltIn
11 ( cpEnableTraceRemote
10 ( cpEnableTraceRemote
12 )
11 )
13import Control.Distributed.Process.Internal.Primitives
12import Control.Distributed.Process.Internal.Primitives
14− ( proxy
15− , finally
16− , die
17− , whereis
18− , send
19− , newChan
20− , receiveChan
21− , receiveWait
22− , matchIf
23− , finally
24− , try
25− , monitor
26− , getSelfPid
13+ ( getSelfPid
27 , relay
14 , relay
28 , nsendRemote
15 , nsendRemote
29− , say
30 )
16 )
31import Control.Distributed.Process.Internal.Trace.Types
17import Control.Distributed.Process.Internal.Trace.Types
32 ( TraceFlags(..)
18 ( TraceFlags(..)
33 , TraceOk(..)
19 , TraceOk(..)
34− , TraceSubject(..)
35− , defaultTraceFlags
36 )
20 )
37import Control.Distributed.Process.Internal.Trace.Primitives
21import Control.Distributed.Process.Internal.Trace.Primitives
38 ( withRegisteredTracer
22 ( withRegisteredTracer
@@ -47,13 +31,11 @@ import Control.Distributed.Process.Internal.Types
47 , SendPort
31 , SendPort
48 , NodeId
32 , NodeId
49 )
33 )
50−import Control.Distributed.Process.Serializable
51import Control.Distributed.Static
34import Control.Distributed.Static
52 ( RemoteTable
35 ( RemoteTable
53 , registerStatic
36 , registerStatic
54 )
37 )
55import Data.Rank1Dynamic (toDynamic)
38import Data.Rank1Dynamic (toDynamic)
56−import qualified Data.Set as Set (fromList)
57
39
58-- | Remote Table.
40-- | Remote Table.
59remoteTable :: RemoteTable -> RemoteTable
41remoteTable :: RemoteTable -> RemoteTable
src/Control/Distributed/Process/Internal/Trace/Tracer.hs+1−10
@@ -27,14 +27,9 @@ import Control.Distributed.Process.Internal.Primitives
27 , sendChan
27 , sendChan
28 , match
28 , match
29 , matchAny
29 , matchAny
30− , matchAnyIf
31 , matchIf
30 , matchIf
32 , handleMessage
31 , handleMessage
33 , matchUnknown
32 , matchUnknown
34− , whereis
35− , getSelfPid
36− , register
37− , say, unwrapMessage
38 )
33 )
39import Control.Distributed.Process.Internal.Trace.Types
34import Control.Distributed.Process.Internal.Trace.Types
40 ( TraceEvent(..)
35 ( TraceEvent(..)
@@ -61,9 +56,6 @@ import Control.Distributed.Process.Internal.Types
61 , nullProcessId
56 , nullProcessId
62 , createUnencodedMessage
57 , createUnencodedMessage
63 )
58 )
64−import Control.Exception
65− ( SomeException
66− )
67
59
68import Control.Monad.IO.Class (liftIO)
60import Control.Monad.IO.Class (liftIO)
69import Control.Monad.Reader (ask)
61import Control.Monad.Reader (ask)
@@ -249,7 +241,7 @@ traceController mv = do
249
241
250 -- quick and dirty fold-while
242 -- quick and dirty fold-while
251 parseFlags :: String -> TraceFlags
243 parseFlags :: String -> TraceFlags
252− parseFlags flags = parseFlags' flags defaultTraceFlags
244+ parseFlags s = parseFlags' s defaultTraceFlags
253 where parseFlags' :: String -> TraceFlags -> TraceFlags
245 where parseFlags' :: String -> TraceFlags -> TraceFlags
254 parseFlags' [] parsedFlags = parsedFlags
246 parseFlags' [] parsedFlags = parsedFlags
255 parseFlags' (x:xs) parsedFlags
247 parseFlags' (x:xs) parsedFlags
@@ -351,7 +343,6 @@ traceEv ev msg (Just (TraceNames names)) st = do
351sendTrace :: TracerState -> Message -> Process ()
343sendTrace :: TracerState -> Message -> Process ()
352sendTrace st msg =
344sendTrace st msg =
353 let pid = (client st) in do
345 let pid = (client st) in do
354− (Just ev) <- unwrapMessage msg :: Process (Maybe TraceEvent)
355 case pid of
346 case pid of
356 Just p -> (flip forward) p msg
347 Just p -> (flip forward) p msg
357 Nothing -> return ()
348 Nothing -> return ()
src/Control/Distributed/Process/Internal/Trace/Types.hs−10
@@ -6,7 +6,6 @@ module Control.Distributed.Process.Internal.Trace.Types
6 , Addressable(..)
6 , Addressable(..)
7 , TraceSubject(..)
7 , TraceSubject(..)
8 , TraceFlags(..)
8 , TraceFlags(..)
9− , defaultTraceFlags
10 , TraceArg(..)
9 , TraceArg(..)
11 , TraceOk(..)
10 , TraceOk(..)
12 , traceLog
11 , traceLog
@@ -206,15 +205,6 @@ instance Traceable ProcessId where
206instance Traceable String where
205instance Traceable String where
207 uod = TraceNames . Set.fromList
206 uod = TraceNames . Set.fromList
208
207
209−traceOnly :: Traceable a => [a] -> Maybe TraceSubject
210−traceOnly = Just . uod
211−
212−traceOn :: Maybe TraceSubject
213−traceOn = Just TraceAll
214−
215−traceOff :: Maybe TraceSubject
216−traceOff = Nothing
217−
218traceIt :: Tracer -> Message -> IO ()
208traceIt :: Tracer -> Message -> IO ()
219traceIt InactiveTracer _ = return ()
209traceIt InactiveTracer _ = return ()
220traceIt (ActiveTracer _ wqRef) msg = do
210traceIt (ActiveTracer _ wqRef) msg = do