Skip to content

Fix finalization after failure #161

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

Merged
merged 2 commits into from
Aug 24, 2018
Merged

Fix finalization after failure #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
889e326
Fix finalization after failure
natefaubion Aug 22, 2018
259629c
Cleanup potentially stale state
natefaubion Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Effect/Aff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,11 @@ var Aff = function () {
// the provided callback in `makeAff` more than once, but it may also be an
// async effect resuming after the fiber was already cancelled.
function run(localRunTick) {
var tmp, result, attempt, canceler;
var tmp, result, attempt;
while (true) {
tmp = null;
result = null;
attempt = null;
canceler = null;

switch (status) {
case STEP_BIND:
Expand Down Expand Up @@ -460,7 +459,7 @@ var Aff = function () {
// because it should not be cancelled.
case RELEASE:
bracketCount++;
attempts = new Aff(CONS, new Aff(FINALIZED, step), attempts, interrupt);
attempts = new Aff(CONS, new Aff(FINALIZED, step, fail), attempts, interrupt);
status = CONTINUE;
// It has only been killed if the interrupt status has changed
// since we enqueued the item.
Expand All @@ -471,11 +470,12 @@ var Aff = function () {
} else {
step = attempt._1.completed(util.fromRight(step))(attempt._2);
}
fail = null;
break;

case FINALIZER:
bracketCount++;
attempts = new Aff(CONS, new Aff(FINALIZED, step), attempts, interrupt);
attempts = new Aff(CONS, new Aff(FINALIZED, step, fail), attempts, interrupt);
status = CONTINUE;
step = attempt._1;
break;
Expand All @@ -484,6 +484,7 @@ var Aff = function () {
bracketCount--;
status = RETURN;
step = attempt._1;
fail = attempt._2;
break;
}
}
Expand Down
10 changes: 10 additions & 0 deletions test/Test/Main.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,15 @@ test_regression_par_apply_async_canceler = assert "regression/par-apply-async-ca
val <- readRef ref
pure (val == "throwdone" && message err == "Nope.")

test_regression_bracket_catch_cleanup ∷ Aff Unit
test_regression_bracket_catch_cleanup = assert "regression/bracket-catch-cleanup" do
res :: Either Error Unit ←
try $ bracket
(pure unit)
(\_ → catchError (pure unit) (const (pure unit)))
(\_ → throwError (error "Nope."))
pure $ lmap message res == Left "Nope."

main ∷ Effect Unit
main = do
test_pure
Expand Down Expand Up @@ -697,3 +706,4 @@ main = do
test_parallel_stack
test_regression_return_fork
test_regression_par_apply_async_canceler
test_regression_bracket_catch_cleanup