mirror_php/parallel
1
0
Fork 0
mirror of https://github.com/amphp/parallel.git synced 2025-07-25 07:21:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attach last error to exception message

Browse Source 
Also related to #100.
This commit is contained in:
Aaron Piotrowski
2020-03-04 11:08:07 -06:00
parent 6e310d0219
commit 21a674ab0c
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Sync/SharedMemoryParcel.php
View File

@@ -5,6 +5,7 @@ namespace Amp\Parallel\Sync;
use Amp\Failure;
use Amp\Promise;
use Amp\Success;
use Amp\Sync\Lock;
use Amp\Sync\PosixSemaphore;
use Amp\Sync\SyncException;
use function Amp\call;
@@ -229,7 +230,7 @@ final class SharedMemoryParcel implements Parcel
public function synchronized(callable $callback): Promise
{
return call(function () use ($callback): \Generator {
/** @var \Amp\Sync\Lock $lock */
/** @var Lock $lock */
$lock = yield $this->semaphore->acquire();
try {
@@ -356,7 +357,10 @@ final class SharedMemoryParcel implements Parcel
{
$handle = @\shmop_open($key, $mode, $permissions, $size);
if ($handle === false) {
throw new SharedMemoryException('Failed to create shared memory block');
$error = \error_get_last();
throw new SharedMemoryException(
'Failed to create shared memory block: ' . ($error['message'] ?? 'unknown error')
);
}
$this->handle = $handle;
}
@@ -375,7 +379,10 @@ final class SharedMemoryParcel implements Parcel
{
$data = \shmop_read($this->handle, $offset, $size);
if ($data === false) {
throw new SharedMemoryException('Failed to read from shared memory block');
$error = \error_get_last();
throw new SharedMemoryException(
'Failed to read from shared memory block: ' . ($error['message'] ?? 'unknown error')
);
}
return $data;
}
@@ -391,7 +398,10 @@ final class SharedMemoryParcel implements Parcel
private function memSet(int $offset, string $data): void
{
if (!\shmop_write($this->handle, $data, $offset)) {
throw new SharedMemoryException('Failed to write to shared memory block');
$error = \error_get_last();
throw new SharedMemoryException(
'Failed to write to shared memory block: ' . ($error['message'] ?? 'unknown error')
);
}
}
@@ -403,7 +413,10 @@ final class SharedMemoryParcel implements Parcel
private function memDelete(): void
{
if (!\shmop_delete($this->handle)) {
throw new SharedMemoryException('Failed to discard shared memory block');
$error = \error_get_last();
throw new SharedMemoryException(
'Failed to discard shared memory block' . ($error['message'] ?? 'unknown error')
);
}
}

18
test/Sync/SharedMemoryParcelTest.php
View File

@@ -5,6 +5,7 @@ namespace Amp\Parallel\Test\Sync;
use Amp\Delayed;
use Amp\Parallel\Context\Process;
use Amp\Parallel\Sync\Parcel;
use Amp\Parallel\Sync\SharedMemoryException;
use Amp\Parallel\Sync\SharedMemoryParcel;
use Amp\Sync\SyncException;
@@ -87,4 +88,21 @@ class SharedMemoryParcelTest extends AbstractParcelTest
SharedMemoryParcel::use('invalid');
}
public function testDoubleCreate(): void
{
$this->expectException(SyncException::class);
$this->expectExceptionMessage('A semaphore with that ID already exists');
$parcel1 = SharedMemoryParcel::create(self::ID, 42);
$parcel2 = SharedMemoryParcel::create(self::ID, 42);
}
public function testTooBig(): void
{
$this->expectException(SharedMemoryException::class);
$this->expectExceptionMessage('Failed to create shared memory block');
SharedMemoryParcel::create(self::ID, 42, 1 << 30);
}
}