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
10 changes: 10 additions & 0 deletions core-tests/shared/src/test/scala/zio/ZIOSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4193,6 +4193,16 @@ object ZIOSpec extends ZIOBaseSpec {
test("propagates interruption") {
val zio = ZIO.never <&> ZIO.never <&> ZIO.fail("fail")
assertZIO(zio.exit)(fails(equalTo("fail")))
},
test("propagates FiberRef values") {
for {
fiberRef <- FiberRef.make(5)
workflow = fiberRef.set(10).delay(2.seconds) <&> fiberRef.set(15)
fiber <- workflow.fork
_ <- TestClock.adjust(2.seconds)
_ <- fiber.join
value <- fiberRef.get
} yield assertTrue(value == 10)
}
),
suite("toFuture")(
Expand Down
12 changes: 7 additions & 5 deletions core/shared/src/main/scala/zio/ZIO.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2521,24 +2521,24 @@ sealed trait ZIO[-R, +E, +A]
)(f: (A, B) => C)(implicit trace: Trace): ZIO[R1, E1, C] =
ZIO.uninterruptibleMask { restore =>
ZIO.transplant { graft =>
val promise = Promise.unsafe.make[Unit, Unit](FiberId.None)(Unsafe.unsafe)
val promise = Promise.unsafe.make[Unit, Boolean](FiberId.None)(Unsafe.unsafe)
val ref = new java.util.concurrent.atomic.AtomicBoolean(false)

def fork[R, E, A](zio: => ZIO[R, E, A]): ZIO[R, Nothing, Fiber[E, A]] =
def fork[R, E, A](zio: => ZIO[R, E, A], side: Boolean): ZIO[R, Nothing, Fiber[E, A]] =
graft(restore(zio))
.foldCauseZIO(
cause => promise.fail(()) *> ZIO.refailCause(cause),
a =>
if (ref.getAndSet(true)) {
promise.unsafe.done(ZIO.unit)(Unsafe.unsafe)
promise.unsafe.done(ZIO.succeedNow(side))(Unsafe.unsafe)
ZIO.succeed(a)
} else {
ZIO.succeed(a)
}
)
.forkDaemon

fork(self).zip(fork(that)).flatMap { case (left, right) =>
fork(self, false).zip(fork(that, true)).flatMap { case (left, right) =>
restore(promise.await).foldCauseZIO(
cause =>
left.interruptFork *> right.interruptFork *>
Expand All @@ -2548,7 +2548,9 @@ sealed trait ZIO[-R, +E, +A]
case _ => ZIO.refailCause(cause.stripFailures)
}
},
_ => left.join.zipWith(right.join)(f)
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