Skip to content

Commit 40292c1

Browse files
committed
Rename property to avoid JIT bug
1 parent 0fe2d31 commit 40292c1

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/EventLoop/Driver/UvDriver.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static function isSupported(): bool
2424
/** @var array<string, resource> */
2525
private array $events = [];
2626
/** @var array<int, array<array-key, DriverCallback>> */
27-
private array $callbacks = [];
27+
private array $uvCallbacks = [];
2828
/** @var array<int, resource> */
2929
private array $streams = [];
3030
private readonly \Closure $ioCallback;
@@ -38,7 +38,7 @@ public function __construct()
3838
$this->handle = \uv_loop_new();
3939

4040
$this->ioCallback = function ($event, $status, $events, $resource): void {
41-
$callbacks = $this->callbacks[(int) $event];
41+
$callbacks = $this->uvCallbacks[(int) $event];
4242

4343
// Invoke the callback on errors, as this matches behavior with other loop back-ends.
4444
// Re-enable callback as libuv disables the callback on non-zero status.
@@ -66,15 +66,15 @@ public function __construct()
6666
};
6767

6868
$this->timerCallback = function ($event): void {
69-
$callback = $this->callbacks[(int) $event][0];
69+
$callback = $this->uvCallbacks[(int) $event][0];
7070

7171
\assert($callback instanceof TimerCallback);
7272

7373
$this->enqueueCallback($callback);
7474
};
7575

7676
$this->signalCallback = function ($event): void {
77-
$callback = $this->callbacks[(int) $event][0];
77+
$callback = $this->uvCallbacks[(int) $event][0];
7878

7979
$this->enqueueCallback($callback);
8080
};
@@ -94,16 +94,16 @@ public function cancel(string $callbackId): void
9494
$event = $this->events[$callbackId];
9595
$eventId = (int) $event;
9696

97-
if (isset($this->callbacks[$eventId][0])) { // All except IO callbacks.
98-
unset($this->callbacks[$eventId]);
99-
} elseif (isset($this->callbacks[$eventId][$callbackId])) {
100-
$callback = $this->callbacks[$eventId][$callbackId];
101-
unset($this->callbacks[$eventId][$callbackId]);
97+
if (isset($this->uvCallbacks[$eventId][0])) { // All except IO callbacks.
98+
unset($this->uvCallbacks[$eventId]);
99+
} elseif (isset($this->uvCallbacks[$eventId][$callbackId])) {
100+
$callback = $this->uvCallbacks[$eventId][$callbackId];
101+
unset($this->uvCallbacks[$eventId][$callbackId]);
102102

103103
\assert($callback instanceof StreamCallback);
104104

105-
if (empty($this->callbacks[$eventId])) {
106-
unset($this->callbacks[$eventId], $this->streams[(int) $callback->stream]);
105+
if (empty($this->uvCallbacks[$eventId])) {
106+
unset($this->uvCallbacks[$eventId], $this->streams[(int) $callback->stream]);
107107
}
108108
}
109109

@@ -161,10 +161,10 @@ protected function activate(array $callbacks): void
161161

162162
$eventId = (int) $event;
163163
$this->events[$id] = $event;
164-
$this->callbacks[$eventId][$id] = $callback;
164+
$this->uvCallbacks[$eventId][$id] = $callback;
165165

166166
$flags = 0;
167-
foreach ($this->callbacks[$eventId] as $w) {
167+
foreach ($this->uvCallbacks[$eventId] as $w) {
168168
\assert($w instanceof StreamCallback);
169169

170170
$flags |= $w->enabled ? ($this->getStreamCallbackFlags($w)) : 0;
@@ -177,7 +177,7 @@ protected function activate(array $callbacks): void
177177
$event = $this->events[$id] = \uv_timer_init($this->handle);
178178
}
179179

180-
$this->callbacks[(int) $event] = [$callback];
180+
$this->uvCallbacks[(int) $event] = [$callback];
181181

182182
\uv_timer_start(
183183
$event,
@@ -193,7 +193,7 @@ protected function activate(array $callbacks): void
193193
$event = $this->events[$id] = \uv_signal_init($this->handle);
194194
}
195195

196-
$this->callbacks[(int) $event] = [$callback];
196+
$this->uvCallbacks[(int) $event] = [$callback];
197197

198198
/** @psalm-suppress TooManyArguments */
199199
\uv_signal_start($event, $this->signalCallback, $callback->signal);
@@ -224,7 +224,7 @@ protected function deactivate(DriverCallback $callback): void
224224

225225
if ($callback instanceof StreamCallback) {
226226
$flags = 0;
227-
foreach ($this->callbacks[(int) $event] as $w) {
227+
foreach ($this->uvCallbacks[(int) $event] as $w) {
228228
\assert($w instanceof StreamCallback);
229229

230230
$flags |= $w->invokable ? ($this->getStreamCallbackFlags($w)) : 0;

0 commit comments

Comments
 (0)