andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update NetUtilBenchmark (#7826)

Browse Source 
Motivation:
NetUtilBenchmark is using out of date data, throws an exception in the benchmark, and allocates a Set on each run.

Modifications:
- Update the benchmark and reduce each run's overhead

Result:
NetUtilBenchmark is updated.
This commit is contained in:
Scott Mitchell 2018-03-30 23:27:08 -07:00 committed by Norman Maurer
parent 8d78893a76
commit 9d51a40df0
1 changed files with 288 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

461
microbench/src/main/java/io/netty/microbenchmark/common/NetUtilBenchmark.java
View File

@ -17,10 +17,6 @@ package io.netty.microbenchmark.common;
import io.netty.microbench.util.AbstractMicrobenchmark;
import io.netty.util.NetUtil;
import java.util.HashMap;
import java.util.Map;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Threads;
@ -32,195 +28,314 @@ import org.openjdk.jmh.annotations.Warmup;
public class NetUtilBenchmark extends AbstractMicrobenchmark {
@Benchmark
public void useGetByNameIpv4() {
for (String testEntry : invalidIpV4Hosts.keySet()) {
if (NetUtil.getByName(testEntry, true) != null) {
throw new RuntimeException("error");
public int useGetByNameIpv4() {
int invalidCount = 0;
for (String testEntry : invalidIpV4Hosts) {
if (NetUtil.getByName(testEntry) == null) {
++invalidCount;
}
}
return invalidCount;
}
@Benchmark
public void useGetByNameIpv6() {
for (String testEntry : invalidIpV6Hosts.keySet()) {
if (NetUtil.getByName(testEntry, true) != null) {
throw new RuntimeException("error");
public int useGetByNameIpv6() {
int invalidCount = 0;
for (String testEntry : invalidIpV6Hosts) {
if (NetUtil.getByName(testEntry) == null) {
++invalidCount;
}
}
return invalidCount;
}
@Benchmark
public void useIsValidIpv6() {
for (String host : invalidIpV6Hosts.keySet()) {
if (NetUtil.isValidIpV6Address(host)) {
throw new RuntimeException("error");
public int useIsValidIpv6() {
int invalidCount = 0;
for (String host : invalidIpV6Hosts) {
if (!NetUtil.isValidIpV6Address(host)) {
++invalidCount;
}
}
return invalidCount;
}
@Benchmark
public void useIsValidIpv4() {
for (String host : invalidIpV4Hosts.keySet()) {
if (NetUtil.isValidIpV4Address(host)) {
throw new RuntimeException("error");
public int useIsValidIpv4() {
int invalidCount = 0;
for (String host : invalidIpV4Hosts) {
if (!NetUtil.isValidIpV4Address(host)) {
++invalidCount;
}
}
return invalidCount;
}
private static final Map<String, byte[]> invalidIpV4Hosts = new HashMap<String, byte[]>() {
private static final long serialVersionUID = 1299215199895717282L;
{
put("1.256.3.4", null);
put("256.0.0.1", null);
put("1.1.1.1.1", null);
put("x.255.255.255", null);
put("0.1:0.0", null);
put("0.1.0.0:", null);
put("127.0.0.", null);
put("1.2..4", null);
put("192.0.1", null);
put("192.0.1.1.1", null);
put("192.0.1.a", null);
put("19a.0.1.1", null);
put("a.0.1.1", null);
put(".0.1.1", null);
put("...", null);
}
private static final String[] invalidIpV4Hosts = {
"1.256.3.4",
"256.0.0.1",
"1.1.1.1.1",
"x.255.255.255",
"0.1:0.0",
"0.1.0.0:",
"127.0.0.",
"1.2..4",
"192.0.1",
"192.0.1.1.1",
"192.0.1.a",
"19a.0.1.1",
"a.0.1.1",
".0.1.1",
"127.0.0",
"192.0.1.256",
"0.0.200.259",
"1.1.-1.1",
"1.1. 1.1",
"1.1.1.1 ",
"1.1.+1.1",
"0.0x1.0.255",
"0.01x.0.255",
"0.x01.0.255",
"0.-.0.0",
"0..0.0",
"0.A.0.0",
"0.1111.0.0",
"..."
};
private static final Map<String, byte[]> invalidIpV6Hosts = new HashMap<String, byte[]>() {
private static final long serialVersionUID = -5870810805409009696L;
{
// Test method with garbage.
put("Obvious Garbage", null);
// Test method with preferred style, too many :
put("0:1:2:3:4:5:6:7:8", null);
// Test method with preferred style, not enough :
put("0:1:2:3:4:5:6", null);
// Test method with preferred style, bad digits.
put("0:1:2:3:4:5:6:x", null);
// Test method with preferred style, adjacent :
put("0:1:2:3:4:5:6::7", null);
// Too many : separators trailing
put("0:1:2:3:4:5:6:7::", null);
// Too many : separators leading
put("::0:1:2:3:4:5:6:7", null);
// Too many : separators trailing
put("1:2:3:4:5:6:7:", null);
// Too many : separators leading
put(":1:2:3:4:5:6:7", null);
// Too many : separators leading 0
put("0::1:2:3:4:5:6:7", null);
// Test method with preferred style, too many digits.
put("0:1:2:3:4:5:6:789abcdef", null);
// Test method with compressed style, bad digits.
put("0:1:2:3::x", null);
// Test method with compressed style, too many adjacent :
put("0:1:2:::3", null);
// Test method with compressed style, too many digits.
put("0:1:2:3::abcde", null);
// Test method with preferred style, too many :
put("0:1:2:3:4:5:6:7:8", null);
// Test method with compressed style, not enough :
put("0:1", null);
// Test method with ipv4 style, bad ipv6 digits.
put("0:0:0:0:0:x:10.0.0.1", null);
// Test method with ipv4 style, bad ipv4 digits.
put("0:0:0:0:0:0:10.0.0.x", null);
// Test method with ipv4 style, adjacent :
put("0:0:0:0:0::0:10.0.0.1", null);
// Test method with ipv4 style, too many ipv6 digits.
put("0:0:0:0:0:00000:10.0.0.1", null);
// Test method with ipv4 style, too many :
put("0:0:0:0:0:0:0:10.0.0.1", null);
// Test method with ipv4 style, not enough :
put("0:0:0:0:0:10.0.0.1", null);
// Test method with ipv4 style, too many .
put("0:0:0:0:0:0:10.0.0.0.1", null);
// Test method with ipv4 style, not enough .
put("0:0:0:0:0:0:10.0.1", null);
// Test method with ipv4 style, adjacent .
put("0:0:0:0:0:0:10..0.0.1", null);
// Test method with ipv4 style, leading .
put("0:0:0:0:0:0:.0.0.1", null);
// Test method with ipv4 style, leading .
put("0:0:0:0:0:0:.10.0.0.1", null);
// Test method with ipv4 style, trailing .
put("0:0:0:0:0:0:10.0.0.", null);
// Test method with ipv4 style, trailing .
put("0:0:0:0:0:0:10.0.0.1.", null);
// Test method with compressed ipv4 style, bad ipv6 digits.
put("::fffx:192.168.0.1", null);
// Test method with compressed ipv4 style, bad ipv4 digits.
put("::ffff:192.168.0.x", null);
// Test method with compressed ipv4 style, too many adjacent :
put(":::ffff:192.168.0.1", null);
// Test method with compressed ipv4 style, too many ipv6 digits.
put("::fffff:192.168.0.1", null);
// Test method with compressed ipv4 style, too many ipv4 digits.
put("::ffff:1923.168.0.1", null);
// Test method with compressed ipv4 style, not enough :
put(":ffff:192.168.0.1", null);
// Test method with compressed ipv4 style, too many .
put("::ffff:192.168.0.1.2", null);
// Test method with compressed ipv4 style, not enough .
put("::ffff:192.168.0", null);
// Test method with compressed ipv4 style, adjacent .
put("::ffff:192.168..0.1", null);
// Test method, garbage.
put("absolute, and utter garbage", null);
// Test method, bad ipv6 digits.
put("x:0:0:0:0:0:10.0.0.1", null);
// Test method, bad ipv4 digits.
put("0:0:0:0:0:0:x.0.0.1", null);
// Test method, too many ipv6 digits.
put("00000:0:0:0:0:0:10.0.0.1", null);
// Test method, too many ipv4 digits.
put("0:0:0:0:0:0:10.0.0.1000", null);
// Test method, too many :
put("0:0:0:0:0:0:0:10.0.0.1", null);
// Test method, not enough :
put("0:0:0:0:0:10.0.0.1", null);
// Test method, out of order trailing :
put("0:0:0:0:0:10.0.0.1:", null);
// Test method, out of order leading :
put(":0:0:0:0:0:10.0.0.1", null);
// Test method, out of order leading :
put("0:0:0:0::10.0.0.1:", null);
// Test method, out of order trailing :
put(":0:0:0:0::10.0.0.1", null);
// Test method, too many .
put("0:0:0:0:0:0:10.0.0.0.1", null);
// Test method, not enough .
put("0:0:0:0:0:0:10.0.1", null);
// Test method, adjacent .
put("0:0:0:0:0:0:10.0.0..1", null);
// Double compression symbol
put("::0::", null);
// Empty contents
put("", null);
// Trailing : (max number of : = 8)
put("2001:0:4136:e378:8000:63bf:3fff:fdd2:", null);
// Leading : (max number of : = 8)
put(":aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222", null);
// Invalid character
put("1234:2345:3456:4567:5678:6789::X890", null);
// Trailing . in IPv4
put("::ffff:255.255.255.255.", null);
// To many characters in IPv4
put("::ffff:0.0.1111.0", null);
// Test method, adjacent .
put("::ffff:0.0..0", null);
// Not enough IPv4 entries trailing .
put("::ffff:127.0.0.", null);
// Not enough IPv4 entries no trailing .
put("::ffff:1.2.4", null);
// Extra IPv4 entry
put("::ffff:192.168.0.1.255", null);
// Not enough IPv6 content
put(":ffff:192.168.0.1.255", null);
// Intermixed IPv4 and IPv6 symbols
put("::ffff:255.255:255.255.", null);
}
private static final String[] invalidIpV6Hosts = {
// Test method with garbage.
"Obvious Garbage",
// Test method with preferred style, too many :
"0:1:2:3:4:5:6:7:8",
// Test method with preferred style, not enough :
"0:1:2:3:4:5:6",
// Test method with preferred style, bad digits.
"0:1:2:3:4:5:6:x",
// Test method with preferred style, adjacent :
"0:1:2:3:4:5:6::7",
// Too many : separators trailing
"0:1:2:3:4:5:6:7::",
// Too many : separators leading
"::0:1:2:3:4:5:6:7",
// Too many : separators trailing
"1:2:3:4:5:6:7:",
// Too many : separators leading
":1:2:3:4:5:6:7",
// Compression with : separators trailing
"0:1:2:3:4:5::7:",
"0:1:2:3:4::7:",
"0:1:2:3::7:",
"0:1:2::7:",
"0:1::7:",
"0::7:",
// Compression at start with : separators trailing
"::0:1:2:3:4:5:7:",
"::0:1:2:3:4:7:",
"::0:1:2:3:7:",
"::0:1:2:7:",
"::0:1:7:",
"::7:",
// The : separators leading and trailing
":1:2:3:4:5:6:7:",
":1:2:3:4:5:6:",
":1:2:3:4:5:",
":1:2:3:4:",
":1:2:3:",
":1:2:",
":1:",
// Compression with : separators leading
":1::2:3:4:5:6:7",
":1::3:4:5:6:7",
":1::4:5:6:7",
":1::5:6:7",
":1::6:7",
":1::7",
":1:2:3:4:5:6::7",
":1:3:4:5:6::7",
":1:4:5:6::7",
":1:5:6::7",
":1:6::7",
":1::",
// Compression trailing with : separators leading
":1:2:3:4:5:6:7::",
":1:3:4:5:6:7::",
":1:4:5:6:7::",
":1:5:6:7::",
":1:6:7::",
":1:7::",
// Double compression
"1::2:3:4:5:6::",
"::1:2:3:4:5::6",
"::1:2:3:4:5:6::",
"::1:2:3:4:5::",
"::1:2:3:4::",
"::1:2:3::",
"::1:2::",
"::0::",
"12::0::12",
// Too many : separators leading 0
"0::1:2:3:4:5:6:7",
// Test method with preferred style, too many digits.
"0:1:2:3:4:5:6:789abcdef",
// Test method with compressed style, bad digits.
"0:1:2:3::x",
// Test method with compressed style, too many adjacent :
"0:1:2:::3",
// Test method with compressed style, too many digits.
"0:1:2:3::abcde",
// Test method with compressed style, not enough :
"0:1",
// Test method with ipv4 style, bad ipv6 digits.
"0:0:0:0:0:x:10.0.0.1",
// Test method with ipv4 style, bad ipv4 digits.
"0:0:0:0:0:0:10.0.0.x",
// Test method with ipv4 style, too many ipv6 digits.
"0:0:0:0:0:00000:10.0.0.1",
// Test method with ipv4 style, too many :
"0:0:0:0:0:0:0:10.0.0.1",
// Test method with ipv4 style, not enough :
"0:0:0:0:0:10.0.0.1",
// Test method with ipv4 style, too many .
"0:0:0:0:0:0:10.0.0.0.1",
// Test method with ipv4 style, not enough .
"0:0:0:0:0:0:10.0.1",
// Test method with ipv4 style, adjacent .
"0:0:0:0:0:0:10..0.0.1",
// Test method with ipv4 style, leading .
"0:0:0:0:0:0:.0.0.1",
// Test method with ipv4 style, leading .
"0:0:0:0:0:0:.10.0.0.1",
// Test method with ipv4 style, trailing .
"0:0:0:0:0:0:10.0.0.",
// Test method with ipv4 style, trailing .
"0:0:0:0:0:0:10.0.0.1.",
// Test method with compressed ipv4 style, bad ipv6 digits.
"::fffx:192.168.0.1",
// Test method with compressed ipv4 style, bad ipv4 digits.
"::ffff:192.168.0.x",
// Test method with compressed ipv4 style, too many adjacent :
":::ffff:192.168.0.1",
// Test method with compressed ipv4 style, too many ipv6 digits.
"::fffff:192.168.0.1",
// Test method with compressed ipv4 style, too many ipv4 digits.
"::ffff:1923.168.0.1",
// Test method with compressed ipv4 style, not enough :
":ffff:192.168.0.1",
// Test method with compressed ipv4 style, too many .
"::ffff:192.168.0.1.2",
// Test method with compressed ipv4 style, not enough .
"::ffff:192.168.0",
// Test method with compressed ipv4 style, adjacent .
"::ffff:192.168..0.1",
// Test method, bad ipv6 digits.
"x:0:0:0:0:0:10.0.0.1",
// Test method, bad ipv4 digits.
"0:0:0:0:0:0:x.0.0.1",
// Test method, too many ipv6 digits.
"00000:0:0:0:0:0:10.0.0.1",
// Test method, too many ipv4 digits.
"0:0:0:0:0:0:10.0.0.1000",
// Test method, too many :
"0:0:0:0:0:0:0:10.0.0.1",
// Test method, not enough :
"0:0:0:0:0:10.0.0.1",
// Test method, out of order trailing :
"0:0:0:0:0:10.0.0.1:",
// Test method, out of order leading :
":0:0:0:0:0:10.0.0.1",
// Test method, out of order leading :
"0:0:0:0::10.0.0.1:",
// Test method, out of order trailing :
":0:0:0:0::10.0.0.1",
// Test method, too many .
"0:0:0:0:0:0:10.0.0.0.1",
// Test method, not enough .
"0:0:0:0:0:0:10.0.1",
// Test method, adjacent .
"0:0:0:0:0:0:10.0.0..1",
// Empty contents
"",
// Invalid single compression
":",
":::",
// Trailing : (max number of : = 8)
"2001:0:4136:e378:8000:63bf:3fff:fdd2:",
// Leading : (max number of : = 8)
":aaaa:bbbb:cccc:dddd:eeee:ffff:1111:2222",
// Invalid character
"1234:2345:3456:4567:5678:6789::X890",
// Trailing . in IPv4
"::ffff:255.255.255.255.",
// To many characters in IPv4
"::ffff:0.0.1111.0",
// Test method, adjacent .
"::ffff:0.0..0",
// Not enough IPv4 entries trailing .
"::ffff:127.0.0.",
// Invalid trailing IPv4 character
"::ffff:127.0.0.a",
// Invalid leading IPv4 character
"::ffff:a.0.0.1",
// Invalid middle IPv4 character
"::ffff:127.a.0.1",
// Invalid middle IPv4 character
"::ffff:127.0.a.1",
// Not enough IPv4 entries no trailing .
"::ffff:1.2.4",
// Extra IPv4 entry
"::ffff:192.168.0.1.255",
// Not enough IPv6 content
":ffff:192.168.0.1.255",
// Intermixed IPv4 and IPv6 symbols
"::ffff:255.255:255.255.",
// Invalid IPv4 mapped address - invalid ipv4 separator
"0:0:0::0:0:00f.0.0.1",
// Invalid IPv4 mapped address - not enough f's
"0:0:0:0:0:fff:1.0.0.1",
// Invalid IPv4 mapped address - not IPv4 mapped, not IPv4 compatible
"0:0:0:0:0:ff00:1.0.0.1",
// Invalid IPv4 mapped address - not IPv4 mapped, not IPv4 compatible
"0:0:0:0:0:ff:1.0.0.1",
// Invalid IPv4 mapped address - too many f's
"0:0:0:0:0:fffff:1.0.0.1",
// Invalid IPv4 mapped address - too many bytes (too many 0's)
"0:0:0:0:0:0:ffff:1.0.0.1",
// Invalid IPv4 mapped address - too many bytes (too many 0's)
"::0:0:0:0:0:ffff:1.0.0.1",
// Invalid IPv4 mapped address - too many bytes (too many 0's)
"0:0:0:0:0:0::1.0.0.1",
// Invalid IPv4 mapped address - too many bytes (too many 0's)
"0:0:0:0:0:00000:1.0.0.1",
// Invalid IPv4 mapped address - too few bytes (not enough 0's)
"0:0:0:0:ffff:1.0.0.1",
// Invalid IPv4 mapped address - too few bytes (not enough 0's)
"ffff:192.168.0.1",
// Invalid IPv4 mapped address - 0's after the mapped ffff indicator
"0:0:0:0:0:ffff::10.0.0.1",
// Invalid IPv4 mapped address - 0's after the mapped ffff indicator
"0:0:0:0:ffff::10.0.0.1",
// Invalid IPv4 mapped address - 0's after the mapped ffff indicator
"0:0:0:ffff::10.0.0.1",
// Invalid IPv4 mapped address - 0's after the mapped ffff indicator
"0:0:ffff::10.0.0.1",
// Invalid IPv4 mapped address - 0's after the mapped ffff indicator
"0:ffff::10.0.0.1",
// Invalid IPv4 mapped address - 0's after the mapped ffff indicator
"ffff::10.0.0.1",
// Invalid IPv4 mapped address - not all 0's before the mapped separator
"1:0:0:0:0:ffff:10.0.0.1",
// Address that is similar to IPv4 mapped, but is invalid
"0:0:0:0:ffff:ffff:1.0.0.1",
// Valid number of separators, but invalid IPv4 format
"::1:2:3:4:5:6.7.8.9",
// Too many digits
"0:0:0:0:0:0:ffff:10.0.0.1",
// Invalid IPv4 format
":1.2.3.4",
// Invalid IPv4 format
"::.2.3.4",
// Invalid IPv4 format
"::ffff:0.1.2."
};
}