danog/file
1
0
Fork 0
mirror of https://github.com/danog/file.git synced 2024-11-30 04:19:39 +01:00
Code Issues Projects Releases Wiki Activity

Update for amphp/parallel v2.0

Browse Source
This commit is contained in:
Aaron Piotrowski 2023-02-18 09:49:06 -06:00
parent bac8157738
commit de1f4c1e08
No known key found for this signature in database
GPG Key ID: 5B456E6AABA44A63
6 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -44,14 +44,12 @@
"amphp/phpunit-util": "^3",
"phpunit/phpunit": "^9",
"psalm/phar": "^5.4",
"amphp/php-cs-fixer-config": "^2-dev"
"amphp/php-cs-fixer-config": "^2"
},
"suggest": {
"ext-eio": "^2 || ^3",
"ext-uv": "^0.3 || ^0.2"
},
"minimum-stability": "beta",
"prefer-stable": true,
"autoload": {
"psr-4": {
"Amp\\File\\": "src"

4
src/Driver/ParallelFilesystemDriver.php
View File

@ -67,7 +67,7 @@ final class ParallelFilesystemDriver implements FilesystemDriver
$this->pendingWorker->await(); // Wait for any currently pending request for a worker.
if ($this->workerStorage->count() < $this->workerLimit) {
$this->pendingWorker = async(fn () => $this->pool->getWorker());
$this->pendingWorker = async($this->pool->getWorker(...));
$worker = $this->pendingWorker->await();
if ($this->workerStorage->contains($worker)) {
@ -188,7 +188,7 @@ final class ParallelFilesystemDriver implements FilesystemDriver
private function runFileTask(Internal\FileTask $task): mixed
{
try {
return $this->pool->submit($task)->getResult()->await();
return $this->pool->submit($task)->await();
} catch (TaskFailureThrowable $exception) {
throw new FilesystemException("The file operation failed", $exception);
} catch (WorkerException $exception) {

28
src/Internal/FileTask.php
View File

@ -4,8 +4,8 @@ namespace Amp\File\Internal;
use Amp\ByteStream\ClosedException;
use Amp\ByteStream\StreamException;
use Amp\Cache\Cache;
use Amp\Cache\CacheException;
use Amp\Cache\LocalCache;
use Amp\Cancellation;
use Amp\File\Driver\BlockingFile;
use Amp\File\Driver\BlockingFilesystemDriver;
@ -16,19 +16,14 @@ use Amp\Sync\Channel;
/**
* @codeCoverageIgnore
* @internal
* @implements Task<mixed, never, never, BlockingFile>
* @implements Task<mixed, never, never>
*/
final class FileTask implements Task
{
private static ?LocalCache $cache = null;
private static ?BlockingFilesystemDriver $driver = null;
private const ENV_PREFIX = "amphp/file#";
private static function makeId(int $id): string
{
return self::ENV_PREFIX . $id;
}
/**
* @param int|null $id File ID.
*
@ -50,19 +45,20 @@ final class FileTask implements Task
* @throws ClosedException
* @throws StreamException
*/
public function run(Channel $channel, Cache $cache, Cancellation $cancellation): mixed
public function run(Channel $channel, Cancellation $cancellation): mixed
{
self::$driver ??= new BlockingFilesystemDriver();
$cache = self::$cache ??= new LocalCache();
$driver = self::$driver ??= new BlockingFilesystemDriver();
if ('f' === $this->operation[0]) {
if ("fopen" === $this->operation) {
$file = self::$driver->openFile(...$this->args);
$file = $driver->openFile(...$this->args);
$size = self::$driver->getStatus($file->getPath())["size"]
$size = $driver->getStatus($file->getPath())["size"]
?? throw new FilesystemException("Could not determine file size");
$id = $file->getId();
$cache->set(self::makeId($id), $file);
$cache->set((string) $id, $file);
return [$id, $size, $file->getMode()];
}
@ -71,7 +67,7 @@ final class FileTask implements Task
throw new FilesystemException("No file ID provided");
}
$id = self::makeId($this->id);
$id = (string) $this->id;
$file = $cache->get($id);
if ($file === null) {
@ -128,7 +124,7 @@ final class FileTask implements Task
case "touch":
case "read":
case "write":
return self::$driver->{$this->operation}(...$this->args);
return $driver->{$this->operation}(...$this->args);
default:
throw new \Error("Invalid operation - " . $this->operation);

2
src/Internal/FileWorker.php
View File

@ -38,7 +38,7 @@ final class FileWorker
public function execute(Task $task, ?Cancellation $cancellation = null): mixed
{
return $this->worker->submit($task, $cancellation)->getResult()->await();
return $this->worker->submit($task, $cancellation)->await();
}
public function shutdown(): void

4
test/Driver/ParallelFileTest.php
View File

@ -5,7 +5,7 @@ namespace Amp\File\Test\Driver;
use Amp\File;
use Amp\File\Driver\ParallelFilesystemDriver;
use Amp\File\Test\AsyncFileTest;
use Amp\Parallel\Worker\DefaultWorkerPool;
use Amp\Parallel\Worker\ContextWorkerPool;
use Amp\Parallel\Worker\WorkerPool;
class ParallelFileTest extends AsyncFileTest
@ -16,7 +16,7 @@ class ParallelFileTest extends AsyncFileTest
protected function createDriver(int $workerLimit = self::DEFAULT_WORKER_LIMIT): File\FilesystemDriver
{
$this->pool = new DefaultWorkerPool();
$this->pool = new ContextWorkerPool();
return new ParallelFilesystemDriver($this->pool, $workerLimit);
}

4
test/Driver/ParallelFilesystemDriverTest.php
View File

@ -5,7 +5,7 @@ namespace Amp\File\Test\Driver;
use Amp\File;
use Amp\File\Driver\ParallelFilesystemDriver;
use Amp\File\Test\FilesystemDriverTest;
use Amp\Parallel\Worker\DefaultWorkerPool;
use Amp\Parallel\Worker\ContextWorkerPool;
use Amp\Parallel\Worker\WorkerPool;
class ParallelFilesystemDriverTest extends FilesystemDriverTest
@ -14,7 +14,7 @@ class ParallelFilesystemDriverTest extends FilesystemDriverTest
protected function createDriver(): File\FilesystemDriver
{
$this->pool = new DefaultWorkerPool();
$this->pool = new ContextWorkerPool();
return new ParallelFilesystemDriver($this->pool);
}