baf2e20 · distributed-process

distributed-process.cabal+17−18

compare with master

unifiedsplit

@@ -57,30 +57,29 @@ Library

57 Exposed-modules: Control.Distributed.Process,

58 Control.Distributed.Process.Closure,

59 Control.Distributed.Process.Debug,

60− Control.Distributed.Process.Internal.Types,

61− Control.Distributed.Process.Management,

62− Control.Distributed.Process.Node,

63− Control.Distributed.Process.Serializable,

64− Control.Distributed.Process.UnsafePrimitives

65− Other-modules: Control.Distributed.Process.Internal.Primitives,

66− Control.Distributed.Process.Internal.Spawn,

67− Control.Distributed.Process.Internal.Primitives,

68− Control.Distributed.Process.Internal.CQueue,

69 Control.Distributed.Process.Internal.Closure.BuiltIn,

60 Control.Distributed.Process.Internal.Closure.BuiltIn,

70 Control.Distributed.Process.Internal.Closure.Explicit,

61 Control.Distributed.Process.Internal.Closure.Explicit,

62+ Control.Distributed.Process.Internal.CQueue,

71 Control.Distributed.Process.Internal.Messaging,

63 Control.Distributed.Process.Internal.Messaging,

64+ Control.Distributed.Process.Internal.Primitives,

65+ Control.Distributed.Process.Internal.Spawn,

66+ Control.Distributed.Process.Internal.StrictContainerAccessors,

72 Control.Distributed.Process.Internal.StrictList,

67 Control.Distributed.Process.Internal.StrictList,

73 Control.Distributed.Process.Internal.StrictMVar,

68 Control.Distributed.Process.Internal.StrictMVar,

69+ Control.Distributed.Process.Internal.Types,

74 Control.Distributed.Process.Internal.WeakTQueue,

70 Control.Distributed.Process.Internal.WeakTQueue,

75− Control.Distributed.Process.Internal.StrictContainerAccessors,

71+ Control.Distributed.Process.Management,

72+ Control.Distributed.Process.Node,

76− Control.Distributed.Process.Management.Agent,

73+ Control.Distributed.Process.Serializable,

74+ Control.Distributed.Process.UnsafePrimitives

75+ Control.Distributed.Process.Management.Internal.Agent,

77− Control.Distributed.Process.Management.Bus,

76+ Control.Distributed.Process.Management.Internal.Bus,

78− Control.Distributed.Process.Management.Table,

77+ Control.Distributed.Process.Management.Internal.Table,

79− Control.Distributed.Process.Management.Types,

78+ Control.Distributed.Process.Management.Internal.Types,

80− Control.Distributed.Process.Management.Trace.Primitives,

79+ Control.Distributed.Process.Management.Internal.Trace.Primitives,

81− Control.Distributed.Process.Management.Trace.Remote,

80+ Control.Distributed.Process.Management.Internal.Trace.Remote,

82− Control.Distributed.Process.Management.Trace.Types,

81+ Control.Distributed.Process.Management.Internal.Trace.Types,

83− Control.Distributed.Process.Management.Trace.Tracer

82+ Control.Distributed.Process.Management.Internal.Trace.Tracer

84 -- Extensions: -- we use explicit per-file LANGUAGE pragmas

83 -- Extensions: -- we use explicit per-file LANGUAGE pragmas

85 ghc-options: -Wall

84 ghc-options: -Wall

86 HS-Source-Dirs: src

85 HS-Source-Dirs: src

src/Control/Distributed/Process/Debug.hs+5−5

@@ -147,21 +147,21 @@ import Control.Distributed.Process.Internal.Types

147 , LocalProcess(..)

148 , ProcessMonitorNotification(..)

149 )

150−import Control.Distributed.Process.Management.Types

150+import Control.Distributed.Process.Management.Internal.Types

151 ( MxEvent(..)

152 )

153−import Control.Distributed.Process.Management.Trace.Types

153+import Control.Distributed.Process.Management.Internal.Trace.Types

154 ( TraceArg(..)

155 , TraceFlags(..)

156 , TraceSubject(..)

157 , defaultTraceFlags

158 )

159−import Control.Distributed.Process.Management.Trace.Tracer

159+import Control.Distributed.Process.Management.Internal.Trace.Tracer

160 ( systemLoggerTracer

161 , logfileTracer

162 , eventLogTracer

163 )

164−import Control.Distributed.Process.Management.Trace.Primitives

164+import Control.Distributed.Process.Management.Internal.Trace.Primitives

165 ( withRegisteredTracer

166 , enableTrace

167 , enableTraceAsync

@@ -176,7 +176,7 @@ import Control.Distributed.Process.Management.Trace.Primitives

176 , traceLogFmt

177 , traceMessage

178 )

179−import qualified Control.Distributed.Process.Management.Trace.Remote as Remote

179+import qualified Control.Distributed.Process.Management.Internal.Trace.Remote as Remote

180import Control.Distributed.Process.Node

181

182import Control.Exception (SomeException)

src/Control/Distributed/Process/Internal/Primitives.hs+2−2

@@ -206,10 +206,10 @@ import Control.Distributed.Process.Internal.Messaging

206 , disconnect

207 , sendCtrlMsg

208 )

209−import Control.Distributed.Process.Management.Types

209+import Control.Distributed.Process.Management.Internal.Types

210 ( MxEvent(..)

211 )

212−import Control.Distributed.Process.Management.Trace.Types

212+import Control.Distributed.Process.Management.Internal.Trace.Types

213 ( traceEvent

214 )

215import Control.Distributed.Process.Internal.WeakTQueue

src/Control/Distributed/Process/Management.hs+3−3

@@ -304,9 +304,9 @@ import Control.Distributed.Process.Internal.Types

304 , MxEventBus(..)

305 , unsafeCreateUnencodedMessage

306 )

307−import Control.Distributed.Process.Management.Bus (publishEvent)

307+import Control.Distributed.Process.Management.Internal.Bus (publishEvent)

308−import qualified Control.Distributed.Process.Management.Table as Table

308+import qualified Control.Distributed.Process.Management.Internal.Table as Table

309−import Control.Distributed.Process.Management.Types

309+import Control.Distributed.Process.Management.Internal.Types

310 ( MxAgentId(..)

311 , MxAgent(..)

312 , MxAction(..)

src/Control/Distributed/Process/Management/Agent.hs → src/Control/Distributed/Process/Management/Internal/Agent.hsrenamed+3−3

@@ -1,7 +1,7 @@

1{-# LANGUAGE ScopedTypeVariables #-}

2{-# LANGUAGE RecordWildCards #-}

3

4−module Control.Distributed.Process.Management.Agent where

4+module Control.Distributed.Process.Management.Internal.Agent where

5

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

7import Control.Concurrent (forkIO)

@@ -25,10 +25,10 @@ import Control.Distributed.Process.Internal.CQueue

25 ( enqueueSTM

26 , CQueue

27 )

28−import Control.Distributed.Process.Management.Types

28+import Control.Distributed.Process.Management.Internal.Types

29 ( Fork

30 )

31−import Control.Distributed.Process.Management.Trace.Tracer

31+import Control.Distributed.Process.Management.Internal.Trace.Tracer

32 ( traceController

33 )

34import Control.Distributed.Process.Internal.Types

src/Control/Distributed/Process/Management/Bus.hs → src/Control/Distributed/Process/Management/Internal/Bus.hsrenamed+1−1

@@ -1,5 +1,5 @@

1-- | Interface to the management event bus.

2−module Control.Distributed.Process.Management.Bus

2+module Control.Distributed.Process.Management.Internal.Bus

3 ( publishEvent

4 ) where

5

src/Control/Distributed/Process/Management/Table.hs → src/Control/Distributed/Process/Management/Internal/Table.hsrenamed+2−2

@@ -4,7 +4,7 @@

4{-# LANGUAGE DeriveGeneric #-}

5{-# LANGUAGE RecordWildCards #-}

6

7−module Control.Distributed.Process.Management.Table

7+module Control.Distributed.Process.Management.Internal.Table

8 ( MxTableRequest(..)

9 , MxTableId(..)

10 , mxTableCoordinator

@@ -43,7 +43,7 @@ import Control.Distributed.Process.Internal.Types

43 , Message

44 , unsafeCreateUnencodedMessage

45 )

46−import Control.Distributed.Process.Management.Types

46+import Control.Distributed.Process.Management.Internal.Types

47 ( MxTableId(..)

48 , MxAgentId(..)

49 , MxAgentStart(..)

src/Control/Distributed/Process/Management/Trace/Primitives.hs → src/Control/Distributed/Process/Management/Internal/Trace/Primitives.hsrenamed+3−3

@@ -7,7 +7,7 @@

7-- our RemoteTable) and the Debug module, which requires @forkProcess@.

8-- This module is also used by the management agent, which relies on the

9-- tracing infrastructure's messaging fabric.

10−module Control.Distributed.Process.Management.Trace.Primitives

10+module Control.Distributed.Process.Management.Internal.Trace.Primitives

11 ( -- * Sending Trace Data

12 traceLog

13 , traceLogFmt

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

34 , newChan

35 , receiveChan

36 )

37−import Control.Distributed.Process.Management.Trace.Types

37+import Control.Distributed.Process.Management.Internal.Trace.Types

38 ( TraceArg(..)

39 , TraceFlags(..)

40 , TraceOk(..)

41 , TraceSubject(..)

42 , defaultTraceFlags

43 )

44−import qualified Control.Distributed.Process.Management.Trace.Types as Tracer

44+import qualified Control.Distributed.Process.Management.Internal.Trace.Types as Tracer

45 ( traceLog

46 , traceLogFmt

47 , traceMessage

src/Control/Distributed/Process/Management/Trace/Remote.hs → src/Control/Distributed/Process/Management/Internal/Trace/Remote.hsrenamed+3−3

@@ -1,4 +1,4 @@

1−module Control.Distributed.Process.Management.Trace.Remote

1+module Control.Distributed.Process.Management.Internal.Trace.Remote

2 ( -- * Configuring A Remote Tracer

3 setTraceFlagsRemote

4 , startTraceRelay

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

14 , relay

15 , nsendRemote

16 )

17−import Control.Distributed.Process.Management.Trace.Types

17+import Control.Distributed.Process.Management.Internal.Trace.Types

18 ( TraceFlags(..)

19 , TraceOk(..)

20 )

21−import Control.Distributed.Process.Management.Trace.Primitives

21+import Control.Distributed.Process.Management.Internal.Trace.Primitives

22 ( withRegisteredTracer

23 , enableTrace

24 )

src/Control/Distributed/Process/Management/Trace/Tracer.hs → src/Control/Distributed/Process/Management/Internal/Trace/Tracer.hsrenamed+4−4

@@ -1,7 +1,7 @@

1{-# LANGUAGE CPP #-}

2{-# LANGUAGE ScopedTypeVariables #-}

3-- | Tracing/Debugging support - Trace Implementation

4−module Control.Distributed.Process.Management.Trace.Tracer

4+module Control.Distributed.Process.Management.Internal.Trace.Tracer

5 ( -- * API for the Management Agent

6 traceController

7 -- * Built in tracers

@@ -33,18 +33,18 @@ import Control.Distributed.Process.Internal.Primitives

33 , handleMessage

34 , matchUnknown

35 )

36−import Control.Distributed.Process.Management.Types

36+import Control.Distributed.Process.Management.Internal.Types

37 ( MxEvent(..)

38 , Addressable(..)

39 )

40−import Control.Distributed.Process.Management.Trace.Types

40+import Control.Distributed.Process.Management.Internal.Trace.Types

41 ( SetTrace(..)

42 , TraceSubject(..)

43 , TraceFlags(..)

44 , TraceOk(..)

45 , defaultTraceFlags

46 )

47−import Control.Distributed.Process.Management.Trace.Primitives

47+import Control.Distributed.Process.Management.Internal.Trace.Primitives

48 ( traceOn )

49import Control.Distributed.Process.Internal.Types

50 ( LocalNode(..)

src/Control/Distributed/Process/Management/Trace/Types.hs → src/Control/Distributed/Process/Management/Internal/Trace/Types.hsrenamed+3−3

@@ -6,7 +6,7 @@

6{-# LANGUAGE DeriveGeneric #-}

7

8-- | Tracing/Debugging support - Types

9−module Control.Distributed.Process.Management.Trace.Types

9+module Control.Distributed.Process.Management.Internal.Trace.Types

10 ( SetTrace(..)

11 , TraceSubject(..)

12 , TraceFlags(..)

@@ -33,10 +33,10 @@ import Control.Distributed.Process.Internal.Types

33 , SendPort

34 , unsafeCreateUnencodedMessage

35 )

36−import Control.Distributed.Process.Management.Bus

36+import Control.Distributed.Process.Management.Internal.Bus

37 ( publishEvent

38 )

39−import Control.Distributed.Process.Management.Types

39+import Control.Distributed.Process.Management.Internal.Types

40 ( MxEvent(..)

41 )

42import Control.Distributed.Process.Serializable

src/Control/Distributed/Process/Management/Types.hs → src/Control/Distributed/Process/Management/Internal/Types.hsrenamed+1−1

@@ -3,7 +3,7 @@

3{-# LANGUAGE ExistentialQuantification #-}

4{-# LANGUAGE GeneralizedNewtypeDeriving #-}

5{-# LANGUAGE DeriveGeneric #-}

6−module Control.Distributed.Process.Management.Types

6+module Control.Distributed.Process.Management.Internal.Types

7 ( MxAgentId(..)

8 , MxTableId(..)

9 , MxAgentState(..)

src/Control/Distributed/Process/Node.hs+6−6

@@ -161,26 +161,26 @@ import Control.Distributed.Process.Internal.Types

161 , firstNonReservedProcessId

162 , ImplicitReconnect(WithImplicitReconnect)

163 )

164−import Control.Distributed.Process.Management.Agent

164+import Control.Distributed.Process.Management.Internal.Agent

165 ( mxAgentController

166 )

167−import qualified Control.Distributed.Process.Management.Table as Table

167+import qualified Control.Distributed.Process.Management.Internal.Table as Table

168 ( mxTableCoordinator

169 , startTableCoordinator

170 )

171−import qualified Control.Distributed.Process.Management.Trace.Remote as Trace

171+import qualified Control.Distributed.Process.Management.Internal.Trace.Remote as Trace

172 ( remoteTable

173 )

174−import Control.Distributed.Process.Management.Trace.Tracer

174+import Control.Distributed.Process.Management.Internal.Trace.Tracer

175 ( defaultTracer

176 )

177−import Control.Distributed.Process.Management.Trace.Types

177+import Control.Distributed.Process.Management.Internal.Trace.Types

178 ( TraceArg(..)

179 , traceEvent

180 , traceLogFmt

181 , enableTrace

182 )

183−import Control.Distributed.Process.Management.Types

183+import Control.Distributed.Process.Management.Internal.Types

184 ( MxEvent(..)

185 )

186import Control.Distributed.Process.Serializable (Serializable)