bug #34181 [Stopwatch] Fixed bug in getDuration when counting multiple ongoing periods (TimoBakx)

fabpot · fabpot · commit 9162892fd4bf · 2019-11-03T18:17:59.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Stopwatch] Fixed bug in getDuration when counting multiple ongoing periods | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34087 | License | MIT | Doc PR | N/A When running multiple periods in StopwatchEvent (start multiple times and not stop them all), the getDuration() method would return unexpected values. This was because at every stop, the last entry in the `started` array was removed, while the `getDuration` method was still expecting all the started events to still be there. Now, when calling `getDuration`, the duration of all the finished periods are added together with the unfinished counts. Commits ------- af00d8d [Stopwatch] Fixed bug in getDuration when counting multiple ongoing periods
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -185,12 +185,10 @@ public function getEndTime()
     public function getDuration()
     {
         $periods = $this->periods;
-        $stopped = \count($periods);
-        $left = \count($this->started) - $stopped;
+        $left = \count($this->started);
 
-        for ($i = 0; $i < $left; ++$i) {
-            $index = $stopped + $i;
-            $periods[] = new StopwatchPeriod($this->started[$index], $this->getNow(), $this->morePrecision);
+        for ($i = $left - 1; $i >= 0; --$i) {
+            $periods[] = new StopwatchPeriod($this->started[$i], $this->getNow(), $this->morePrecision);
         }
 
         $total = 0;
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -99,8 +99,25 @@ public function testDurationBeforeStop()
         $event->stop();
         usleep(50000);
         $event->start();
-        usleep(100000);
         $this->assertEqualsWithDelta(100, $event->getDuration(), self::DELTA);
+        usleep(100000);
+        $this->assertEqualsWithDelta(200, $event->getDuration(), self::DELTA);
+    }
+
+    public function testDurationWithMultipleStarts()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(100000);
+        $event->start();
+        usleep(100000);
+        $this->assertEqualsWithDelta(300, $event->getDuration(), self::DELTA);
+        $event->stop();
+        $this->assertEqualsWithDelta(300, $event->getDuration(), self::DELTA);
+        usleep(100000);
+        $this->assertEqualsWithDelta(400, $event->getDuration(), self::DELTA);
+        $event->stop();
+        $this->assertEqualsWithDelta(400, $event->getDuration(), self::DELTA);
     }
 
     public function testStopWithoutStart()

Original file line number	Diff line number	Diff line change
`@@ -185,12 +185,10 @@ public function getEndTime()`
`185`	`185`	`public function getDuration()`
`186`	`186`	`{`
`187`	`187`	`$periods = $this->periods;`
`188`		`- $stopped = \count($periods);`
`189`		`- $left = \count($this->started) - $stopped;`
	`188`	`+ $left = \count($this->started);`
`190`	`189`
`191`		`- for ($i = 0; $i < $left; ++$i) {`
`192`		`- $index = $stopped + $i;`
`193`		`- $periods[] = new StopwatchPeriod($this->started[$index], $this->getNow(), $this->morePrecision);`
	`190`	`+ for ($i = $left - 1; $i >= 0; --$i) {`
	`191`	`+ $periods[] = new StopwatchPeriod($this->started[$i], $this->getNow(), $this->morePrecision);`
`194`	`192`	`}`
`195`	`193`
`196`	`194`	`$total = 0;`