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

Skip to content

Add Observer Before Starting Fiber In Runtime.unsafe.runToFuture #7683

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 3 commits into from
Jan 10, 2023
Merged

Add Observer Before Starting Fiber In Runtime.unsafe.runToFuture #7683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2875a4
add observer before starting fiber
adamgfraser Jan 9, 2023
c156dc8
cleanup
adamgfraser Jan 10, 2023
006d96a
add test
adamgfraser Jan 10, 2023
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
14 changes: 14 additions & 0 deletions core-tests/shared/src/test/scala/zio/CancelableFutureSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import zio.test.Assertion._
import zio.test.TestAspect._
import zio.test._

import scala.concurrent.Future

object CancelableFutureSpec extends ZIOBaseSpec {

import ZIOTag._
Expand Down Expand Up @@ -40,6 +42,18 @@ object CancelableFutureSpec extends ZIOBaseSpec {

assertZIO(Live.live(result.timeout(1.seconds)))(isNone)
} @@ zioTag(supervision, regression),
test("unsafeRunToFuture") {
for {
runtime <- ZIO.runtime[Any]
_ <- ZIO.fromFuture { implicit ec =>
Future.traverse(0 to 1000) { _ =>
Unsafe.unsafe { implicit unsafe =>
runtime.unsafe.runToFuture(ZIO.unit)
}
}
}
} yield assertCompletes
} @@ nonFlaky,
test("unsafeRunToFuture interruptibility") {
for {
runtime <- ZIO.runtime[Any]
Expand Down
44 changes: 26 additions & 18 deletions core/shared/src/main/scala/zio/Runtime.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,22 +136,7 @@ trait Runtime[+R] { self =>
}

def fork[E, A](zio: ZIO[R, E, A])(implicit trace: Trace, unsafe: Unsafe): internal.FiberRuntime[E, A] = {
import internal.FiberRuntime

val fiberId = FiberId.make(trace)
val fiberRefs = self.fiberRefs.updatedAs(fiberId)(FiberRef.currentEnvironment, environment)
val fiber = FiberRuntime[E, A](fiberId, fiberRefs.forkAs(fiberId), runtimeFlags)

FiberScope.global.add(null, runtimeFlags, fiber)

val supervisor = fiber.getSupervisor()

if (supervisor ne Supervisor.none) {
supervisor.onStart(environment, zio, None, fiber)

fiber.addObserver(exit => supervisor.onEnd(exit, fiber))
}

val fiber = makeFiber(zio)
fiber.start[R](zio)
fiber
}
Expand All @@ -161,19 +146,42 @@ trait Runtime[+R] { self =>
)(implicit trace: Trace, unsafe: Unsafe): CancelableFuture[A] = {
val p: scala.concurrent.Promise[A] = scala.concurrent.Promise[A]()

val fiber = fork(zio)
val fiber = makeFiber(zio)

fiber.addObserver(_.foldExit(cause => p.failure(cause.squashTraceWith(identity)), p.success))

fiber.start(zio)

new CancelableFuture[A](p.future) {
def cancel(): Future[Exit[Throwable, A]] = {
val p: scala.concurrent.Promise[Exit[Throwable, A]] = scala.concurrent.Promise[Exit[Throwable, A]]()
val cancelFiber = fork(fiber.interruptAs(FiberId.None))
val cancelFiber = makeFiber(fiber.interruptAs(FiberId.None))
cancelFiber.addObserver(_.foldExit(cause => p.failure(cause.squashTraceWith(identity)), p.success))
cancelFiber.start(fiber.interruptAs(FiberId.None))
p.future
}
}
}

private def makeFiber[E, A](
zio: ZIO[R, E, A]
)(implicit trace: Trace, unsafe: Unsafe): internal.FiberRuntime[E, A] = {
val fiberId = FiberId.make(trace)
val fiberRefs = self.fiberRefs.updatedAs(fiberId)(FiberRef.currentEnvironment, environment)
val fiber = FiberRuntime[E, A](fiberId, fiberRefs.forkAs(fiberId), runtimeFlags)

FiberScope.global.add(null, runtimeFlags, fiber)

val supervisor = fiber.getSupervisor()

if (supervisor ne Supervisor.none) {
supervisor.onStart(environment, zio, None, fiber)

fiber.addObserver(exit => supervisor.onEnd(exit, fiber))
}

fiber
}
}
}

Expand Down