git.iko.soy/distributed-process
on master help sign in
Merge pull request #316 from haskell-distributed/gh-315
d91a88fFacundo Domínguez
ChangeLog+5
compare with master
unifiedsplit
@@ -1,3 +1,8 @@
1+[Unreliazed]
2+
3+# Added
4+* Added support for exceptions >= 0.10
5+
12017-08-31 Facundo Domínguez <facundo.dominguez@tweag.io> 0.7.3
62017-08-31 Facundo Domínguez <facundo.dominguez@tweag.io> 0.7.3
2
7
3* Drop support for ghc-7.8.* and earlier.
8* Drop support for ghc-7.8.* and earlier.
src/Control/Distributed/Process/Internal/Types.hs+8
@@ -366,6 +366,14 @@ instance MonadCatch Process where
366 lproc <- ask
366 lproc <- ask
367 liftIO $ catch (runLocalProcess lproc p) (runLocalProcess lproc . h)
367 liftIO $ catch (runLocalProcess lproc p) (runLocalProcess lproc . h)
368instance MonadMask Process where
368instance MonadMask Process where
369+#if MIN_VERSION_exceptions(0,10,0)
370+ generalBracket acquire release inner = do
371+ lproc <- ask
372+ liftIO $
373+ generalBracket (runLocalProcess lproc acquire)
374+ (\a e -> runLocalProcess lproc $ release a e)
375+ (runLocalProcess lproc . inner)
376+#endif
369 mask p = do
377 mask p = do
370 lproc <- ask
378 lproc <- ask
371 liftIO $ mask $ \restore ->
379 liftIO $ mask $ \restore ->
src/Control/Distributed/Process/Management/Internal/Trace/Types.hs−10
@@ -43,7 +43,6 @@ import Control.Distributed.Process.Serializable
43import Data.Binary
43import Data.Binary
44import Data.List (intersperse)
44import Data.List (intersperse)
45import Data.Set (Set)
45import Data.Set (Set)
46−import qualified Data.Set as Set (fromList)
47import Data.Typeable
46import Data.Typeable
48import GHC.Generics
47import GHC.Generics
49
48
@@ -158,12 +157,3 @@ getTraceFlags t s = publishEvent t (unsafeCreateUnencodedMessage s)
158
157
159getCurrentTraceClient :: MxEventBus -> SendPort (Maybe ProcessId) -> IO ()
158getCurrentTraceClient :: MxEventBus -> SendPort (Maybe ProcessId) -> IO ()
160getCurrentTraceClient t s = publishEvent t (unsafeCreateUnencodedMessage s)
159getCurrentTraceClient t s = publishEvent t (unsafeCreateUnencodedMessage s)
161−
162−class Traceable a where
163− uod :: [a] -> TraceSubject
164−
165−instance Traceable ProcessId where
166− uod = TraceProcs . Set.fromList
167−
168−instance Traceable String where
169− uod = TraceNames . Set.fromList
src/Control/Distributed/Process/Node.hs−2
@@ -37,7 +37,6 @@ import qualified Data.Map as Map
37 , filterWithKey
37 , filterWithKey
38 , foldlWithKey
38 , foldlWithKey
39 )
39 )
40−import qualified Data.Set as Set
41import Data.Time.Format (formatTime)
40import Data.Time.Format (formatTime)
42#if MIN_VERSION_time(1,5,0)
41#if MIN_VERSION_time(1,5,0)
43import Data.Time.Format (defaultTimeLocale)
42import Data.Time.Format (defaultTimeLocale)
@@ -55,7 +54,6 @@ import qualified Data.Set as Set
55 , union
54 , union
56 )
55 )
57import Data.Foldable (forM_)
56import Data.Foldable (forM_)
58−import Data.List (foldl')
59import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
57import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
60import Data.Typeable (Typeable)
58import Data.Typeable (Typeable)
61import Control.Category ((>>>))
59import Control.Category ((>>>))