Skip to content

Fixed double-writes when write() is called during 'drain' event #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cboden merged 1 commit into from
Oct 1, 2015
Merged

Fixed double-writes when write() is called during 'drain' event #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Buffer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ public function handleWrite()
}

$len = strlen($this->data);
$this->data = (string) substr($this->data, $sent);

if ($len >= $this->softLimit && $len - $sent < $this->softLimit) {
$this->emit('drain', [$this]);
}

$this->data = (string) substr($this->data, $sent);

if (0 === strlen($this->data)) {
$this->loop->removeWriteStream($this->stream);
$this->listening = false;
Expand Down
30 changes: 30 additions & 0 deletions tests/BufferTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,36 @@ public function testDrain()
$buffer->write("bar\n");
}

/**
* @covers React\Stream\Buffer::write
* @covers React\Stream\Buffer::handleWrite
*/
public function testWriteInDrain()
{
$writeStreams = array();

$stream = fopen('php://temp', 'r+');
$loop = $this->createWriteableLoopMock();
$loop->preventWrites = true;

$buffer = new Buffer($stream, $loop);
$buffer->softLimit = 2;
$buffer->on('error', $this->expectCallableNever());

$buffer->once('drain', function ($buffer) {
$buffer->listening = false;
$buffer->write("bar\n");
});

$this->assertFalse($buffer->write("foo"));
$loop->preventWrites = false;
$buffer->listening = false;
Copy link
Member

@clue clue Jun 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I follow, are these assignments required only in the testing environment to prevent actual writes? Some background info and/or documentation would be much appreciated! 👍

Copy link
Contributor Author

@arnaud-lb arnaud-lb Jun 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I duplicated what testDrain() was doing; it does this to simulate a stream that's not immediately available for writes.

$buffer->write("\n");

fseek($stream, 0);
$this->assertSame("foo\nbar\n", stream_get_contents($stream));
}

/**
* @covers React\Stream\Buffer::end
*/
Expand Down