commit f5948162f250fa1dae312ee1114ec3f845fc81db Author: Mark Nellemann Date: Tue Jun 20 09:34:33 2023 +0200 wip diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..196d4ef --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +# Ignore Gradle project-specific cache directory +.gradle +.vscode + +# Ignore Gradle build output directory +build +bin diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a7de37e --- /dev/null +++ b/build.gradle @@ -0,0 +1,48 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java application project to get you started. + * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle + * User Manual available at https://docs.gradle.org/8.1.1/userguide/building_java_projects.html + */ + +plugins { + // Apply the groovy plugin to also add support for Groovy (needed for Spock) + id 'groovy' + + // Apply the application plugin to add support for building a CLI application in Java. + id 'application' +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + testImplementation 'org.codehaus.groovy:groovy:3.0.13' + testImplementation 'org.spockframework:spock-core:2.2-groovy-3.0' + testImplementation 'junit:junit:4.13.2' + + implementation 'org.slf4j:slf4j-api:2.0.7' + implementation 'ch.qos.logback:logback-classic:1.3.8' + implementation 'info.picocli:picocli:4.7.4' + annotationProcessor 'info.picocli:picocli-codegen:4.7.4' +} + +// Apply a specific Java toolchain to ease working on different environments. +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + +application { + // Define the main class for the application. + mainClass = 'biz.nellemann.jperf.App' +} + +tasks.named('test') { + // Use JUnit Platform for unit tests. + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..c1962a7 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..37aef8d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..aeb74cb --- /dev/null +++ b/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..a2d12b2 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,15 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/8.1.1/userguide/multi_project_builds.html + */ + +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' +} + +rootProject.name = 'jperf' diff --git a/src/main/java/biz/nellemann/jperf/App.java b/src/main/java/biz/nellemann/jperf/App.java new file mode 100644 index 0000000..c203369 --- /dev/null +++ b/src/main/java/biz/nellemann/jperf/App.java @@ -0,0 +1,55 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +package biz.nellemann.jperf; + + +import picocli.CommandLine; +import picocli.CommandLine.Command; +import java.util.concurrent.Callable; + +@Command(name = "jperf", mixinStandardHelpOptions = true, version = "checksum 4.0", + description = "Java network performance tool.") +public class App implements Callable { + + + @Override + public Integer call() throws Exception { // your business logic goes here... + + // Start server + UdpServer udpServer = new UdpServer(); + udpServer.start(); + + int sequence = 0; + + // Start client and send some messages + UdpClient udpClient = new UdpClient(); + + // Start datagram + Datagram datagram = new Datagram(DataType.HANDSHAKE.getValue(), 64, sequence++); + udpClient.send(datagram); + + // Data datagrams ... + for(int i = 0; i < 10; i++) { + datagram = new Datagram(DataType.DATA.getValue(), 64, sequence++); + udpClient.send(datagram); + } + + // End datagram + datagram = new Datagram(DataType.END.getValue(), 64, sequence++); + udpClient.send(datagram); + + udpClient.close(); + + + return 0; + } + + // this example implements Callable, so parsing, error handling and handling user + // requests for usage help or version help can be done with one line of code. + public static void main(String... args) { + int exitCode = new CommandLine(new App()).execute(args); + System.exit(exitCode); + } + +} diff --git a/src/main/java/biz/nellemann/jperf/DataType.java b/src/main/java/biz/nellemann/jperf/DataType.java new file mode 100644 index 0000000..f6e6c59 --- /dev/null +++ b/src/main/java/biz/nellemann/jperf/DataType.java @@ -0,0 +1,18 @@ +package biz.nellemann.jperf; + +public enum DataType { + + + HANDSHAKE(1), DATA(2), ACK(4), END(9); + + private final int value; + + private DataType(int value) { + this.value = value; + } + + public int getValue() { + return value; + } + +} \ No newline at end of file diff --git a/src/main/java/biz/nellemann/jperf/Datagram.java b/src/main/java/biz/nellemann/jperf/Datagram.java new file mode 100644 index 0000000..23338f4 --- /dev/null +++ b/src/main/java/biz/nellemann/jperf/Datagram.java @@ -0,0 +1,110 @@ +package biz.nellemann.jperf; + +import java.io.IOException; +import java.nio.ByteBuffer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * + * A datagram consists of + * + * <-------------------- HEADER 32 bytes --------------> <---------- DATA --------> + * int-4bytes int-4bytes long-8bytes long-8bytes + * TYPE SIZE SEQUENCE TIMESTAMP + * + */ + +public class Datagram { + + final Logger log = LoggerFactory.getLogger(Datagram.class); + + private final int HEADER_LENGTH = 24; + + private final int type; + private final int size; + private final long sequence; + private final long timestamp; + + private final byte[] data; + + + /** + * Create new empty datagram + * @param type + * @param size + * @param sequence + */ + public Datagram(int type, int size, long sequence) { + this.type = type; + this.size = size; + this.sequence = sequence; + this.timestamp = System.currentTimeMillis(); + + this.data = new byte[size]; + } + + + + /** + * Assemble datagram from payload + * @param payload + */ + public Datagram(byte[] payload) { + + log.info("Datagram() 1"); + + ByteBuffer buffer = ByteBuffer.allocate(payload.length); + + // Order is importent when assembling header fields like this + type = buffer.getInt(); + size = buffer.getInt(); + sequence = buffer.getLong(); + timestamp = buffer.getLong(); + + log.info("Datagram() 2 "); + + + // Read everything after Header + data = new byte[size]; + + log.info("Datagram() 3 "); + + buffer.get(data, HEADER_LENGTH, size); // ERROR + + log.info("Datagram() 4"); + } + + + public int getLength() { + return HEADER_LENGTH + data.length; + } + + + public byte[] getPayload() throws IOException { + ByteBuffer buffer = ByteBuffer.allocate(HEADER_LENGTH + data.length + 1); + + // Order is important + buffer.putInt(type); + buffer.putInt(size); + buffer.putLong(sequence); + buffer.putLong(timestamp); + + buffer.put(data); + + return buffer.array(); + } + + + public int getType() { + return type; + } + + + public long getSequence() { + return sequence; + } + + +} diff --git a/src/main/java/biz/nellemann/jperf/UdpClient.java b/src/main/java/biz/nellemann/jperf/UdpClient.java new file mode 100644 index 0000000..61b0756 --- /dev/null +++ b/src/main/java/biz/nellemann/jperf/UdpClient.java @@ -0,0 +1,50 @@ +package biz.nellemann.jperf; + +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetAddress; +import java.net.SocketException; +import java.net.UnknownHostException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class UdpClient { + + final Logger log = LoggerFactory.getLogger(UdpClient.class); + + private DatagramSocket socket; + private InetAddress address; + + private byte[] buf; + + public UdpClient() throws UnknownHostException, SocketException { + log.info("UdpClient"); + socket = new DatagramSocket(); + address = InetAddress.getByName("localhost"); + } + + public void send(Datagram datagram) throws IOException { + DatagramPacket packet = new DatagramPacket(datagram.getPayload(), datagram.getLength(), address, 4445); + socket.send(packet); + } + + + public String sendEcho(String msg) throws IOException { + log.info("send() - msg: {}", msg); + + buf = msg.getBytes(); + DatagramPacket packet = new DatagramPacket(buf, buf.length, address, 4445); + socket.send(packet); + packet = new DatagramPacket(buf, buf.length); + socket.receive(packet); + String received = new String( packet.getData(), 0, packet.getLength() ); + return received; + } + + public void close() { + socket.close(); + } + +} diff --git a/src/main/java/biz/nellemann/jperf/UdpServer.java b/src/main/java/biz/nellemann/jperf/UdpServer.java new file mode 100644 index 0000000..ba73fb1 --- /dev/null +++ b/src/main/java/biz/nellemann/jperf/UdpServer.java @@ -0,0 +1,81 @@ +package biz.nellemann.jperf; + +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetAddress; +import java.net.SocketException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class UdpServer extends Thread { + + final Logger log = LoggerFactory.getLogger(UdpServer.class); + + + private DatagramSocket socket; + private boolean running; + private byte[] buf = new byte[256]; + + public UdpServer() throws SocketException { + log.info("UdpServer()"); + socket = new DatagramSocket(4445); + } + + public void run() { + running = true; + + try { + while (running) { + + DatagramPacket packet = new DatagramPacket(buf, buf.length); + socket.receive(packet); + + InetAddress address = packet.getAddress(); + int port = packet.getPort(); + + + Datagram datagram = new Datagram(buf); + + if(datagram.getType() == DataType.HANDSHAKE.getValue()) { + log.info("Handshake from ..."); + + } + + if(datagram.getType() == DataType.END.getValue()) { + running = false; + log.info("Stopping ...."); + } + + if(datagram.getType() == DataType.DATA.getValue()) { + log.info("Data .... size: {}", datagram.getLength()); + } + + + // Send response ACK + Datagram responseDatagram = new Datagram(DataType.ACK.getValue(), 32, datagram.getSequence()); + packet = new DatagramPacket(responseDatagram.getPayload(), responseDatagram.getLength(), address, port); + socket.send(packet); + + } + + socket.close(); + } catch(IOException e) { + + } + + } + + + private void ack() { + + + } + + private void receive(String msg) { + log.info("receive() - msg: {}", msg); + } + + +} diff --git a/src/test/groovy/biz/nellemann/jperf/AppTest.groovy b/src/test/groovy/biz/nellemann/jperf/AppTest.groovy new file mode 100644 index 0000000..5826a83 --- /dev/null +++ b/src/test/groovy/biz/nellemann/jperf/AppTest.groovy @@ -0,0 +1,11 @@ +/* + * This Spock specification was generated by the Gradle 'init' task. + */ +package biz.nellemann.jperf + +import spock.lang.Specification + +class AppTest extends Specification { + + +}