feature #43576 [Messenger] subtract handling time from sleep time in worker (nicolas-grekas)

fabpot · fabpot · commit 2d0a08b45cdd · 2021-10-19T15:39:45.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Messenger] subtract handling time from sleep time in worker | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- da79946 [Messenger] subtract handling time from sleep time in worker
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
@@ -87,6 +87,7 @@ public function run(array $options = []): void
 
         while (false === $this->shouldStop) {
             $envelopeHandled = false;
+            $envelopeHandledStart = microtime(true);
             foreach ($this->receivers as $transportName => $receiver) {
                 if ($queueNames) {
                     $envelopes = $receiver->getFromQueues($queueNames);
@@ -113,10 +114,12 @@ public function run(array $options = []): void
                 }
             }
 
-            if (false === $envelopeHandled) {
+            if (!$envelopeHandled) {
                 $this->dispatchEvent(new WorkerRunningEvent($this, true));
 
-                usleep($options['sleep']);
+                if (0 < $sleep = (int) ($options['sleep'] - 1e6 * (microtime(true) - $envelopeHandledStart))) {
+                    usleep($sleep);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ public function run(array $options = []): void`
`87`	`87`
`88`	`88`	`while (false === $this->shouldStop) {`
`89`	`89`	`$envelopeHandled = false;`
	`90`	`+ $envelopeHandledStart = microtime(true);`
`90`	`91`	`foreach ($this->receivers as $transportName => $receiver) {`
`91`	`92`	`if ($queueNames) {`
`92`	`93`	`$envelopes = $receiver->getFromQueues($queueNames);`
`@@ -113,10 +114,12 @@ public function run(array $options = []): void`
`113`	`114`	`}`
`114`	`115`	`}`
`115`	`116`
`116`		`- if (false === $envelopeHandled) {`
	`117`	`+ if (!$envelopeHandled) {`
`117`	`118`	`$this->dispatchEvent(new WorkerRunningEvent($this, true));`
`118`	`119`
`119`		`- usleep($options['sleep']);`
	`120`	`+ if (0 < $sleep = (int) ($options['sleep'] - 1e6 * (microtime(true) - $envelopeHandledStart))) {`
	`121`	`+ usleep($sleep);`
	`122`	`+ }`
`120`	`123`	`}`
`121`	`124`	`}`
`122`	`125`