Reset Key lifetime time in semaphore

jderusse · jderusse · commit cac6c15eb317 · 2020-10-15T12:06:25.000+02:00
diff --git a/src/Symfony/Component/Semaphore/Key.php b/src/Symfony/Component/Semaphore/Key.php
@@ -80,6 +80,11 @@ public function getState(string $stateKey)
         return $this->state[$stateKey];
     }
 
+    public function resetLifetime(): void
+    {
+        $this->expiringTime = null;
+    }
+
     public function reduceLifetime(float $ttlInSeconds)
     {
         $newTime = microtime(true) + $ttlInSeconds;
diff --git a/src/Symfony/Component/Semaphore/Semaphore.php b/src/Symfony/Component/Semaphore/Semaphore.php
@@ -66,6 +66,7 @@ public function __destruct()
     public function acquire(): bool
     {
         try {
+            $this->key->resetLifetime();
             $this->store->save($this->key, $this->ttlInSecond);
             $this->key->reduceLifetime($this->ttlInSecond);
             $this->dirty = true;
@@ -97,6 +98,7 @@ public function refresh(?float $ttlInSecond = null)
         }
 
         try {
+            $this->key->resetLifetime();
             $this->store->putOffExpiration($this->key, $ttlInSecond);
             $this->key->reduceLifetime($ttlInSecond);
 
diff --git a/src/Symfony/Component/Semaphore/Tests/SemaphoreTest.php b/src/Symfony/Component/Semaphore/Tests/SemaphoreTest.php
@@ -252,4 +252,21 @@ public function testExpiration()
         $semaphore = new Semaphore($key, $store);
         $this->assertTrue($semaphore->isExpired());
     }
+
+    public function testExpirationResetAfter()
+    {
+        $store = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
+
+        $key = new Key('key', 1);
+        $semaphore = new Semaphore($key, $store, 0.1);
+
+        $semaphore->acquire();
+        $this->assertFalse($semaphore->isExpired());
+        $semaphore->release();
+
+        usleep(100001);
+
+        $semaphore->acquire();
+        $this->assertFalse($semaphore->isExpired());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,11 @@ public function getState(string $stateKey)`
`80`	`80`	`return $this->state[$stateKey];`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ public function resetLifetime(): void`
	`84`	`+ {`
	`85`	`+ $this->expiringTime = null;`
	`86`	`+ }`
	`87`	`+`
`83`	`88`	`public function reduceLifetime(float $ttlInSeconds)`
`84`	`89`	`{`
`85`	`90`	`$newTime = microtime(true) + $ttlInSeconds;`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public function __destruct()`
`66`	`66`	`public function acquire(): bool`
`67`	`67`	`{`
`68`	`68`	`try {`
	`69`	`+ $this->key->resetLifetime();`
`69`	`70`	`$this->store->save($this->key, $this->ttlInSecond);`
`70`	`71`	`$this->key->reduceLifetime($this->ttlInSecond);`
`71`	`72`	`$this->dirty = true;`
`@@ -97,6 +98,7 @@ public function refresh(?float $ttlInSecond = null)`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`try {`
	`101`	`+ $this->key->resetLifetime();`
`100`	`102`	`$this->store->putOffExpiration($this->key, $ttlInSecond);`
`101`	`103`	`$this->key->reduceLifetime($ttlInSecond);`
`102`	`104`