Skip to content

Remove side effect of unpacker benchmark #384

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
frsyuki merged 1 commit into from
Aug 12, 2016
Merged

Remove side effect of unpacker benchmark #384

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
36 changes: 17 additions & 19 deletions msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ class MessageUnpackerTest extends MessagePackSpec {

val data = testData3(10000)
val N = 100
val bb = ByteBuffer.allocate(data.length)
bb.put(data).flip()
val db = ByteBuffer.allocateDirect(data.length)
db.put(data).flip()

val t = time("skip performance", repeat = N) {
block("v6") {
Expand All @@ -393,15 +397,11 @@ class MessageUnpackerTest extends MessagePackSpec {

block("v7-array-buffer") {
new Fixture {
val bb = ByteBuffer.allocate(data.length)
bb.put(data).flip()
override val unpacker = MessagePack.newDefaultUnpacker(bb)
}.run
}
if (!universal) block("v7-direct-buffer") {
new Fixture {
val db = ByteBuffer.allocateDirect(data.length)
db.put(data).flip()
override val unpacker = MessagePack.newDefaultUnpacker(db)
}.run
}
Expand Down Expand Up @@ -493,6 +493,11 @@ class MessageUnpackerTest extends MessagePackSpec {

val data = testData3(10000)
val N = 100
val bb = ByteBuffer.allocate(data.length)
bb.put(data).flip()
val db = ByteBuffer.allocateDirect(data.length)
db.put(data).flip()

val t = time("unpack performance", repeat = N) {
block("v6") {
val v6 = new org.msgpack.MessagePack()
Expand All @@ -517,16 +522,12 @@ class MessageUnpackerTest extends MessagePackSpec {

block("v7-array-buffer") {
new Fixture {
val bb = ByteBuffer.allocate(data.length)
bb.put(data).flip()
override val unpacker = MessagePack.newDefaultUnpacker(bb)
}.run
}

if (!universal) block("v7-direct-buffer") {
new Fixture {
val db = ByteBuffer.allocateDirect(data.length)
db.put(data).flip()
override val unpacker = MessagePack.newDefaultUnpacker(db)
}.run
}
Expand Down Expand Up @@ -580,6 +581,11 @@ class MessageUnpackerTest extends MessagePackSpec {
}
}
val b = bos.toByteArray
val bb = ByteBuffer.allocate(b.length)
bb.put(b).flip()
val db = ByteBuffer.allocateDirect(b.length)
db.put(b).flip()

time("unpackBinary", repeat = 100) {
block("v6") {
val v6 = new org.msgpack.MessagePack()
Expand All @@ -601,17 +607,13 @@ class MessageUnpackerTest extends MessagePackSpec {

block("v7-array-buffer") {
new Fixture {
val bb = ByteBuffer.allocate(b.length)
bb.put(b).flip()
override val unpacker = MessagePack.newDefaultUnpacker(bb)
override val loop = R
}.run
}

if (!universal) block("v7-direct-buffer") {
new Fixture {
val db = ByteBuffer.allocateDirect(b.length)
db.put(b).flip()
override val unpacker = MessagePack.newDefaultUnpacker(db)
override val loop = R
}.run
Expand All @@ -621,25 +623,21 @@ class MessageUnpackerTest extends MessagePackSpec {
new Fixture {
override val unpacker = MessagePack.newDefaultUnpacker(b)
override val loop = R
}.run
}.runRef
}

block("v7-ref-array-buffer") {
new Fixture {
val bb = ByteBuffer.allocate(b.length)
bb.put(b).flip()
override val unpacker = MessagePack.newDefaultUnpacker(bb)
override val loop = R
}.run
}.runRef
}

if (!universal) block("v7-ref-direct-buffer") {
new Fixture {
val db = ByteBuffer.allocateDirect(b.length)
db.put(b).flip()
override val unpacker = MessagePack.newDefaultUnpacker(db)
override val loop = R
}.run
}.runRef
}
}
}
Expand Down