Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 1 addition & 19 deletions core-tests/shared/src/test/scala/zio/ZIOSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -345,16 +345,7 @@ object ZIOSpec extends ZIOBaseSpec {
right2 = (promise1.succeed(()) *> ZIO.never).ensuring(promise2.interrupt *> ZIO.never.interruptible)
exit <- ZIO.collectAllPar(List(left, ZIO.collectAllPar(List(right1, right2)))).exit
} yield assert(exit)(failsCause(containsCause(Cause.fail("fail"))))
} @@ nonFlaky,
test("runs finalizers in parallel") {
for {
promise1 <- Promise.make[Nothing, Unit]
promise2 <- Promise.make[Nothing, Unit]
left = ZIO.addFinalizer(promise1.succeed(())) *> promise2.succeed(())
right = promise2.await *> ZIO.addFinalizer(promise1.await)
_ <- ZIO.collectAllPar(List(left, right))
} yield assertCompletes
}
} @@ nonFlaky
),
suite("collectAllParN")(
test("returns results in the same order") {
Expand Down Expand Up @@ -4212,15 +4203,6 @@ object ZIOSpec extends ZIOBaseSpec {
_ <- fiber.join
value <- fiberRef.get
} yield assertTrue(value == 10)
},
test("runs finalizers in parallel") {
for {
promise1 <- Promise.make[Nothing, Unit]
promise2 <- Promise.make[Nothing, Unit]
left = ZIO.addFinalizer(promise1.succeed(())) *> promise2.succeed(())
right = promise2.await *> ZIO.addFinalizer(promise1.await)
_ <- left.zipPar(right)
} yield assertCompletes
}
),
suite("toFuture")(
Expand Down
57 changes: 27 additions & 30 deletions core/shared/src/main/scala/zio/ZIO.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2538,21 +2538,20 @@ sealed trait ZIO[-R, +E, +A]
)
.forkDaemon

ZIO.parallelFinalizersMask(restore => fork(restore(self), false).zip(fork(restore(that), true))).flatMap {
case (left, right) =>
restore(promise.await).foldCauseZIO(
cause =>
left.interruptFork *> right.interruptFork *>
left.await.zip(right.await).flatMap { case (left, right) =>
left.zipWith(right)(f, _ && _) match {
case Exit.Failure(causes) => ZIO.refailCause(cause.stripFailures && causes)
case _ => ZIO.refailCause(cause.stripFailures)
}
},
leftWins =>
if (leftWins) left.join.zipWith(right.join)((a, b) => f(a, b))
else right.join.zipWith(left.join)((b, a) => f(a, b))
)
fork(self, false).zip(fork(that, true)).flatMap { case (left, right) =>
restore(promise.await).foldCauseZIO(
cause =>
left.interruptFork *> right.interruptFork *>
left.await.zip(right.await).flatMap { case (left, right) =>
left.zipWith(right)(f, _ && _) match {
case Exit.Failure(causes) => ZIO.refailCause(cause.stripFailures && causes)
case _ => ZIO.refailCause(cause.stripFailures)
}
},
leftWins =>
if (leftWins) left.join.zipWith(right.join)((a, b) => f(a, b))
else right.join.zipWith(left.join)((b, a) => f(a, b))
)
}
}
}
Expand Down Expand Up @@ -6075,21 +6074,19 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific
val promise = Promise.unsafe.make[Unit, Unit](FiberId.None)(Unsafe.unsafe)
val ref = new java.util.concurrent.atomic.AtomicInteger(0)
ZIO.transplant { graft =>
ZIO.parallelFinalizersMask { restoreFinalizers =>
ZIO.foreach(as) { a =>
graft {
restore(restoreFinalizers(ZIO.suspendSucceed(f(a)))).foldCauseZIO(
cause => promise.fail(()) *> ZIO.refailCause(cause),
_ =>
if (ref.incrementAndGet == size) {
promise.unsafe.done(ZIO.unit)(Unsafe.unsafe)
ZIO.unit
} else {
ZIO.unit
}
)
}.forkDaemon
}
ZIO.foreach(as) { a =>
graft {
restore(ZIO.suspendSucceed(f(a))).foldCauseZIO(
cause => promise.fail(()) *> ZIO.refailCause(cause),
_ =>
if (ref.incrementAndGet == size) {
promise.unsafe.done(ZIO.unit)(Unsafe.unsafe)
ZIO.unit
} else {
ZIO.unit
}
)
}.forkDaemon
}
}.flatMap { fibers =>
restore(promise.await).foldCauseZIO(
Expand Down