danog/parallel
1
0
Fork 0
mirror of https://github.com/danog/parallel.git synced 2024-11-26 20:34:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix semaphores sometimes not removed after termination

Browse Source
This commit is contained in:
coderstephen 2015-07-10 18:24:58 -05:00
parent e9f09077c9
commit b0e19519d0
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Forking/ForkContext.php
View File

@ -87,7 +87,8 @@ abstract class ForkContext extends Synchronized implements ContextInterface
// Get the fatal exception from the process.
return $this->parentSocket->read(2)->then(function ($data) {
list($serializedLength) = unpack('S', $data);
$serializedLength = unpack('S', $data);
$serializedLength = $serializedLength[1];
return $this->parentSocket->read($serializedLength);
})->then(function ($data) {
$previous = unserialize($data);
@ -162,4 +163,15 @@ abstract class ForkContext extends Synchronized implements ContextInterface
* {@inheritdoc}
*/
abstract public function run();
public function __destruct()
{
parent::__destruct();
// The parent process outlives the child process, so don't destroy the
// semaphore until the parent exits.
if (!$this->isChild) {
$this->semaphore->destroy();
}
}
}

2
src/Forking/Synchronized.php
View File

@ -15,7 +15,7 @@ abstract class Synchronized
{
private $memoryBlock;
private $memoryKey;
private $semaphore;
protected $semaphore;
/**
* Creates a new synchronized object.