From 9304725d331d76cf81a2999b1abfcb9d4a0ae2d4 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Mon, 21 Feb 2022 18:12:24 +0100
Subject: [PATCH] Align more STM function names
---
src/Quasar/Resources.hs | 16 ++++++++--------
src/Quasar/Timer.hs | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/Quasar/Resources.hs b/src/Quasar/Resources.hs
index 888ebc5..32c1ef1 100644
--- a/src/Quasar/Resources.hs
+++ b/src/Quasar/Resources.hs
@@ -20,8 +20,8 @@ module Quasar.Resources (
-- * Types to implement resources
-- ** Disposer
Disposer,
- newIODisposer,
- newSTMDisposer,
+ newIODisposerSTM,
+ newSTMDisposerSTM,
-- ** Resource manager
ResourceManager,
@@ -42,11 +42,11 @@ import Quasar.Resources.Disposer
import Quasar.Utils.ShortIO
-newIODisposer :: IO () -> TIOWorker -> ExceptionChannel -> STM Disposer
-newIODisposer fn worker exChan = newPrimitiveDisposer (forkAsyncShortIO fn exChan) worker exChan
+newIODisposerSTM :: IO () -> TIOWorker -> ExceptionChannel -> STM Disposer
+newIODisposerSTM fn worker exChan = newPrimitiveDisposer (forkAsyncShortIO fn exChan) worker exChan
-newSTMDisposer :: STM () -> TIOWorker -> ExceptionChannel -> STM Disposer
-newSTMDisposer fn worker exChan = newPrimitiveDisposer disposeFn worker exChan
+newSTMDisposerSTM :: STM () -> TIOWorker -> ExceptionChannel -> STM Disposer
+newSTMDisposerSTM fn worker exChan = newPrimitiveDisposer disposeFn worker exChan
where
disposeFn :: ShortIO (Awaitable ())
disposeFn = unsafeShortIO $ atomically $
@@ -64,14 +64,14 @@ registerDisposeAction fn = do
worker <- askIOWorker
exChan <- askExceptionChannel
rm <- askResourceManager
- ensureSTM $ attachResource rm =<< newIODisposer fn worker exChan
+ ensureSTM $ attachResource rm =<< newIODisposerSTM fn worker exChan
registerDisposeTransaction :: MonadQuasar m => STM () -> m ()
registerDisposeTransaction fn = do
worker <- askIOWorker
exChan <- askExceptionChannel
rm <- askResourceManager
- ensureSTM $ attachResource rm =<< newSTMDisposer fn worker exChan
+ ensureSTM $ attachResource rm =<< newSTMDisposerSTM fn worker exChan
registerNewResource :: forall a m. (Resource a, MonadQuasar m) => m a -> m a
registerNewResource fn = do
diff --git a/src/Quasar/Timer.hs b/src/Quasar/Timer.hs
index 133b03a..e0d6973 100644
--- a/src/Quasar/Timer.hs
+++ b/src/Quasar/Timer.hs
@@ -180,7 +180,7 @@ newUnmanagedTimer scheduler time = liftIO do
key <- newUnique
completed <- newAsyncVar
atomically do
- disposer <- newSTMDisposer (disposeFn completed) (ioWorker scheduler) (exceptionChannel scheduler)
+ disposer <- newSTMDisposerSTM (disposeFn completed) (ioWorker scheduler) (exceptionChannel scheduler)
let timer = Timer { key, time, completed, disposer, scheduler }
tryTakeTMVar (heap scheduler) >>= \case
Just timers -> putTMVar (heap scheduler) (insert timer timers)
--
GitLab