baf2e20 · distributed-process

git.iko.soy/distributed-process

Keep "Internal" namespaces visible for now to help contributors

commitbaf2e20507f30bd0c4308298fa5e0517b605158f authorTim Watson <watson.timothy@gmail.com> dateWed 28 May 2014, 10:40 (12 years ago) parent380e9a8

13 files changed+53−54

compare with master

unifiedsplit

distributed-process.cabal+17−18

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

5757 Exposed-modules: Control.Distributed.Process,

5858 Control.Distributed.Process.Closure,

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

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

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

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

7163 Control.Distributed.Process.Internal.Messaging,

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

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

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

7267 Control.Distributed.Process.Internal.StrictList,

7368 Control.Distributed.Process.Internal.StrictMVar,

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

7470 Control.Distributed.Process.Internal.WeakTQueue,

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

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

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

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

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

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

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

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

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

71+ Control.Distributed.Process.Management,

72+ Control.Distributed.Process.Node,

73+ Control.Distributed.Process.Serializable,

74+ Control.Distributed.Process.UnsafePrimitives

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

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

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

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

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

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

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

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

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

8584 ghc-options: -Wall

8685 HS-Source-Dirs: src

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

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

147147 , LocalProcess(..)

148148 , ProcessMonitorNotification(..)

149149 )

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

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

151151 ( MxEvent(..)

152152 )

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

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

154154 ( TraceArg(..)

155155 , TraceFlags(..)

156156 , TraceSubject(..)

157157 , defaultTraceFlags

158158 )

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

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

160160 ( systemLoggerTracer

161161 , logfileTracer

162162 , eventLogTracer

163163 )

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

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

165165 ( withRegisteredTracer

166166 , enableTrace

167167 , enableTraceAsync

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

176176 , traceLogFmt

177177 , traceMessage

178178 )

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

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

180180import Control.Distributed.Process.Node

181181

182182import Control.Exception (SomeException)

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

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

206206 , disconnect

207207 , sendCtrlMsg

208208 )

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

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

210210 ( MxEvent(..)

211211 )

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

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

213213 ( traceEvent

214214 )

215215import Control.Distributed.Process.Internal.WeakTQueue

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

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

304304 , MxEventBus(..)

305305 , unsafeCreateUnencodedMessage

306306 )

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

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

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

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

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

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

310310 ( MxAgentId(..)

311311 , MxAgent(..)

312312 , MxAction(..)

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

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

11{-# LANGUAGE ScopedTypeVariables #-}

22{-# LANGUAGE RecordWildCards #-}

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

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

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

77import Control.Concurrent (forkIO)

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

2525 ( enqueueSTM

2626 , CQueue

2727 )

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

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

2929 ( Fork

3030 )

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

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

3232 ( traceController

3333 )

3434import 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 @@

11-- | Interface to the management event bus.

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

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

33 ( publishEvent

44 ) where

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

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

44{-# LANGUAGE DeriveGeneric #-}

55{-# LANGUAGE RecordWildCards #-}

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

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

88 ( MxTableRequest(..)

99 , MxTableId(..)

1010 , mxTableCoordinator

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

4343 , Message

4444 , unsafeCreateUnencodedMessage

4545 )

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

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

4747 ( MxTableId(..)

4848 , MxAgentId(..)

4949 , MxAgentStart(..)

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

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

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

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

99-- tracing infrastructure's messaging fabric.

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

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

1111 ( -- * Sending Trace Data

1212 traceLog

1313 , traceLogFmt

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

3434 , newChan

3535 , receiveChan

3636 )

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

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

3838 ( TraceArg(..)

3939 , TraceFlags(..)

4040 , TraceOk(..)

4141 , TraceSubject(..)

4242 , defaultTraceFlags

4343 )

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

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

4545 ( traceLog

4646 , traceLogFmt

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

22 ( -- * Configuring A Remote Tracer

33 setTraceFlagsRemote

44 , startTraceRelay

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

1414 , relay

1515 , nsendRemote

1616 )

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

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

1818 ( TraceFlags(..)

1919 , TraceOk(..)

2020 )

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

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

2222 ( withRegisteredTracer

2323 , enableTrace

2424 )

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

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

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE ScopedTypeVariables #-}

33-- | Tracing/Debugging support - Trace Implementation

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

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

55 ( -- * API for the Management Agent

66 traceController

77 -- * Built in tracers

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

3333 , handleMessage

3434 , matchUnknown

3535 )

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

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

3737 ( MxEvent(..)

3838 , Addressable(..)

3939 )

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

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

4141 ( SetTrace(..)

4242 , TraceSubject(..)

4343 , TraceFlags(..)

4444 , TraceOk(..)

4545 , defaultTraceFlags

4646 )

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

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

4848 ( traceOn )

4949import Control.Distributed.Process.Internal.Types

5050 ( LocalNode(..)

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

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

66{-# LANGUAGE DeriveGeneric #-}

88-- | Tracing/Debugging support - Types

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

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

1010 ( SetTrace(..)

1111 , TraceSubject(..)

1212 , TraceFlags(..)

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

3333 , SendPort

3434 , unsafeCreateUnencodedMessage

3535 )

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

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

3737 ( publishEvent

3838 )

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

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

4040 ( MxEvent(..)

4141 )

4242import 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 @@

33{-# LANGUAGE ExistentialQuantification #-}

44{-# LANGUAGE GeneralizedNewtypeDeriving #-}

55{-# LANGUAGE DeriveGeneric #-}

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

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

77 ( MxAgentId(..)

88 , MxTableId(..)

99 , MxAgentState(..)

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

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

161161 , firstNonReservedProcessId

162162 , ImplicitReconnect(WithImplicitReconnect)

163163 )

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

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

165165 ( mxAgentController

166166 )

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

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

168168 ( mxTableCoordinator

169169 , startTableCoordinator

170170 )

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

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

172172 ( remoteTable

173173 )

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

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

175175 ( defaultTracer

176176 )

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

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

178178 ( TraceArg(..)

179179 , traceEvent

180180 , traceLogFmt

181181 , enableTrace

182182 )

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

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

184184 ( MxEvent(..)

185185 )

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