Skip to content
Closed
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
11 changes: 10 additions & 1 deletion src/EventLoop/Internal/AbstractDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,21 @@ public function getSuspension(): Suspension
\assert($fiber !== $this->fiber);

// Use current object in case of {main}
return $this->suspensions[$fiber ?? $this] ??= new DriverSuspension(
if (isset($this->suspensions[$fiber ?? $this])) {
if ($suspension = $this->suspensions[$fiber ?? $this]->get()) {
return $suspension;
}
}

$suspension = new DriverSuspension(
$this->runCallback,
$this->queueCallback,
$this->interruptCallback,
$this->suspensions
);
$this->suspensions[$fiber ?? $this] = \WeakReference::create($suspension);

return $suspension;
}

public function setErrorHandler(?\Closure $errorHandler): void
Expand Down
20 changes: 10 additions & 10 deletions src/EventLoop/Internal/DriverSuspension.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,17 @@ public function suspend(): mixed
$info = '';
$suspensions = $this->suspensions->get();
if ($suspensions) {
\gc_collect_cycles();

/** @var self $suspension */
foreach ($suspensions as $suspension) {
$fiber = $suspension->fiberRef?->get();
if ($fiber === null) {
continue;
foreach ($suspensions as $suspensionRef) {
/** @var self $suspension */
if ($suspension = $suspensionRef->get()) {
$fiber = $suspension->fiberRef?->get();
if ($fiber === null) {
continue;
}

$reflectionFiber = new \ReflectionFiber($fiber);
$info .= "\n\n" . $this->formatStacktrace($reflectionFiber->getTrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
}

$reflectionFiber = new \ReflectionFiber($fiber);
$info .= "\n\n" . $this->formatStacktrace($reflectionFiber->getTrace(\DEBUG_BACKTRACE_IGNORE_ARGS));
}
}

Expand Down
3 changes: 1 addition & 2 deletions test/EventLoopTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,7 @@ public function testSuspensionWithinCallbackGarbageCollectionSuspended(): void

\gc_collect_cycles();

// This documents an expected failure, should actually be true, but suspensions have to be resumed currently.
self::assertNull($finally);
self::assertTrue($finally);
}

public function testSuspensionWithinQueue(): void
Expand Down