diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Cache] Lock-less FilesystemAdapter

Browse Source
This commit is contained in:
Nicolas Grekas 2016-05-08 00:04:41 +02:00
parent b85ab60b70
commit 53b1ee52a2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
View File

@ -63,9 +63,7 @@ class FilesystemAdapter extends AbstractAdapter
if (!$h = @fopen($file, 'rb')) { if (!$h = @fopen($file, 'rb')) {
continue; continue;
} }
flock($h, LOCK_SH);
if ($now >= (int) $expiresAt = fgets($h)) { if ($now >= (int) $expiresAt = fgets($h)) {
flock($h, LOCK_UN);
fclose($h); fclose($h);
if (isset($expiresAt[0])) { if (isset($expiresAt[0])) {
@unlink($file); @unlink($file);
@ -73,7 +71,6 @@ class FilesystemAdapter extends AbstractAdapter
} else { } else {
$i = rawurldecode(rtrim(fgets($h))); $i = rawurldecode(rtrim(fgets($h)));
$value = stream_get_contents($h); $value = stream_get_contents($h);
flock($h, LOCK_UN);
fclose($h); fclose($h);
if ($i === $id) { if ($i === $id) {
$values[$id] = unserialize($value); $values[$id] = unserialize($value);
@ -130,6 +127,7 @@ class FilesystemAdapter extends AbstractAdapter
{ {
$ok = true; $ok = true;
$expiresAt = $lifetime ? time() + $lifetime : PHP_INT_MAX; $expiresAt = $lifetime ? time() + $lifetime : PHP_INT_MAX;
$tmp = $this->directory.uniqid('', true);
foreach ($values as $id => $value) { foreach ($values as $id => $value) {
$file = $this->getFile($id); $file = $this->getFile($id);
@ -138,8 +136,9 @@ class FilesystemAdapter extends AbstractAdapter
@mkdir($dir, 0777, true); @mkdir($dir, 0777, true);
} }
$value = $expiresAt."\n".rawurlencode($id)."\n".serialize($value); $value = $expiresAt."\n".rawurlencode($id)."\n".serialize($value);
if (false !== @file_put_contents($file, $value, LOCK_EX)) { if (false !== @file_put_contents($tmp, $value)) {
@touch($file, $expiresAt); @touch($tmp, $expiresAt);
$ok = @rename($tmp, $file) && $ok;
} else { } else {
$ok = false; $ok = false;
} }