Skip to content

Fix a bug ChannelBufferInput#next blocks until the buffer is filled #428

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 4 commits into from
Jul 11, 2017
Merged

Fix a bug ChannelBufferInput#next blocks until the buffer is filled #428

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60ddba3
Fix a bug ChannelBufferInput#next blocks until the buffer is filled
komamitsu Jun 22, 2017
c52d806
Don't need to consider the case ReadableByteChannel#read returns 0
komamitsu Jun 24, 2017
323a5c3
Add a unit test
komamitsu Jun 24, 2017
fdddf49
Remove unused `import`s
komamitsu Jun 24, 2017
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
Prev Previous commit
Next Next commit
Add a unit test
  • Loading branch information
@komamitsu
komamitsu committed Jul 4, 2017
commit 323a5c3cf268a2de07657dc99a66ce5c6d0c4b77
44 changes: 44 additions & 0 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 @@ -16,12 +16,17 @@
package org.msgpack.core.buffer

import java.io._
import java.net.{InetSocketAddress, ServerSocket, Socket}
import java.nio.ByteBuffer
import java.nio.channels.{ServerSocketChannel, SocketChannel}
import java.util.concurrent
import java.util.concurrent.{Callable, Executors, TimeUnit}
import java.util.zip.{GZIPInputStream, GZIPOutputStream}

import org.msgpack.core.{MessagePack, MessagePackSpec, MessageUnpacker}
import xerial.core.io.IOUtil._

import scala.concurrent.Future
import scala.util.Random

class MessageBufferInputTest
Expand Down Expand Up @@ -201,5 +206,44 @@ class MessageBufferInputTest
buf.reset(in1)
readInt(buf) shouldBe 42
}

"unpack without blocking" in {
val server = ServerSocketChannel.open.bind(new InetSocketAddress("localhost", 0))
val executorService = Executors.newCachedThreadPool

try {
executorService.execute(new Runnable {
override def run {
val server_ch = server.accept
val packer = MessagePack.newDefaultPacker(server_ch)
packer.packString("0123456789")
packer.flush
// Keep the connection open
while (!executorService.isShutdown) {
TimeUnit.SECONDS.sleep(1)
}
packer.close
}
})

val future = executorService.submit(new Callable[String] {
override def call: String = {
val conn_ch = SocketChannel.open(new InetSocketAddress("localhost", server.socket.getLocalPort))
val unpacker = MessagePack.newDefaultUnpacker(conn_ch)
val s = unpacker.unpackString
unpacker.close
s
}
})

future.get(5, TimeUnit.SECONDS) shouldBe "0123456789"
}
finally {
executorService.shutdown
if (!executorService.awaitTermination(5, TimeUnit.SECONDS)) {
executorService.shutdownNow
}
}
}
}
}