Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Mark Nellemann | 49ca2c186c | |
Mark Nellemann | 3deb336a46 | |
Mark Nellemann | b757541053 | |
Mark Nellemann | 5b7fec6033 |
56
README.md
56
README.md
|
@ -1,55 +1,3 @@
|
|||
# jnetperf
|
||||
# Repository moved
|
||||
|
||||
Small utility to measure (single threaded) network performance between two hosts.
|
||||
|
||||
## Requirements
|
||||
|
||||
You need Java (JRE) version 8 or later to run jnetperf.
|
||||
|
||||
## Usage Instructions
|
||||
|
||||
- Install the jnetperf package (*.deb*, *.rpm* or *.jar*) from [Packages](https://git.data.coop/nellemann/jnetperf/packages) or compile from source.
|
||||
- Run **/opt/jnetperf/bin/jperf**, if installed from package, or as **java -jar /path/to/jnetperf.jar**
|
||||
|
||||
```shell
|
||||
Usage: jnetperf [-huV] [-l=NUM] [-n=NUM] [-p=NUM] [-t=SEC] (-c=SRV | -s)
|
||||
For more information visit https://git.data.coop/nellemann/jnetperf
|
||||
-c, --connect=SRV Connect to remote server (client).
|
||||
-h, --help Show this help message and exit.
|
||||
-l, --pkt-len=NUM Packet size in bytes (client) [default: 1432].
|
||||
-n, --pkt-num=NUM Number of packets to send (client) [default: 150000].
|
||||
-p, --port=NUM Network port [default: 4445].
|
||||
-s, --server Run server and wait for client (server).
|
||||
-t, --runtime=SEC Time to run, supersedes pkt-num (client) [default: 0].
|
||||
-u, --udp Use UDP network protocol [default: false].
|
||||
-V, --version Print version information and exit.
|
||||
```
|
||||
|
||||
|
||||
## Examples
|
||||
|
||||
On *host A* run jnetperf as a server waiting for a connection from a client:
|
||||
|
||||
```shell
|
||||
java -jar jnetperf-x.y.z-all.jar -s
|
||||
```
|
||||
|
||||
On *host B* run jnetperf as a client connecting to the server and sending data:
|
||||
|
||||
```shell
|
||||
java -jar jnetperf-x.y.z-all.jar -c server-ip
|
||||
```
|
||||
|
||||
|
||||
## Development Information
|
||||
|
||||
You need Java (JDK) version 8 or later to build jnetperf.
|
||||
|
||||
|
||||
### Build & Test
|
||||
|
||||
Use the gradle build tool, which will download all required dependencies:
|
||||
|
||||
```shell
|
||||
./gradlew clean build
|
||||
```
|
||||
Please visit [github.com/mnellemann/jnetperf](https://github.com/mnellemann/jnetperf)
|
|
@ -25,12 +25,13 @@ public class Statistics {
|
|||
private final int MAX_TICKS_AVG = 300;
|
||||
private final int LOG_AVG_MODULO = 30;
|
||||
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
|
||||
private long packetsTransferred, packetsTransferredTotal = 0;
|
||||
private long packetsTransferred;
|
||||
private long packetsTransferredTotal = 0;
|
||||
private long bytesTransferred, bytesTransferredTotal = 0;
|
||||
private long bytesPerSec;
|
||||
private long packetsPerSec;
|
||||
private long packetsUnacked = 0;
|
||||
private int tickItererations = 0;
|
||||
private int tickIterations = 0;
|
||||
private int tickTotal = 0;
|
||||
|
||||
private final long[] bytesPerSecAvgTmp = new long[MAX_TICKS_AVG];
|
||||
|
@ -52,8 +53,8 @@ public class Statistics {
|
|||
// Because we do this every second ...
|
||||
bytesPerSec = bytesTransferred;
|
||||
packetsPerSec = packetsTransferred;
|
||||
bytesPerSecAvgTmp[tickItererations] = bytesTransferred;
|
||||
packetsPerSecAvgTmp[tickItererations] = packetsTransferred;
|
||||
bytesPerSecAvgTmp[tickIterations] = bytesTransferred;
|
||||
packetsPerSecAvgTmp[tickIterations] = packetsTransferred;
|
||||
|
||||
timestamp1 = timestamp2;
|
||||
printStatus();
|
||||
|
@ -61,11 +62,11 @@ public class Statistics {
|
|||
bytesTransferred = 0;
|
||||
packetsTransferred = 0;
|
||||
|
||||
if(++tickItererations >= MAX_TICKS_AVG) {
|
||||
tickItererations = 0;
|
||||
if(++tickIterations >= MAX_TICKS_AVG) {
|
||||
tickIterations = 0;
|
||||
}
|
||||
|
||||
if(tickItererations % LOG_AVG_MODULO == 0) {
|
||||
if(tickIterations % LOG_AVG_MODULO == 0) {
|
||||
printAverage();
|
||||
}
|
||||
tickTotal++;
|
||||
|
@ -78,7 +79,6 @@ public class Statistics {
|
|||
|
||||
public void printStatus() {
|
||||
System.out.printf("%-19s - Status: %10d pkt/s %14d B/s %12d KB/s %8d MB/s\n", formatter.format(Instant.now()), packetsPerSec, bytesPerSec, bytesPerSec/1_000, bytesPerSec/1_000_000);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -122,6 +122,9 @@ public class Statistics {
|
|||
return packetsTransferredTotal;
|
||||
}
|
||||
|
||||
public long getBytesTransferredTotal() {
|
||||
return bytesTransferredTotal;
|
||||
}
|
||||
|
||||
public int getRuntime() {
|
||||
return tickTotal;
|
||||
|
@ -157,5 +160,4 @@ public class Statistics {
|
|||
return avg;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -122,4 +122,9 @@ public class TcpClient {
|
|||
statistics.printSummary();
|
||||
}
|
||||
|
||||
|
||||
public Statistics getStatistics() {
|
||||
return statistics;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -17,6 +17,8 @@ public class TcpServer extends Thread {
|
|||
private DataInputStream in;
|
||||
private DataOutputStream out;
|
||||
private byte[] inBuffer;
|
||||
private boolean runThread = true;
|
||||
private boolean runSession = true;
|
||||
|
||||
|
||||
public TcpServer(int port) throws IOException {
|
||||
|
@ -28,7 +30,7 @@ public class TcpServer extends Thread {
|
|||
public void run() {
|
||||
|
||||
try {
|
||||
while (true) {
|
||||
while (runThread) {
|
||||
socket = new ServerSocket(port);
|
||||
socket.setSoTimeout(0); // Wait indefinitely
|
||||
inBuffer = new byte[Payload.DEFAULT_LENGTH];
|
||||
|
@ -45,8 +47,8 @@ public class TcpServer extends Thread {
|
|||
public void session() throws IOException {
|
||||
|
||||
Statistics statistics = new Statistics();
|
||||
boolean running = true;
|
||||
boolean ackEnd = false;
|
||||
runSession = true;
|
||||
|
||||
Socket server = socket.accept();
|
||||
InetAddress address = socket.getInetAddress();
|
||||
|
@ -54,7 +56,7 @@ public class TcpServer extends Thread {
|
|||
in = new DataInputStream(server.getInputStream());
|
||||
out = new DataOutputStream(server.getOutputStream());
|
||||
|
||||
while (running) {
|
||||
while (runSession) {
|
||||
|
||||
Payload payload = receive();
|
||||
statistics.transferPacket();
|
||||
|
@ -78,7 +80,7 @@ public class TcpServer extends Thread {
|
|||
|
||||
statistics.tick();
|
||||
if(ackEnd) {
|
||||
running = false;
|
||||
runSession = false;
|
||||
statistics.printAverage();
|
||||
statistics.printSummary();
|
||||
}
|
||||
|
@ -97,4 +99,10 @@ public class TcpServer extends Thread {
|
|||
return new Payload(inBuffer);
|
||||
}
|
||||
|
||||
|
||||
public void finish() {
|
||||
runThread = false;
|
||||
runSession = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -29,8 +29,7 @@ public class TimeSuffixConverter implements CommandLine.ITypeConverter<Integer>
|
|||
seconds = number * 60 * 60;
|
||||
break;
|
||||
default:
|
||||
System.err.println("Unknown suffix: " + suffix);
|
||||
seconds = number;
|
||||
throw new IllegalArgumentException("Unknown suffix: " + suffix);
|
||||
}
|
||||
} else {
|
||||
seconds = number;
|
||||
|
|
|
@ -118,7 +118,6 @@ public class UdpClient {
|
|||
|
||||
|
||||
// Send end
|
||||
//Thread.sleep(100);
|
||||
payload = new Payload(PayloadType.END.getValue(), length, sequence++, packets);
|
||||
send(payload);
|
||||
payload = receive();
|
||||
|
@ -134,4 +133,9 @@ public class UdpClient {
|
|||
statistics.printSummary();
|
||||
}
|
||||
|
||||
|
||||
public Statistics getStatistics() {
|
||||
return statistics;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -32,6 +32,9 @@ public class UdpServer extends Thread {
|
|||
private DatagramSocket socket;
|
||||
private byte[] inBuffer;
|
||||
|
||||
private boolean runThread = true;
|
||||
private boolean runSession = true;
|
||||
|
||||
|
||||
public UdpServer(int port) {
|
||||
log.info("UdpServer()");
|
||||
|
@ -41,7 +44,7 @@ public class UdpServer extends Thread {
|
|||
public void run() {
|
||||
|
||||
try {
|
||||
while (true) {
|
||||
while (runThread) {
|
||||
inBuffer = new byte[Payload.DEFAULT_LENGTH];
|
||||
socket = new DatagramSocket(port);
|
||||
session();
|
||||
|
@ -57,10 +60,10 @@ public class UdpServer extends Thread {
|
|||
public void session() throws IOException {
|
||||
|
||||
Statistics statistics = new Statistics();
|
||||
boolean running = true;
|
||||
boolean ackEnd = false;
|
||||
runSession = true;
|
||||
|
||||
while (running) {
|
||||
while (runSession) {
|
||||
|
||||
DatagramPacket packet = new DatagramPacket(inBuffer, inBuffer.length);
|
||||
socket.receive(packet);
|
||||
|
@ -91,7 +94,7 @@ public class UdpServer extends Thread {
|
|||
|
||||
statistics.tick();
|
||||
if(ackEnd) {
|
||||
running = false;
|
||||
runSession = false;
|
||||
statistics.printAverage();
|
||||
statistics.printSummary();
|
||||
}
|
||||
|
@ -101,4 +104,11 @@ public class UdpServer extends Thread {
|
|||
|
||||
}
|
||||
|
||||
|
||||
public void finish() {
|
||||
runThread = false;
|
||||
runSession = false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -6,16 +6,17 @@ import java.util.Locale;
|
|||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class UnitSuffixConverter implements CommandLine.ITypeConverter<Integer> {
|
||||
public class UnitSuffixConverter implements CommandLine.ITypeConverter<Long> {
|
||||
|
||||
final private Pattern pattern = Pattern.compile("(\\d+)([kmg])?b?", Pattern.CASE_INSENSITIVE);
|
||||
|
||||
public Integer convert(String value) {
|
||||
int bytes = 0;
|
||||
public Long convert(String value) {
|
||||
|
||||
long bytes = 0L;
|
||||
|
||||
Matcher matcher = pattern.matcher(value);
|
||||
if (matcher.find()) {
|
||||
int number = Integer.parseInt(matcher.group(1));
|
||||
long number = Long.parseLong(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)) {
|
||||
|
@ -29,8 +30,7 @@ public class UnitSuffixConverter implements CommandLine.ITypeConverter<Integer>
|
|||
bytes = number * 1024 * 1024 * 1024;
|
||||
break;
|
||||
default:
|
||||
System.err.println("Unknown suffix: " + suffix);
|
||||
bytes = number;
|
||||
throw new IllegalArgumentException("Unknown suffix: " + suffix);
|
||||
}
|
||||
} else {
|
||||
bytes = number;
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
/*
|
||||
* This Spock specification was generated by the Gradle 'init' task.
|
||||
*/
|
||||
package biz.nellemann.jnetperf
|
||||
|
||||
import spock.lang.Specification
|
||||
|
||||
class ApplicationTest extends Specification {
|
||||
|
||||
|
||||
}
|
|
@ -0,0 +1,45 @@
|
|||
package biz.nellemann.jnetperf
|
||||
|
||||
import spock.lang.Shared
|
||||
import spock.lang.Specification
|
||||
|
||||
class TcpClientServerTest extends Specification {
|
||||
|
||||
static final int port = 9876;
|
||||
|
||||
@Shared
|
||||
TcpServer tcpServer = new TcpServer(port)
|
||||
|
||||
// run before every feature method
|
||||
def setup() {
|
||||
tcpServer.start();
|
||||
|
||||
}
|
||||
|
||||
// run after every feature method
|
||||
def cleanup() {
|
||||
tcpServer.finish()
|
||||
}
|
||||
|
||||
// run before the first feature method
|
||||
def setupSpec() {
|
||||
}
|
||||
|
||||
// run after the last feature method
|
||||
def cleanupSpec() {
|
||||
}
|
||||
|
||||
|
||||
def "test client to server communication"() {
|
||||
setup:
|
||||
TcpClient client = new TcpClient("localhost", port, 512, 100, 60)
|
||||
|
||||
when:
|
||||
client.start()
|
||||
|
||||
then:
|
||||
client.getStatistics().getPacketsTransferredTotal() == 102 // packets + handshake + end
|
||||
client.getStatistics().getBytesTransferredTotal() == 52224
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,38 @@
|
|||
package biz.nellemann.jnetperf
|
||||
|
||||
import spock.lang.Shared
|
||||
import spock.lang.Specification
|
||||
|
||||
class TimeSuffixConverterTest extends Specification {
|
||||
|
||||
@Shared
|
||||
TimeSuffixConverter timeSuffixConverter = new TimeSuffixConverter();
|
||||
|
||||
|
||||
def "test second to seconds"() {
|
||||
when:
|
||||
int seconds = timeSuffixConverter.convert("12s")
|
||||
|
||||
then:
|
||||
seconds == 12;
|
||||
}
|
||||
|
||||
|
||||
def "test minute to seconds"() {
|
||||
when:
|
||||
int seconds = timeSuffixConverter.convert("120m")
|
||||
|
||||
then:
|
||||
seconds == 7200;
|
||||
}
|
||||
|
||||
|
||||
def "test hour to seconds"() {
|
||||
when:
|
||||
int seconds = timeSuffixConverter.convert("48h")
|
||||
|
||||
then:
|
||||
seconds == 172800;
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,45 @@
|
|||
package biz.nellemann.jnetperf
|
||||
|
||||
import spock.lang.Shared
|
||||
import spock.lang.Specification
|
||||
|
||||
class UdpClientServerTest extends Specification {
|
||||
|
||||
static final int port = 9876;
|
||||
|
||||
@Shared
|
||||
UdpServer udpServer = new UdpServer(port)
|
||||
|
||||
// run before every feature method
|
||||
def setup() {
|
||||
udpServer.start();
|
||||
|
||||
}
|
||||
|
||||
// run after every feature method
|
||||
def cleanup() {
|
||||
udpServer.finish()
|
||||
}
|
||||
|
||||
// run before the first feature method
|
||||
def setupSpec() {
|
||||
}
|
||||
|
||||
// run after the last feature method
|
||||
def cleanupSpec() {
|
||||
}
|
||||
|
||||
|
||||
def "test client to server communication"() {
|
||||
setup:
|
||||
UdpClient client = new UdpClient("localhost", port, 512, 100, 60)
|
||||
|
||||
when:
|
||||
client.start()
|
||||
|
||||
then:
|
||||
client.getStatistics().getPacketsTransferredTotal() == 102 // packets + handshake + end
|
||||
client.getStatistics().getBytesTransferredTotal() == 53144 // TODO: Why is this larger than the TCP test ?
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,71 @@
|
|||
package biz.nellemann.jnetperf
|
||||
|
||||
import spock.lang.Shared
|
||||
import spock.lang.Specification
|
||||
|
||||
class UnitSuffixConverterTest extends Specification {
|
||||
|
||||
@Shared
|
||||
UnitSuffixConverter unitSuffixConverter = new UnitSuffixConverter();
|
||||
|
||||
|
||||
def "test byte (b) to bytes"() {
|
||||
when:
|
||||
long bytes = unitSuffixConverter.convert("16b")
|
||||
|
||||
then:
|
||||
bytes == 16;
|
||||
}
|
||||
|
||||
|
||||
def "test kilo (k) to bytes"() {
|
||||
when:
|
||||
long bytes = unitSuffixConverter.convert("2048k")
|
||||
|
||||
then:
|
||||
bytes == 2097152;
|
||||
}
|
||||
|
||||
def "test kilo (kb) to bytes"() {
|
||||
when:
|
||||
long bytes = unitSuffixConverter.convert("2048kb")
|
||||
|
||||
then:
|
||||
bytes == 2097152;
|
||||
}
|
||||
|
||||
def "test mega (m) to bytes"() {
|
||||
when:
|
||||
long bytes = unitSuffixConverter.convert("2m")
|
||||
|
||||
then:
|
||||
bytes == 2097152;
|
||||
}
|
||||
|
||||
def "test mega (mb) to bytes"() {
|
||||
when:
|
||||
long bytes = unitSuffixConverter.convert("2mb")
|
||||
|
||||
then:
|
||||
bytes == 2097152;
|
||||
}
|
||||
|
||||
|
||||
def "test giga (g) to bytes"() {
|
||||
when:
|
||||
long bytes = unitSuffixConverter.convert("1g")
|
||||
|
||||
then:
|
||||
bytes == 1073741824;
|
||||
}
|
||||
|
||||
|
||||
def "test giga (gb) to bytes"() {
|
||||
when:
|
||||
long bytes = unitSuffixConverter.convert("1gb")
|
||||
|
||||
then:
|
||||
bytes == 1073741824;
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue