Refactorisation of MonadTimers & monad transformer instances #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

coot merged 34 commits into main from coot/monad-timers

Apr 14, 2023

Collaborator

coot commented Dec 7, 2022 •

edited

Loading

No description provided.

coot requested a review from dcoutts

December 7, 2022 16:00

coot force-pushed the coot/monad-timers branch from 85d9a8c to d8b5f14 Compare

December 8, 2022 14:09

coot mentioned this pull request

newTimeout is not safe on 32-bit archs #59

Closed

coot linked an issue

that may be closed by this pull request

Remove the fancy timeout API from io-classes #46

Closed

coot force-pushed the coot/monad-timers branch 2 times, most recently from c1cdd26 to 5cb6170 Compare

December 9, 2022 18:47

coot changed the title ~~coot/monad timers~~ Refactorisation of MonadTimers & monad transformer instances

This was linked to issues Dec 9, 2022

Monad transformer instances for MonadThread, MonadFork and MonadAsync classes #58

Closed

newTimeout is not safe on 32-bit archs #59

Closed

coot requested a review from bolt12

December 9, 2022 21:05

coot force-pushed the coot/monad-timers branch 2 times, most recently from 4cbb906 to 2776115 Compare

December 12, 2022 17:57

Collaborator Author

coot commented Dec 12, 2022

I removed the rather controversial monad transformer instances for MonadFork & MonadAsync; If we get requests, we can think about it.

coot force-pushed the coot/monad-timers branch from 2776115 to c8d0de2 Compare

December 12, 2022 18:00

coot mentioned this pull request

io-sim 1.0.0.0 #60

Merged

coot commented

View reviewed changes

io-classes/src/Control/Monad/Class/MonadTimer.hs Outdated Show resolved Hide resolved

coot commented

View reviewed changes

si-timers/src/Control/Monad/Class/MonadTimer/NonStandard.hs Outdated Show resolved Hide resolved

coot commented

View reviewed changes

io-classes/src/Control/Monad/Class/MonadThrow.hs Outdated

Comment on lines 427 to 428

		instance MonadCatch m => MonadCatch (StateT s m) where
		catch (StateT m) f = StateT $ \s -> catch (m s) (\e -> runStateT (f e) s)

Collaborator Author

coot Dec 13, 2022

compare with exceptions package

Collaborator Author

coot Dec 14, 2022

https://hackage.haskell.org/package/transformers-0.6.0.4/docs/src/Control.Monad.Trans.State.Lazy.html#liftCatch

coot commented

View reviewed changes

io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs Outdated Show resolved Hide resolved

Collaborator Author

coot commented Dec 13, 2022 •

edited

Loading

notes after a conversation with @dcoutts:

MonadTimerSI -> IOSim, remove MonadTimeout
Make io-sim and si-timers Time independent.
check which instances excpetions package provides
io-classes-mtl (leave ReaderT instances in io-classes)

I think my original notes were not adequate with respect to the second point. As I remember we concluded that Time needs to be defined in si-timers.

coot force-pushed the coot/monad-timers branch from c13c2fe to a82d7b8 Compare

December 14, 2022 14:56

coot commented

View reviewed changes

io-classes-mtl/src/Control/Monad/Class/MonadThrow/Trans.hs Outdated

+              -- | @since 1.0.0.0
+              instance MonadCatch m => MonadCatch (StateT s m) where
+                catch (StateT m) f = StateT $ \s -> catch (m s) (\e -> runStateT (f e) s)

Collaborator Author

coot Dec 14, 2022

This is compatible with what exception package does; it's using liftCatch.

coot force-pushed the coot/monad-timers branch from a82d7b8 to 280f200 Compare

December 14, 2022 18:27

coot commented

View reviewed changes

io-classes-mtl/src/Control/Monad/Class/MonadThrow/Trans.hs

+              instance MonadCatch m => MonadCatch (ExceptT e m) where
+                catch (ExceptT m) f = ExceptT $ catch m (runExceptT . f)
+                generalBracket acquire release use = ExceptT $ do

Collaborator Author

coot Dec 14, 2022

The same as https://hackage.haskell.org/package/exceptions-0.10.7/docs/src/Control.Monad.Catch.html#local-6989586621679054762

coot commented

View reviewed changes

io-classes-mtl/src/Control/Monad/Class/MonadThrow/Trans.hs Outdated

+              instance (Monoid w, MonadCatch m) => MonadCatch (WriterT w m) where
+                catch (WriterT m) f = WriterT $ catch m (runWriterT . f)
+                generalBracket acquire release use = WriterT $ fmap f $

Collaborator Author

coot Dec 14, 2022

The same as https://hackage.haskell.org/package/exceptions-0.10.7/docs/src/Control.Monad.Catch.html#local-6989586621679055342

coot commented

View reviewed changes

io-classes-mtl/src/Control/Monad/Class/MonadThrow/Trans.hs Outdated

+                catch (RWST m) f = RWST $ \r s -> catch (m r s) (\e -> runRWST (f e) r s)
+                -- | general bracket ignores the state produced by the release callback
+                generalBracket acquire release use = RWST $ \r s ->

Collaborator Author

coot Dec 14, 2022

The same as https://hackage.haskell.org/package/exceptions-0.10.7/docs/src/Control.Monad.Catch.html#local-6989586621679055102

coot commented

View reviewed changes

io-classes-mtl/src/Control/Monad/Class/MonadThrow/Trans.hs Outdated

+                catch (StateT m) f = StateT $ \s -> catch (m s) (\e -> runStateT (f e) s)
+                -- | general bracket ignores the state produced by the release callback
+                generalBracket acquire release use = StateT $ \s -> fmap f $

Collaborator Author

coot Dec 14, 2022

The same as https://hackage.haskell.org/package/exceptions-0.10.7/docs/src/Control.Monad.Catch.html#local-6989586621679055622

coot mentioned this pull request

Provide mtl instances for strict monad transformers #62

Closed

coot force-pushed the coot/monad-timers branch from 3f834ff to 7037211 Compare

December 15, 2022 19:43

coot linked an issue

that may be closed by this pull request

Provide mtl instances for strict monad transformers #62

Closed

coot added 26 commits

April 14, 2023 14:54


          MonadTimer: monad transformers instances

0b26348


          MonadMonotonicTimeNSec and MonadMonotonicTime

7b24965

The latter one returns time in nanoseconds as a `Word64` value, the same
as `GHC.Clock.getMonotonicTimeNSec`.  `MonadMonotonicTime` has a single
method which returns time measured in `DiffTime`.

For `IOSim` the latter one is more precise, `IOSim` measures time using
`DiffTime`.


          Updated CHANGELOG files

86348b2


          si-timers: added haddocks

dcc46f3


          Moved MonadTimeout to si-timers

1aa06f7

This means we also remove `registerDelayCancellable` from `io-classes`.


          io-classes & si-timers: various small changes

8ecf4e7

Haddocks & layout.


          MonadTime: decoupled from MonadmonotonicTimeNSec

b14d52a


          MonadTimer.SI: re-xport MonadTimeout (without methods)

47b7209


          si-timers: added convenient type aliases

973d25f

* MonadDelay
* MonadTimer


          si-timers: monad transformer instances for MonadMonotonicTime

f8e223c


          MonadTimeout: added ContT instance

9481fb3


          MonadEventlog: monad transformers instances

f82584d


          MonadST: monad transformers instances

7164ec9


          MonaThrow: monad transformers instances

1b5c099


          MonadFork: refactored ReaderT instance


          MonadSTM: monad transformers instances

f0153f6

`ReaderT`, `WriterT`, `StateT` and `RWST` have now instances which also
transform the `STM m` monad.  This open a possibility to provide
`MonadAsync` instances for monad transformers stacks.


          MonadAsync: refactor ReaderT instance

125d9c2


          Fixed windows build

053836a


          si-timers: simplified registerDelayCancellable

4cca9ac


          MonadSTM: ContT monad transformer

e8112e7

We don't need anymore `WrappedSTM` as it's only used for `ContT` monad
transformer.


          si-timers: use stm package for MonadTimeout IO instances

8cd8832


          MonadTimer & MonadDelay in si-timers

2a8eec4

`si-timers` also provides `MonadTimer` and `MonadDelay`.  They use the
same name as one in `io-classes` as it's not expected to depend on both
in one module.

The `si-timers` provides `defaultRegisterDelayCancellable` which is used
for two purposes:

* provide `IO` instance
* test the `IO` instance in `IOSim`

This patch also reverts a change in one of the previous patches.
`IOSim` is using `DiffTime` for its `NewTimeout` primitive operation.
The `UpdateTimeout` is removed as it is not used.


          io-classes-mtl package

936a71c


          Added support js_HOST_ARCH

accdc1e


          Support wasm32

869258c


          Added strict monad transformers

01509df

coot force-pushed the coot/monad-timers branch from dcdb3b6 to 01509df Compare

April 14, 2023 12:56

bolt12 approved these changes

View reviewed changes

coot merged commit 3671872 into main

coot deleted the coot/monad-timers branch

April 14, 2023 14:20

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet