Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
quasar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jens Nolte
quasar
Commits
4fcc90a5
Commit
4fcc90a5
authored
3 years ago
by
Jens Nolte
Browse files
Options
Downloads
Patches
Plain Diff
Rename to newUnmanagedResourceManager
Co-authored-by:
Jan Beinke
<
git@janbeinke.com
>
parent
862976c0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#2470
passed
3 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Quasar/Observable.hs
+3
-3
3 additions, 3 deletions
src/Quasar/Observable.hs
src/Quasar/ResourceManager.hs
+5
-5
5 additions, 5 deletions
src/Quasar/ResourceManager.hs
test/Quasar/DisposableSpec.hs
+2
-2
2 additions, 2 deletions
test/Quasar/DisposableSpec.hs
with
10 additions
and
10 deletions
src/Quasar/Observable.hs
+
3
−
3
View file @
4fcc90a5
...
...
@@ -102,7 +102,7 @@ class IsRetrievable v o => IsObservable v o | o -> v where
-- | Old signature of `observe`, will be removed from the class once it's no longer used for implementations.
oldObserve
::
o
->
(
ObservableMessage
v
->
IO
()
)
->
IO
Disposable
oldObserve
observable
callback
=
do
resourceManager
<-
unsafeNew
ResourceManager
resourceManager
<-
newUnmanaged
ResourceManager
onResourceManager
resourceManager
do
observe
observable
$
\
msg
->
liftIO
(
callback
msg
)
pure
$
toDisposable
resourceManager
...
...
@@ -230,7 +230,7 @@ instance IsObservable r (BindObservable r) where
oldObserve
::
BindObservable
r
->
(
ObservableMessage
r
->
IO
()
)
->
IO
Disposable
oldObserve
(
BindObservable
fx
fn
)
callback
=
do
-- Create a resource manager to ensure all subscriptions are cleaned up when disposing.
resourceManager
<-
unsafeNew
ResourceManager
resourceManager
<-
newUnmanaged
ResourceManager
isDisposingVar
<-
newTVarIO
False
disposableVar
<-
newTMVarIO
noDisposable
...
...
@@ -298,7 +298,7 @@ instance IsObservable r (CatchObservable e r) where
oldObserve
::
CatchObservable
e
r
->
(
ObservableMessage
r
->
IO
()
)
->
IO
Disposable
oldObserve
(
CatchObservable
fx
fn
)
callback
=
do
-- Create a resource manager to ensure all subscriptions are cleaned up when disposing.
resourceManager
<-
unsafeNew
ResourceManager
resourceManager
<-
newUnmanaged
ResourceManager
isDisposingVar
<-
newTVarIO
False
disposableVar
<-
newTMVarIO
noDisposable
...
...
This diff is collapsed.
Click to expand it.
src/Quasar/ResourceManager.hs
+
5
−
5
View file @
4fcc90a5
...
...
@@ -15,7 +15,7 @@ module Quasar.ResourceManager (
ResourceManager
,
withResourceManager
,
newResourceManager
,
unsafeNew
ResourceManager
,
newUnmanaged
ResourceManager
,
attachDisposable
,
attachDisposeAction
,
attachDisposeAction_
,
...
...
@@ -182,19 +182,19 @@ instance IsDisposable ResourceManager where
((
\
disposed
->
unless
disposed
retry
)
=<<
readTVar
(
disposedVar
resourceManager
))
withResourceManager
::
(
MonadAwait
m
,
MonadMask
m
,
MonadIO
m
)
=>
(
ResourceManager
->
m
a
)
->
m
a
withResourceManager
=
bracket
unsafeNew
ResourceManager
(
await
<=<
liftIO
.
dispose
)
withResourceManager
=
bracket
newUnmanaged
ResourceManager
(
await
<=<
liftIO
.
dispose
)
withResourceManagerM
::
(
MonadAwait
m
,
MonadMask
m
,
MonadIO
m
)
=>
(
ReaderT
ResourceManager
m
a
)
->
m
a
withResourceManagerM
action
=
withResourceManager
\
resourceManager
->
onResourceManager
resourceManager
action
newResourceManager
::
MonadResourceManager
m
=>
m
ResourceManager
newResourceManager
=
mask_
do
resourceManager
<-
unsafeNew
ResourceManager
resourceManager
<-
newUnmanaged
ResourceManager
registerDisposable
resourceManager
pure
resourceManager
unsafeNew
ResourceManager
::
MonadIO
m
=>
m
ResourceManager
unsafeNew
ResourceManager
=
liftIO
do
newUnmanaged
ResourceManager
::
MonadIO
m
=>
m
ResourceManager
newUnmanaged
ResourceManager
=
liftIO
do
disposingVar
<-
newTVarIO
False
disposedVar
<-
newTVarIO
False
exceptionVar
<-
newEmptyTMVarIO
...
...
This diff is collapsed.
Click to expand it.
test/Quasar/DisposableSpec.hs
+
2
−
2
View file @
4fcc90a5
...
...
@@ -44,10 +44,10 @@ spec = parallel $ do
describe
"ResourceManager"
$
do
it
"can be created"
$
io
do
void
unsafeNew
ResourceManager
void
newUnmanaged
ResourceManager
it
"can be created and disposed"
$
io
do
resourceManager
<-
unsafeNew
ResourceManager
resourceManager
<-
newUnmanaged
ResourceManager
await
=<<
dispose
resourceManager
it
"can be created and disposed"
$
io
do
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment