php/archived-php-sdk-binary-tools
1
0
Fork 0
mirror of https://github.com/php/php-sdk-binary-tools.git synced 2026-03-23 23:22:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor lock also wrt shared/exclusive

Browse Source
This commit is contained in:
Anatol Belski
2017-09-15 10:36:13 +02:00
parent 098f6457de
commit 97112e4dd0
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/php/libsdk/SDK/Lock.php
View File

@@ -17,8 +17,6 @@ class Lock
$hash = hash("sha256", $tag);
$this->fn = Config::getTmpDir() . DIRECTORY_SEPARATOR . $hash . ".lock";
$this->fd = fopen($this->fn, "wb");
if ($auto) {
if ($autoShared) {
$this->shared();
@@ -28,6 +26,15 @@ class Lock
}
}/*}}}*/
public function __destruct()
{/*{{{*/
$this->unlock();
/* We don't really know no one else waits on the same lock yet.*/
/*if (file_exists($this->fn) && !$this->shared) {
@unlink($this->fn);
}*/
}/*}}}*/
public function shared(bool $block = false) : bool
{/*{{{*/
$flags = LOCK_SH;
@@ -55,16 +62,27 @@ class Lock
return true;
}
$this->locked = flock($this->fd, $flags, $this->wouldBlock);
$this->shared = $flags & LOCK_SH;
if ($this->shared) {
$this->fd = fopen($this->fn, "rb");
} else {
$this->fd = fopen($this->fn, "wb");
}
$this->locked = flock($this->fd, $flags, $this->wouldBlock);
return $this->locked;
}/*}}}*/
public function unlock() : bool
{/*{{{*/
if ($this->locked) {
return $this->doLock(LOCK_UN);
if (!$this->locked) {
return true;
}
$this->doLock(LOCK_UN);
fclose($this->fd);
$this->fd = NULL;
return $this->locked;
}/*}}}*/
@@ -77,17 +95,6 @@ class Lock
{/*{{{*/
return 1 === $this->wouldBlock;
}/*}}}*/
public function __destruct()
{/*{{{*/
$this->unlock();
fclose($this->fd);
/* We don't really know no one else waits on the same lock yet.*/
/*if (file_exists($this->fn) && !$this->shared) {
@unlink($this->fn);
}*/
}/*}}}*/
}
/*