6f57fc1 · distributed-process

git.iko.soy/distributed-process

Get rid of various compiler warnings

commit6f57fc1c68de85f65ef3433bf1a7fe6eae551bf3 authorTim Watson <tim@rabbitmq.com> dateWed 24 Apr 2013, 13:36 (13 years ago) parent1c2bc74

8 files changed+8−114

compare with master

unifiedsplit

src/Control/Distributed/Process.hs+1−17 src/Control/Distributed/Process/Debug.hs+3−15 src/Control/Distributed/Process/Internal/Primitives.hs+1−10 src/Control/Distributed/Process/Internal/Spawn.hs−6 src/Control/Distributed/Process/Internal/Trace/Primitives.hs+1−27 src/Control/Distributed/Process/Internal/Trace/Remote.hs+1−19 src/Control/Distributed/Process/Internal/Trace/Tracer.hs+1−10 src/Control/Distributed/Process/Internal/Trace/Types.hs−10

src/Control/Distributed/Process.hs+1−17

@@ -142,7 +142,6 @@ module Control.Distributed.Process

142142import Prelude hiding (catch)

143143#endif

144144

145−import Data.Typeable (Typeable)

146145import Control.Monad.IO.Class (liftIO)

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

148147import Control.Monad.Reader (ask)

@@ -152,8 +151,6 @@ import Control.Distributed.Static

152151 , closure

153152 , Static

154153 , RemoteTable

155− , closureCompose

156− , staticClosure

157154 )

158155import Control.Distributed.Process.Internal.Types

159156 ( NodeId(..)

@@ -177,21 +174,8 @@ import Control.Distributed.Process.Internal.Types

177174 , RegisterReply(..)

178175 , LocalProcess(processNode)

179176 , 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

194177 )

178+import Control.Distributed.Process.Serializable (Serializable)

195179import Control.Distributed.Process.Internal.Primitives

196180 ( -- Basic messaging

197181 send

src/Control/Distributed/Process/Debug.hs+3−15

@@ -135,34 +135,23 @@ import Control.Distributed.Process.Internal.Primitives

135135 , die

136136 , whereis

137137 , send

138− , newChan

139− , receiveChan

140138 , receiveWait

141139 , matchIf

142140 , finally

143141 , try

144142 , monitor

145− , say

146− )

147−import Control.Distributed.Process.Internal.Spawn

148− ( spawn

149143 )

150144import Control.Distributed.Process.Internal.Types

151− ( Tracer(..)

152− , LocalNode(..)

153− , ProcessId

145+ ( ProcessId

154146 , Process

155147 , LocalProcess(..)

156− , SendPort(..)

157148 , ProcessMonitorNotification(..)

158− , NodeId(..)

159149 )

160150import Control.Distributed.Process.Internal.Trace.Types

161151 ( TraceArg(..)

162152 , TraceEvent(..)

163153 , TraceFlags(..)

164154 , TraceSubject(..)

165− , TraceOk(..)

166155 , defaultTraceFlags

167156 )

168157import Control.Distributed.Process.Internal.Trace.Tracer

@@ -188,7 +177,6 @@ import Control.Distributed.Process.Internal.Trace.Primitives

188177 )

189178import qualified Control.Distributed.Process.Internal.Trace.Remote as Remote

190179import Control.Distributed.Process.Node

191−import Control.Distributed.Process.Serializable

192180

193181import Control.Exception (SomeException)

194182

@@ -237,7 +225,7 @@ withTracer handler proc = do

237225 stopTracing tracer previousTracer = do

238226 case previousTracer of

239227 Nothing -> return ()

240− Just p -> do

228+ Just _ -> do

241229 ref <- monitor tracer

242230 send tracer TraceEvDisable

243231 receiveWait [

@@ -260,7 +248,7 @@ traceProxy :: ProcessId -> (TraceEvent -> Process ()) -> Process ()

260248traceProxy pid act = do

261249 proxy pid $ \(ev :: TraceEvent) ->

262250 case ev of

263− (TraceEvTakeover p) -> return False

251+ (TraceEvTakeover _) -> return False

264252 TraceEvDisable -> die "disabled"

265253 _ -> act ev >> return True

266254

src/Control/Distributed/Process/Internal/Primitives.hs+1−10

@@ -134,17 +134,8 @@ import Control.Distributed.Process.Internal.CQueue

134134import Control.Distributed.Process.Serializable (Serializable, fingerprint)

135135import Data.Accessor ((^.), (^:), (^=))

136136import Control.Distributed.Static

137− ( RemoteTable

138− , registerStatic

139− , Static

140− , staticLabel

141− , staticApply

137+ ( Static

142138 , Closure

143− , closure

144− , closureApplyStatic

145− , closureApply

146− , staticCompose

147− , staticClosure

148139 )

149140import Data.Rank1Typeable (Typeable)

150141import 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

88 ) where

1010import 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)

1511import Control.Distributed.Static

1612 ( Static

1713 , Closure

@@ -28,7 +24,6 @@ import Control.Distributed.Process.Internal.Types

2824 , DidSpawn(..)

2925 , SendPort(..)

3026 , ReceivePort(..)

31− , LocalProcess(processNode)

3227 , nullProcessId

3328 )

3429import Control.Distributed.Process.Serializable (Serializable, SerializableDict)

@@ -58,7 +53,6 @@ import Control.Distributed.Process.Internal.Primitives

5853 , unmonitor

5954 , spawnAsync

6055 , reconnect

61− , newChan

6256 )

6357

6458-- | Spawn a process

src/Control/Distributed/Process/Internal/Trace/Primitives.hs+1−27

@@ -28,29 +28,14 @@ module Control.Distributed.Process.Internal.Trace.Primitives

2828 ) where

2929

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

31−import Control.Distributed.Process.Internal.Closure.BuiltIn

32− ( cpEnableTraceRemote

33− )

3431import Control.Distributed.Process.Internal.Primitives

35− ( proxy

36− , finally

37− , die

38− , whereis

39− , send

32+ ( whereis

4033 , newChan

4134 , receiveChan

42− , receiveWait

43− , matchIf

44− , finally

45− , try

46− , monitor

47− , getSelfPid

48− , relay

4935 )

5036import Control.Distributed.Process.Internal.Trace.Types

5137 ( TraceArg(..)

5238 , TraceEvent(..)

53− , SetTrace(..)

5439 , TraceFlags(..)

5540 , TraceOk(..)

5641 , TraceSubject(..)

@@ -69,29 +54,18 @@ import qualified Control.Distributed.Process.Internal.Trace.Types as Tracer

6954 , getTraceFlags

7055 , getCurrentTraceClient

7156 )

72−import Control.Distributed.Process.Internal.Spawn

73− ( spawn

74− )

7557import Control.Distributed.Process.Internal.Types

7658 ( Tracer(..)

7759 , Process

7860 , ProcessId

7961 , LocalProcess(..)

8062 , LocalNode(localTracer)

81− , Message

8263 , SendPort

83− , NodeId

84− , createUnencodedMessage

8564 )

8665import Control.Distributed.Process.Serializable

87−import Control.Distributed.Static

88− ( RemoteTable

89− , registerStatic

90− )

9166import Control.Monad.IO.Class (liftIO)

9267import Control.Monad.Reader (ask)

9368

94−import Data.Rank1Dynamic (toDynamic)

9569import qualified Data.Set as Set (fromList)

9670

9771--------------------------------------------------------------------------------

src/Control/Distributed/Process/Internal/Trace/Remote.hs+1−19

@@ -6,33 +6,17 @@ module Control.Distributed.Process.Internal.Trace.Remote

66 , remoteTable

77 ) where

9−import Control.Applicative ((<$>))

109import Control.Distributed.Process.Internal.Closure.BuiltIn

1110 ( cpEnableTraceRemote

1211 )

1312import 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

2714 , relay

2815 , nsendRemote

29− , say

3016 )

3117import Control.Distributed.Process.Internal.Trace.Types

3218 ( TraceFlags(..)

3319 , TraceOk(..)

34− , TraceSubject(..)

35− , defaultTraceFlags

3620 )

3721import Control.Distributed.Process.Internal.Trace.Primitives

3822 ( withRegisteredTracer

@@ -47,13 +31,11 @@ import Control.Distributed.Process.Internal.Types

4731 , SendPort

4832 , NodeId

4933 )

50−import Control.Distributed.Process.Serializable

5134import Control.Distributed.Static

5235 ( RemoteTable

5336 , registerStatic

5437 )

5538import Data.Rank1Dynamic (toDynamic)

56−import qualified Data.Set as Set (fromList)

5739

5840-- | Remote Table.

5941remoteTable :: RemoteTable -> RemoteTable

src/Control/Distributed/Process/Internal/Trace/Tracer.hs+1−10

@@ -27,14 +27,9 @@ import Control.Distributed.Process.Internal.Primitives

2727 , sendChan

2828 , match

2929 , matchAny

30− , matchAnyIf

3130 , matchIf

3231 , handleMessage

3332 , matchUnknown

34− , whereis

35− , getSelfPid

36− , register

37− , say, unwrapMessage

3833 )

3934import Control.Distributed.Process.Internal.Trace.Types

4035 ( TraceEvent(..)

@@ -61,9 +56,6 @@ import Control.Distributed.Process.Internal.Types

6156 , nullProcessId

6257 , createUnencodedMessage

6358 )

64−import Control.Exception

65− ( SomeException

66− )

6759

6860import Control.Monad.IO.Class (liftIO)

6961import Control.Monad.Reader (ask)

@@ -249,7 +241,7 @@ traceController mv = do

249241

250242 -- quick and dirty fold-while

251243 parseFlags :: String -> TraceFlags

252− parseFlags flags = parseFlags' flags defaultTraceFlags

244+ parseFlags s = parseFlags' s defaultTraceFlags

253245 where parseFlags' :: String -> TraceFlags -> TraceFlags

254246 parseFlags' [] parsedFlags = parsedFlags

255247 parseFlags' (x:xs) parsedFlags

@@ -351,7 +343,6 @@ traceEv ev msg (Just (TraceNames names)) st = do

351343sendTrace :: TracerState -> Message -> Process ()

352344sendTrace st msg =

353345 let pid = (client st) in do

354− (Just ev) <- unwrapMessage msg :: Process (Maybe TraceEvent)

355346 case pid of

356347 Just p -> (flip forward) p msg

357348 Nothing -> return ()

src/Control/Distributed/Process/Internal/Trace/Types.hs−10

@@ -6,7 +6,6 @@ module Control.Distributed.Process.Internal.Trace.Types

66 , Addressable(..)

77 , TraceSubject(..)

88 , TraceFlags(..)

9− , defaultTraceFlags

109 , TraceArg(..)

1110 , TraceOk(..)

1211 , traceLog

@@ -206,15 +205,6 @@ instance Traceable ProcessId where

206205instance Traceable String where

207206 uod = TraceNames . Set.fromList

208207

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−

218208traceIt :: Tracer -> Message -> IO ()

219209traceIt InactiveTracer _ = return ()

220210traceIt (ActiveTracer _ wqRef) msg = do