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

Seeking should not set the ParallelHandle to busy

Browse Source
This commit is contained in:
Bob Weinand 2017-07-06 13:46:23 +02:00 committed by GitHub
parent edc6c097c2
commit ddc3278313
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ParallelHandle.php
View File

@ -96,7 +96,7 @@ class ParallelHandle implements Handle {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function eof(): bool { public function eof(): bool {
return ($this->pendingWrites > 0) ? false : ($this->size <= $this->position); return $this->pendingWrites > 0 && $this->size <= $this->position;
} }
public function read(int $length = self::DEFAULT_READ_LENGTH): Promise { public function read(int $length = self::DEFAULT_READ_LENGTH): Promise {
@ -197,8 +197,6 @@ class ParallelHandle implements Handle {
} }
private function doSeek(int $offset, int $whence) { private function doSeek(int $offset, int $whence) {
$this->busy = true;
switch ($whence) { switch ($whence) {
case \SEEK_SET: case \SEEK_SET:
case \SEEK_CUR: case \SEEK_CUR:
@ -217,8 +215,6 @@ class ParallelHandle implements Handle {
throw new StreamException('Seeking in the file failed.', 0, $exception); throw new StreamException('Seeking in the file failed.', 0, $exception);
} catch (WorkerException $exception) { } catch (WorkerException $exception) {
throw new StreamException("Sending the task to the worker failed", 0, $exception); throw new StreamException("Sending the task to the worker failed", 0, $exception);
} finally {
$this->busy = false;
} }
default: default: