minor #50367 [HttpClient] Use hrtime() to compute timeouts (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 668f10f4def9 · 2023-06-06T14:46:54.000+02:00
This PR was merged into the 6.4 branch.

Discussion
----------

[HttpClient] Use hrtime() to compute timeouts

| Q             | A
| ------------- | ---
| Branch?       | 6.3
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Makes the computation of timeouts resistant to clock drifts.

Commits
-------

bf6d57db82 [HttpClient] Use hrtime() to compute timeouts
diff --git a/EventSourceHttpClient.php b/EventSourceHttpClient.php
@@ -85,14 +85,14 @@ public function request(string $method, string $url, array $options = []): Respo
                     return;
                 }
             } catch (TransportExceptionInterface) {
-                $state->lastError = $lastError ?? microtime(true);
+                $state->lastError = $lastError ?? hrtime(true) / 1E9;
 
-                if (null === $state->buffer || ($isTimeout && microtime(true) - $state->lastError < $state->reconnectionTime)) {
+                if (null === $state->buffer || ($isTimeout && hrtime(true) / 1E9 - $state->lastError < $state->reconnectionTime)) {
                     yield $chunk;
                 } else {
                     $options['headers']['Last-Event-ID'] = $state->lastEventId;
                     $state->buffer = '';
-                    $state->lastError = microtime(true);
+                    $state->lastError = hrtime(true) / 1E9;
                     $context->getResponse()->cancel();
                     $context->replaceRequest($method, $url, $options);
                     if ($isTimeout) {
diff --git a/Internal/HttplugWaitLoop.php b/Internal/HttplugWaitLoop.php
@@ -57,7 +57,7 @@ public function wait(?ResponseInterface $pendingResponse, float $maxDuration = n
         if (0.0 === $remainingDuration = $maxDuration) {
             $idleTimeout = 0.0;
         } elseif (null !== $maxDuration) {
-            $startTime = microtime(true);
+            $startTime = hrtime(true) / 1E9;
             $idleTimeout = max(0.0, min($maxDuration / 5, $idleTimeout ?? $maxDuration));
         }
 
@@ -100,7 +100,7 @@ public function wait(?ResponseInterface $pendingResponse, float $maxDuration = n
                 }
 
                 check_duration:
-                if (null !== $maxDuration && $idleTimeout && $idleTimeout > $remainingDuration = max(0.0, $maxDuration - microtime(true) + $startTime)) {
+                if (null !== $maxDuration && $idleTimeout && $idleTimeout > $remainingDuration = max(0.0, $maxDuration - hrtime(true) / 1E9 + $startTime)) {
                     $idleTimeout = $remainingDuration / 5;
                     break;
                 }
diff --git a/Response/AmpResponse.php b/Response/AmpResponse.php
@@ -201,9 +201,9 @@ private static function perform(ClientState $multi, array &$responses = null): v
      */
     private static function select(ClientState $multi, float $timeout): int
     {
-        $timeout += microtime(true);
+        $timeout += hrtime(true) / 1E9;
         self::$delay = Loop::defer(static function () use ($timeout) {
-            if (0 < $timeout -= microtime(true)) {
+            if (0 < $timeout -= hrtime(true) / 1E9) {
                 self::$delay = Loop::delay(ceil(1000 * $timeout), Loop::stop(...));
             } else {
                 Loop::stop();
diff --git a/Response/CurlResponse.php b/Response/CurlResponse.php
@@ -103,7 +103,7 @@ public function __construct(CurlClientState $multi, \CurlHandle|string $ch, arra
                 }
 
                 $lastExpiry = end($multi->pauseExpiries);
-                $multi->pauseExpiries[(int) $ch] = $duration += microtime(true);
+                $multi->pauseExpiries[(int) $ch] = $duration += hrtime(true) / 1E9;
                 if (false !== $lastExpiry && $lastExpiry > $duration) {
                     asort($multi->pauseExpiries);
                 }
@@ -326,7 +326,7 @@ private static function perform(ClientState $multi, array &$responses = null): v
     private static function select(ClientState $multi, float $timeout): int
     {
         if ($multi->pauseExpiries) {
-            $now = microtime(true);
+            $now = hrtime(true) / 1E9;
 
             foreach ($multi->pauseExpiries as $id => $pauseExpiry) {
                 if ($now < $pauseExpiry) {
@@ -344,7 +344,7 @@ private static function select(ClientState $multi, float $timeout): int
             return $selected;
         }
 
-        if ($multi->pauseExpiries && 0 < $timeout -= microtime(true) - $now) {
+        if ($multi->pauseExpiries && 0 < $timeout -= hrtime(true) / 1E9 - $now) {
             usleep((int) (1E6 * $timeout));
         }
 
diff --git a/Response/NativeResponse.php b/Response/NativeResponse.php
@@ -75,7 +75,7 @@ public function __construct(NativeClientState $multi, $context, string $url, arr
 
         $pauseExpiry = &$this->pauseExpiry;
         $info['pause_handler'] = static function (float $duration) use (&$pauseExpiry) {
-            $pauseExpiry = 0 < $duration ? microtime(true) + $duration : 0;
+            $pauseExpiry = 0 < $duration ? hrtime(true) / 1E9 + $duration : 0;
         };
 
         $this->canary = new Canary(static function () use ($multi, $id) {
@@ -232,7 +232,7 @@ private static function perform(ClientState $multi, array &$responses = null): v
     {
         foreach ($multi->openHandles as $i => [$pauseExpiry, $h, $buffer, $onProgress]) {
             if ($pauseExpiry) {
-                if (microtime(true) < $pauseExpiry) {
+                if (hrtime(true) / 1E9 < $pauseExpiry) {
                     continue;
                 }
 
@@ -321,7 +321,7 @@ private static function perform(ClientState $multi, array &$responses = null): v
                 continue;
             }
 
-            if ($response->pauseExpiry && microtime(true) < $response->pauseExpiry) {
+            if ($response->pauseExpiry && hrtime(true) / 1E9 < $response->pauseExpiry) {
                 // Create empty open handles to tell we still have pending requests
                 $multi->openHandles[$i] = [\INF, null, null, null];
             } elseif ($maxHosts && $maxHosts > ($multi->hosts[parse_url($response->url, \PHP_URL_HOST)] ?? 0)) {
@@ -351,7 +351,7 @@ private static function select(ClientState $multi, float $timeout): int
                 continue;
             }
 
-            if ($pauseExpiry && ($now ??= microtime(true)) < $pauseExpiry) {
+            if ($pauseExpiry && ($now ??= hrtime(true) / 1E9) < $pauseExpiry) {
                 $timeout = min($timeout, $pauseExpiry - $now);
                 continue;
             }
diff --git a/Response/TransportResponseTrait.php b/Response/TransportResponseTrait.php
@@ -147,7 +147,7 @@ public static function stream(iterable $responses, float $timeout = null): \Gene
             self::schedule($response, $runningResponses);
         }
 
-        $lastActivity = microtime(true);
+        $lastActivity = hrtime(true) / 1E9;
         $elapsedTimeout = 0;
 
         if ($fromLastTimeout = 0.0 === $timeout && '-0' === (string) $timeout) {
@@ -172,7 +172,7 @@ public static function stream(iterable $responses, float $timeout = null): \Gene
                     $chunk = false;
 
                     if ($fromLastTimeout && null !== $multi->lastTimeout) {
-                        $elapsedTimeout = microtime(true) - $multi->lastTimeout;
+                        $elapsedTimeout = hrtime(true) / 1E9 - $multi->lastTimeout;
                     }
 
                     if (isset($multi->handlesActivity[$j])) {
@@ -291,15 +291,15 @@ public static function stream(iterable $responses, float $timeout = null): \Gene
             }
 
             if ($hasActivity) {
-                $lastActivity = microtime(true);
+                $lastActivity = hrtime(true) / 1E9;
                 continue;
             }
 
             if (-1 === self::select($multi, min($timeoutMin, $timeoutMax - $elapsedTimeout))) {
                 usleep(min(500, 1E6 * $timeoutMin));
             }
 
-            $elapsedTimeout = microtime(true) - $lastActivity;
+            $elapsedTimeout = hrtime(true) / 1E9 - $lastActivity;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function wait(?ResponseInterface $pendingResponse, float $maxDuration = n`
`57`	`57`	`if (0.0 === $remainingDuration = $maxDuration) {`
`58`	`58`	`$idleTimeout = 0.0;`
`59`	`59`	`} elseif (null !== $maxDuration) {`
`60`		`- $startTime = microtime(true);`
	`60`	`+ $startTime = hrtime(true) / 1E9;`
`61`	`61`	`$idleTimeout = max(0.0, min($maxDuration / 5, $idleTimeout ?? $maxDuration));`
`62`	`62`	`}`
`63`	`63`
`@@ -100,7 +100,7 @@ public function wait(?ResponseInterface $pendingResponse, float $maxDuration = n`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`check_duration:`
`103`		`- if (null !== $maxDuration && $idleTimeout && $idleTimeout > $remainingDuration = max(0.0, $maxDuration - microtime(true) + $startTime)) {`
	`103`	`+ if (null !== $maxDuration && $idleTimeout && $idleTimeout > $remainingDuration = max(0.0, $maxDuration - hrtime(true) / 1E9 + $startTime)) {`
`104`	`104`	`$idleTimeout = $remainingDuration / 5;`
`105`	`105`	`break;`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function __construct(CurlClientState $multi, \CurlHandle\|string $ch, arra`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`$lastExpiry = end($multi->pauseExpiries);`
`106`		`- $multi->pauseExpiries[(int) $ch] = $duration += microtime(true);`
	`106`	`+ $multi->pauseExpiries[(int) $ch] = $duration += hrtime(true) / 1E9;`
`107`	`107`	`if (false !== $lastExpiry && $lastExpiry > $duration) {`
`108`	`108`	`asort($multi->pauseExpiries);`
`109`	`109`	`}`
`@@ -326,7 +326,7 @@ private static function perform(ClientState $multi, array &$responses = null): v`
`326`	`326`	`private static function select(ClientState $multi, float $timeout): int`
`327`	`327`	`{`
`328`	`328`	`if ($multi->pauseExpiries) {`
`329`		`- $now = microtime(true);`
	`329`	`+ $now = hrtime(true) / 1E9;`
`330`	`330`
`331`	`331`	`foreach ($multi->pauseExpiries as $id => $pauseExpiry) {`
`332`	`332`	`if ($now < $pauseExpiry) {`
`@@ -344,7 +344,7 @@ private static function select(ClientState $multi, float $timeout): int`
`344`	`344`	`return $selected;`
`345`	`345`	`}`
`346`	`346`
`347`		`- if ($multi->pauseExpiries && 0 < $timeout -= microtime(true) - $now) {`
	`347`	`+ if ($multi->pauseExpiries && 0 < $timeout -= hrtime(true) / 1E9 - $now) {`
`348`	`348`	`usleep((int) (1E6 * $timeout));`
`349`	`349`	`}`
`350`	`350`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function __construct(NativeClientState $multi, $context, string $url, arr`
`75`	`75`
`76`	`76`	`$pauseExpiry = &$this->pauseExpiry;`
`77`	`77`	`$info['pause_handler'] = static function (float $duration) use (&$pauseExpiry) {`
`78`		`- $pauseExpiry = 0 < $duration ? microtime(true) + $duration : 0;`
	`78`	`+ $pauseExpiry = 0 < $duration ? hrtime(true) / 1E9 + $duration : 0;`
`79`	`79`	`};`
`80`	`80`
`81`	`81`	`$this->canary = new Canary(static function () use ($multi, $id) {`
`@@ -232,7 +232,7 @@ private static function perform(ClientState $multi, array &$responses = null): v`
`232`	`232`	`{`
`233`	`233`	`foreach ($multi->openHandles as $i => [$pauseExpiry, $h, $buffer, $onProgress]) {`
`234`	`234`	`if ($pauseExpiry) {`
`235`		`- if (microtime(true) < $pauseExpiry) {`
	`235`	`+ if (hrtime(true) / 1E9 < $pauseExpiry) {`
`236`	`236`	`continue;`
`237`	`237`	`}`
`238`	`238`
`@@ -321,7 +321,7 @@ private static function perform(ClientState $multi, array &$responses = null): v`
`321`	`321`	`continue;`
`322`	`322`	`}`
`323`	`323`
`324`		`- if ($response->pauseExpiry && microtime(true) < $response->pauseExpiry) {`
	`324`	`+ if ($response->pauseExpiry && hrtime(true) / 1E9 < $response->pauseExpiry) {`
`325`	`325`	`// Create empty open handles to tell we still have pending requests`
`326`	`326`	`$multi->openHandles[$i] = [\INF, null, null, null];`
`327`	`327`	`} elseif ($maxHosts && $maxHosts > ($multi->hosts[parse_url($response->url, \PHP_URL_HOST)] ?? 0)) {`
`@@ -351,7 +351,7 @@ private static function select(ClientState $multi, float $timeout): int`
`351`	`351`	`continue;`
`352`	`352`	`}`
`353`	`353`
`354`		`- if ($pauseExpiry && ($now ??= microtime(true)) < $pauseExpiry) {`
	`354`	`+ if ($pauseExpiry && ($now ??= hrtime(true) / 1E9) < $pauseExpiry) {`
`355`	`355`	`$timeout = min($timeout, $pauseExpiry - $now);`
`356`	`356`	`continue;`
`357`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public static function stream(iterable $responses, float $timeout = null): \Gene`
`147`	`147`	`self::schedule($response, $runningResponses);`
`148`	`148`	`}`
`149`	`149`
`150`		`- $lastActivity = microtime(true);`
	`150`	`+ $lastActivity = hrtime(true) / 1E9;`
`151`	`151`	`$elapsedTimeout = 0;`
`152`	`152`
`153`	`153`	`if ($fromLastTimeout = 0.0 === $timeout && '-0' === (string) $timeout) {`
`@@ -172,7 +172,7 @@ public static function stream(iterable $responses, float $timeout = null): \Gene`
`172`	`172`	`$chunk = false;`
`173`	`173`
`174`	`174`	`if ($fromLastTimeout && null !== $multi->lastTimeout) {`
`175`		`- $elapsedTimeout = microtime(true) - $multi->lastTimeout;`
	`175`	`+ $elapsedTimeout = hrtime(true) / 1E9 - $multi->lastTimeout;`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`if (isset($multi->handlesActivity[$j])) {`
`@@ -291,15 +291,15 @@ public static function stream(iterable $responses, float $timeout = null): \Gene`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`if ($hasActivity) {`
`294`		`- $lastActivity = microtime(true);`
	`294`	`+ $lastActivity = hrtime(true) / 1E9;`
`295`	`295`	`continue;`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`if (-1 === self::select($multi, min($timeoutMin, $timeoutMax - $elapsedTimeout))) {`
`299`	`299`	`usleep(min(500, 1E6 * $timeoutMin));`
`300`	`300`	`}`
`301`	`301`
`302`		`- $elapsedTimeout = microtime(true) - $lastActivity;`
	`302`	`+ $elapsedTimeout = hrtime(true) / 1E9 - $lastActivity;`
`303`	`303`	`}`
`304`	`304`	`}`
`305`	`305`	`}`