nellemann
/
jnetperf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support k,m,g suffix and some cleanup.
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Mark Nellemann 2023-07-14 07:40:34 +02:00
parent 87c8c1f56e
commit 7f4a5d28ac
11 changed files with 133 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,3 +1,3 @@
projectId = jnetperf
projectGroup = biz.nellemann.jnetperf
projectVersion = 0.0.5
projectVersion = 0.0.6

24
src/main/java/biz/nellemann/jnetperf/Application.java
View File

@ -20,7 +20,6 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
import java.io.IOException;
import java.net.SocketException;
import java.util.concurrent.Callable;
@ -33,17 +32,17 @@ public class Application implements Callable<Integer> {
RunMode runMode;
static class RunMode {
@CommandLine.Option(names = { "-c", "--connect" }, required = true, description = "Connect to remote server.", paramLabel = "SERVER")
@CommandLine.Option(names = { "-c", "--connect" }, required = true, description = "Connect to remote server.", paramLabel = "HOST")
String remoteServer;
@CommandLine.Option(names = { "-s", "--server" }, required = true, description = "Run server and wait for client.")
boolean runServer = false;
}
@CommandLine.Option(names = { "-l", "--pkt-len" }, paramLabel = "SIZE", description = "Packet size in bytes [default: ${DEFAULT-VALUE}].")
int packetSize = Datagram.DEFAULT_LENGTH;
@CommandLine.Option(names = { "-l", "--pkt-len" }, paramLabel = "NUM", description = "Packet size in bytes [default: ${DEFAULT-VALUE}].", converter = SuffixConverter.class)
int packetSize = Payload.DEFAULT_LENGTH;
@CommandLine.Option(names = { "-n", "--pkt-num" }, paramLabel = "NUM", description = "Number of packets to send [default: ${DEFAULT-VALUE}].")
@CommandLine.Option(names = { "-n", "--pkt-num" }, paramLabel = "NUM", description = "Number of packets to send [default: ${DEFAULT-VALUE}].", converter = SuffixConverter.class)
int packetCount = 150_000;
@CommandLine.Option(names = { "-p", "--port" }, paramLabel = "PORT", description = "Network port [default: ${DEFAULT-VALUE}].")
@ -75,15 +74,20 @@ public class Application implements Callable<Integer> {
private void runClient(String remoteHost) throws InterruptedException, IOException {
if(packetSize < Payload.MIN_LENGTH) {
packetSize = Payload.MIN_LENGTH;
}
if(useUdp) {
if(packetSize > Datagram.MAX_UDP_LENGTH) {
System.err.println("Packet size not allowed for UDP");
return;
if(packetSize > Payload.MAX_UDP_LENGTH) {
packetSize = Payload.MAX_UDP_LENGTH;
}
UdpClient udpClient = new UdpClient(remoteHost, port, packetCount, packetSize);
UdpClient udpClient = new UdpClient(remoteHost, port, packetSize, packetCount, 0);
udpClient.start();
} else {
TcpClient tcpClient = new TcpClient(remoteHost, port, packetCount, packetSize);
TcpClient tcpClient = new TcpClient(remoteHost, port, packetSize, packetCount, 0);
tcpClient.start();
}
}

4
src/main/java/biz/nellemann/jnetperf/Client.java
View File

@ -1,4 +0,0 @@
package biz.nellemann.jnetperf;
public interface Client {
}

11
src/main/java/biz/nellemann/jnetperf/Datagram.java → src/main/java/biz/nellemann/jnetperf/Payload.java
View File

@ -31,8 +31,9 @@ import java.util.Arrays;
*
*/
public class Datagram {
public class Payload {
public final static int MIN_LENGTH = 64;
public final static int MAX_UDP_LENGTH = 65507;
public final static int DEFAULT_LENGTH = 1432;
public final static int HEADER_LENGTH = 32;
@ -52,13 +53,13 @@ public class Datagram {
* @param length
* @param currentPkt
*/
public Datagram(int type, int length, long currentPkt, long maxPkt) {
public Payload(int type, int length, long currentPkt, long maxPkt) {
this.type = type;
this.curPkt = currentPkt;
this.maxPkt = maxPkt;
this.length = length;
if (type == DataType.HANDSHAKE.getValue()) {
if (type == PayloadType.HANDSHAKE.getValue()) {
data = new byte[DEFAULT_LENGTH - HEADER_LENGTH];
} else {
data = new byte[length - HEADER_LENGTH];
@ -69,7 +70,7 @@ public class Datagram {
* Assemble datagram from byte[] payload
* @param payload
*/
public Datagram(byte[] payload) {
public Payload(byte[] payload) {
this(ByteBuffer.wrap(payload));
}
@ -78,7 +79,7 @@ public class Datagram {
* Assemble datagram from ByteBuffer payload
* @param payload
*/
public Datagram(ByteBuffer payload) {
public Payload(ByteBuffer payload) {
byte[] id = new byte[8];
payload.get(id);

4
src/main/java/biz/nellemann/jnetperf/DataType.java → src/main/java/biz/nellemann/jnetperf/PayloadType.java
View File

@ -15,13 +15,13 @@
*/
package biz.nellemann.jnetperf;
public enum DataType {
public enum PayloadType {
HANDSHAKE(1), DATA(2), ACK(4), END(9);
private final int value;
private DataType(int value) {
private PayloadType(int value) {
this.value = value;
}

42
src/main/java/biz/nellemann/jnetperf/SuffixConverter.java Normal file
View File

@ -0,0 +1,42 @@
package biz.nellemann.jnetperf;
import picocli.CommandLine;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class SuffixConverter implements CommandLine.ITypeConverter<Integer> {
final private Pattern pattern = Pattern.compile("(\\d+)([kmg])?b?", Pattern.CASE_INSENSITIVE);
public Integer convert(String value) {
int bytes = 0;
Matcher matcher = pattern.matcher(value);
if (matcher.find()) {
int number = Integer.parseInt(matcher.group(1));
if(matcher.group(2) != null) { // We got the kilo, mega og giga suffix
String suffix = matcher.group(2);
switch (suffix.toLowerCase(Locale.ROOT)) {
case "k":
bytes = number * 1024;
break;
case "m":
bytes = number * 1024 * 1024;
break;
case "g":
bytes = number * 1024 * 1024 * 1024;
break;
default:
System.err.println("Unknown suffix: " + suffix);
bytes = number;
}
} else {
bytes = number;
}
}
return bytes;
}
}

43
src/main/java/biz/nellemann/jnetperf/TcpClient.java
View File

@ -20,33 +20,35 @@ public class TcpClient {
private final InetAddress address;
private Socket socket;
private final byte[] inBuffer = new byte[Datagram.DEFAULT_LENGTH];
private final byte[] inBuffer = new byte[Payload.DEFAULT_LENGTH];
private final int packetCount;
private final int packetSize;
private final int packetTime;
public TcpClient(String hostname, int port, int packets, int size) throws IOException {
public TcpClient(String hostname, int port, int size, int maxPackets, int maxTime) throws IOException {
log.info("TcpClient() - target: {}, port: {}", hostname, port);
this.port = port;
this.packetCount = packets;
this.packetSize = size;
this.packetCount = maxPackets;
this.packetTime = maxTime;
address = InetAddress.getByName(hostname);
statistics = new Statistics();
}
private void send(Datagram datagram) throws IOException {
out.write(datagram.getPayload());
private void send(Payload payload) throws IOException {
out.write(payload.getPayload());
statistics.transferPacket();
statistics.transferBytes(datagram.getLength());
statistics.transferBytes(payload.getLength());
}
private Datagram receive() throws IOException {
private Payload receive() throws IOException {
in.readFully(inBuffer);
return new Datagram(inBuffer);
return new Payload(inBuffer);
}
@ -66,21 +68,21 @@ public class TcpClient {
long sequence = 0;
// Send handshake
Datagram datagram = new Datagram(DataType.HANDSHAKE.getValue(), packetSize, sequence++, packetCount);
send(datagram);
Payload payload = new Payload(PayloadType.HANDSHAKE.getValue(), packetSize, sequence++, packetCount);
send(payload);
datagram = receive();
if(datagram.getType() != DataType.ACK.getValue()) {
payload = receive();
if(payload.getType() != PayloadType.ACK.getValue()) {
log.warn("No ACK!");
return;
}
// Data datagrams ...
for(int i = 0; i < packetCount; i++) {
datagram = new Datagram(DataType.DATA.getValue(), packetSize, sequence++, packetCount);
send(datagram);
datagram = receive();
if(datagram.getType() != DataType.ACK.getValue()) {
payload = new Payload(PayloadType.DATA.getValue(), packetSize, sequence++, packetCount);
send(payload);
payload = receive();
if(payload.getType() != PayloadType.ACK.getValue()) {
log.warn("No ACK!");
}
statistics.tick();
@ -88,14 +90,13 @@ public class TcpClient {
// End datagram
//Thread.sleep(100);
datagram = new Datagram(DataType.END.getValue(), packetSize, sequence++, packetCount);
send(datagram);
System.out.println("Sending END datagram");
payload = new Payload(PayloadType.END.getValue(), packetSize, sequence++, packetCount);
send(payload);
// TODO: Wait for ACK
datagram = receive();
payload = receive();
statistics.ack();
if(datagram.getType() != DataType.ACK.getValue()) {
if(payload.getType() != PayloadType.ACK.getValue()) {
log.warn("No ACK!");
return;
}

25
src/main/java/biz/nellemann/jnetperf/TcpServer.java
View File

@ -7,7 +7,6 @@ import java.io.*;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.nio.ByteBuffer;
public class TcpServer extends Thread {
@ -33,7 +32,7 @@ public class TcpServer extends Thread {
try {
while (running) {
inBuffer = new byte[Datagram.DEFAULT_LENGTH];
inBuffer = new byte[Payload.DEFAULT_LENGTH];
session();
}
socket.close();
@ -58,28 +57,28 @@ public class TcpServer extends Thread {
while (running) {
Datagram datagram = receive();
Payload payload = receive();
statistics.transferPacket();
statistics.transferBytes(datagram.getLength());
statistics.transferBytes(payload.getLength());
if(datagram.getType() == DataType.HANDSHAKE.getValue()) {
if(payload.getType() == PayloadType.HANDSHAKE.getValue()) {
log.info("Handshake from ... {}", address);
// Setup to receive larger datagrams
inBuffer = new byte[datagram.getLength()];
inBuffer = new byte[payload.getLength()];
statistics.reset();
}
if(datagram.getType() == DataType.END.getValue()) {
if(payload.getType() == PayloadType.END.getValue()) {
ackEnd = true;
}
// Send ACK
Datagram responseDatagram = new Datagram(DataType.ACK.getValue(), Datagram.DEFAULT_LENGTH, datagram.getCurPkt(), 1);
out.write(responseDatagram.getPayload());
Payload responsePayload = new Payload(PayloadType.ACK.getValue(), Payload.DEFAULT_LENGTH, payload.getCurPkt(), 1);
out.write(responsePayload.getPayload());
statistics.ack();
statistics.tick();
if(ackEnd && statistics.getPacketsTransferredTotal() > datagram.getMaxPkt()) {
if(ackEnd) {
running = false;
statistics.printAverage();
statistics.printSummary();
@ -94,10 +93,10 @@ public class TcpServer extends Thread {
}
private Datagram receive() throws IOException {
private Payload receive() throws IOException {
in.readFully(inBuffer);
Datagram datagram = new Datagram(inBuffer);
return datagram;
Payload payload = new Payload(inBuffer);
return payload;
}
}

42
src/main/java/biz/nellemann/jnetperf/UdpClient.java
View File

@ -35,34 +35,36 @@ public class UdpClient {
private final InetAddress address;
private final DatagramSocket socket;
private final byte[] inBuffer = new byte[Datagram.DEFAULT_LENGTH];
private final byte[] inBuffer = new byte[Payload.DEFAULT_LENGTH];
private final int packetCount;
private final int packetSize;
private final int packeTime;
public UdpClient(String hostname, int port, int packets, int size) throws UnknownHostException, SocketException {
public UdpClient(String hostname, int port, int size, int maxPackets, int maxTime) throws UnknownHostException, SocketException {
log.info("UdpClient() - target: {}, port: {}", hostname, port);
this.port = port;
this.packetCount = packets;
this.packetSize = size;
this.packetCount = maxPackets;
this.packeTime = maxTime;
socket = new DatagramSocket();
address = InetAddress.getByName(hostname);
statistics = new Statistics();
}
private void send(Datagram datagram) throws IOException {
DatagramPacket packet = new DatagramPacket(datagram.getPayload(), datagram.getLength(), address, port);
private void send(Payload payload) throws IOException {
DatagramPacket packet = new DatagramPacket(payload.getPayload(), payload.getLength(), address, port);
socket.send(packet);
statistics.transferPacket();
statistics.transferBytes(datagram.getLength());
statistics.transferBytes(payload.getLength());
}
private Datagram receive() throws IOException {
private Payload receive() throws IOException {
DatagramPacket packet = new DatagramPacket(inBuffer, inBuffer.length);
socket.receive(packet);
return new Datagram(inBuffer);
return new Payload(inBuffer);
}
@ -76,21 +78,21 @@ public class UdpClient {
long sequence = 0;
// Send handshake
Datagram datagram = new Datagram(DataType.HANDSHAKE.getValue(), Datagram.DEFAULT_LENGTH, sequence++, packetCount);
send(datagram);
Payload payload = new Payload(PayloadType.HANDSHAKE.getValue(), Payload.DEFAULT_LENGTH, sequence++, packetCount);
send(payload);
datagram = receive();
if(datagram.getType() != DataType.ACK.getValue()) {
payload = receive();
if(payload.getType() != PayloadType.ACK.getValue()) {
log.warn("No ACK!");
return;
}
// Data datagrams ...
for(int i = 0; i < packetCount; i++) {
datagram = new Datagram(DataType.DATA.getValue(), packetSize, sequence++, packetCount);
send(datagram);
datagram = receive();
if(datagram.getType() != DataType.ACK.getValue()) {
payload = new Payload(PayloadType.DATA.getValue(), packetSize, sequence++, packetCount);
send(payload);
payload = receive();
if(payload.getType() != PayloadType.ACK.getValue()) {
log.warn("No ACK!");
}
statistics.tick();
@ -98,13 +100,13 @@ public class UdpClient {
// End datagram
//Thread.sleep(100);
datagram = new Datagram(DataType.END.getValue(), packetSize, sequence++, packetCount);
send(datagram);
payload = new Payload(PayloadType.END.getValue(), packetSize, sequence++, packetCount);
send(payload);
// TODO: Wait for ACK
datagram = receive();
payload = receive();
statistics.ack();
if(datagram.getType() != DataType.ACK.getValue()) {
if(payload.getType() != PayloadType.ACK.getValue()) {
log.warn("No ACK!");
return;
}

18
src/main/java/biz/nellemann/jnetperf/UdpServer.java
View File

@ -43,7 +43,7 @@ public class UdpServer extends Thread {
try {
while (running) {
inBuffer = new byte[Datagram.DEFAULT_LENGTH];
inBuffer = new byte[Payload.DEFAULT_LENGTH];
session();
}
socket.close();
@ -68,29 +68,29 @@ public class UdpServer extends Thread {
InetAddress address = packet.getAddress();
int port = packet.getPort();
Datagram datagram = new Datagram(packet.getData());
Payload payload = new Payload(packet.getData());
statistics.transferPacket();
statistics.transferBytes(datagram.getLength());
statistics.transferBytes(payload.getLength());
if(datagram.getType() == DataType.HANDSHAKE.getValue()) {
if(payload.getType() == PayloadType.HANDSHAKE.getValue()) {
log.info("Handshake from ... {}", address);
// Setup to receive larger datagrams
inBuffer = new byte[datagram.getLength()];
inBuffer = new byte[payload.getLength()];
statistics.reset();
}
if(datagram.getType() == DataType.END.getValue()) {
if(payload.getType() == PayloadType.END.getValue()) {
ackEnd = true;
}
// Send ACK
Datagram responseDatagram = new Datagram(DataType.ACK.getValue(), Datagram.DEFAULT_LENGTH, datagram.getCurPkt(), 1);
packet = new DatagramPacket(responseDatagram.getPayload(), responseDatagram.getLength(), address, port);
Payload responsePayload = new Payload(PayloadType.ACK.getValue(), Payload.DEFAULT_LENGTH, payload.getCurPkt(), 1);
packet = new DatagramPacket(responsePayload.getPayload(), responsePayload.getLength(), address, port);
socket.send(packet);
statistics.ack();
statistics.tick();
if(ackEnd && statistics.getPacketsTransferredTotal() > datagram.getMaxPkt()) {
if(ackEnd) {
running = false;
statistics.printAverage();
statistics.printSummary();

4
src/main/java/biz/nellemann/jnetperf/VersionProvider.java
View File

@ -28,7 +28,9 @@ class VersionProvider implements CommandLine.IVersionProvider {
Manifest manifest = new Manifest(getClass().getResourceAsStream("/META-INF/MANIFEST.MF"));
Attributes attrs = manifest.getMainAttributes();
return new String[] { "${COMMAND-FULL-NAME} " + attrs.getValue("Build-Version") };
return new String[] {
"${COMMAND-FULL-NAME} " + attrs.getValue("Build-Version") + " (on ${os.name} ${os.version} ${os.arch})",
"JVM: ${java.version} (${java.vendor} ${java.vm.name} ${java.vm.version})" };
}
}