Skip to content

Fixes #222: Check available() before calling blocking read #237

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
xerial merged 2 commits into from
May 28, 2015
Merged

Fixes #222: Check available() before calling blocking read #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16a38b0
Fixes #222: Check whthere available() == 0 before calling blocking re…
xerial May 25, 2015
af428de
Use partial read results to avoid I/O block when reading at the end o…
xerial May 25, 2015
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
20 changes: 6 additions & 14 deletions msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,13 @@ public MessageBuffer next() throws IOException {
if(reachedEOF)
return null;

byte[] buffer = null;
int cursor = 0;
while(!reachedEOF && cursor < bufferSize) {
if(buffer == null)
buffer = new byte[bufferSize];

int readLen = in.read(buffer, cursor, bufferSize - cursor);
if(readLen == -1) {
reachedEOF = true;
break;
}
cursor += readLen;
byte[] buffer = new byte[bufferSize];
int readLen = in.read(buffer);
if(readLen == -1) {
reachedEOF = true;
return null;
}

return buffer == null ? null : MessageBuffer.wrap(buffer).slice(0, cursor);
return MessageBuffer.wrap(buffer).slice(0, readLen);
}

@Override
Expand Down
32 changes: 29 additions & 3 deletions msgpack-core/src/test/scala/org/msgpack/core/buffer/MessageBufferInputTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package org.msgpack.core.buffer

import org.msgpack.core.{MessageUnpacker, MessagePack, MessagePackSpec}
import java.io._
import xerial.core.io.IOUtil
import xerial.core.io.IOUtil._
import scala.util.Random
import java.util.zip.{GZIPOutputStream, GZIPInputStream}
import java.nio.ByteBuffer
import org.msgpack.unpacker.MessagePackUnpacker


/**
* Created on 5/30/14.
Expand Down Expand Up @@ -49,7 +49,7 @@ class MessageBufferInputTest extends MessagePackSpec {
val tmp = File.createTempFile("testbuf", ".dat", new File("target"))
tmp.getParentFile.mkdirs()
tmp.deleteOnExit()
IOUtil.withResource(new FileOutputStream(tmp)) { out =>
withResource(new FileOutputStream(tmp)) { out =>
out.write(b)
}
tmp
Expand Down Expand Up @@ -135,6 +135,32 @@ class MessageBufferInputTest extends MessagePackSpec {
buf.reset(in1)
readInt(buf) shouldBe 42
}

"be non-blocking" taggedAs("non-blocking") in {

withResource(new PipedOutputStream()) { pipedOutputStream =>
withResource(new PipedInputStream()) { pipedInputStream =>
pipedInputStream.connect(pipedOutputStream)

val packer = MessagePack.newDefaultPacker(pipedOutputStream)
.packArrayHeader(2)
.packLong(42)
.packString("hello world")

packer.flush

val unpacker = MessagePack.newDefaultUnpacker(pipedInputStream)
unpacker.hasNext() shouldBe true
unpacker.unpackArrayHeader() shouldBe 2
unpacker.unpackLong() shouldBe 42L
unpacker.unpackString() shouldBe "hello world"

packer.close
unpacker.close
}
}
}

}

"ChannelBufferInput" should {
Expand Down