Netperf 1.0.4

pts/netperf-1.0.4 - 04 January 2020 - Fix results definition per https://github.com/phoronix-test-suite/phoronix-test-suite/pull/396

downloads.xml

<?xml version="1.0"?>
<!--Phoronix Test Suite v9.2.1-->
<PhoronixTestSuite>
  <Downloads>
    <Package>
      <URL>http://www.phoronix-test-suite.com/benchmark-files/netperf-2.7.0.tar.bz2</URL>
      <MD5>ad1c5342d61f297c417a93133aeba65a</MD5>
      <SHA256>842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a</SHA256>
      <FileName>netperf-2.7.0.tar.bz2</FileName>
      <FileSize>1024430</FileSize>
    </Package>
  </Downloads>
</PhoronixTestSuite>

install.sh

#!/bin/sh

tar -jxvf netperf-2.7.0.tar.bz2
cd netperf-2.7.0

if [ "X$CFLAGS_OVERRIDE" = "X" ]
then
          CFLAGS="$CFLAGS -O3 -march=native"
else
          CFLAGS="$CFLAGS_OVERRIDE"
fi

if [ "$OS_TYPE" = "BSD" ]
then
# https://github.com/HewlettPackard/netperf/commit/328fe3b56a8753f6f700aac2b2df84dda5ce93a3.patch
	cat > 328fe3b56a8753f6f700aac2b2df84dda5ce93a3.patch <<EOT
From 328fe3b56a8753f6f700aac2b2df84dda5ce93a3 Mon Sep 17 00:00:00 2001
From: raj <raj@5bbd99f3-5903-0410-b283-f1d88047b228>
Date: Fri, 7 Aug 2015 15:49:52 +0000
Subject: [PATCH] Some additional FreeBSD fixes from Andrew Gallatin.

---
 AUTHORS      | 3 ++-
 configure    | 4 ++--
 configure.ac | 4 ++--
 src/dscp.c   | 3 +++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b1a17fd..4dae415 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -107,6 +107,7 @@ calibration-free
 fixes to configure to recognize Solaris 11
 fixes to netcpu_procstat.c for later linux kernels
 workarounds to get Linux to report ENOBUFS on TX queue overflows
+FreeBSD fixes
 
 Mark Cooper
 pointing-out the need for -lresolv when compiling -DDO_DNS on RedHat
@@ -306,4 +307,4 @@ the UDP socket connected at the netserver side.
 
 Weijia Song - a fix inspiration for a NULL pointer problem.
 
-Gisle Vanem - some Windows compilation fixes
\ No newline at end of file
+Gisle Vanem - some Windows compilation fixes
diff --git a/configure b/configure
index 3935873..8fd2227 100755
--- a/configure
+++ b/configure
@@ -6567,7 +6567,7 @@ fi
 done
 
 		case "$host" in
-		*-*-freebsd78.*)
+		*-*-freebsd[7-9].* | *-*-freebsd1[0-1].* )
 			# FreeBSD 7.x and later SCTP support doesn't need -lsctp.
 			;;
 		*)
@@ -7142,7 +7142,7 @@ ac_cv_lib_kstat=ac_cv_lib_kstat_main
 			enable_cpuutil="kstat - auto"
 			NETCPU_SOURCE="kstat"
 			;;
-                     *-*-freebsd[4-8].* | *-*-netbsd[1-9].* )
+                     *-*-freebsd[4-9].* | *-*-freebsd1[0-1].* | *-*-netbsd[1-9].* )
 			use_cpuutil=true
 
 $as_echo "#define USE_SYSCTL /**/" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index 4c01090..caba026 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,7 +467,7 @@ case "$enable_sctp" in
 #include <sys/socket.h>
 ]])
 		case "$host" in
-		*-*-freebsd[78].*)
+		*-*-freebsd[[7-9]].* | *-*-freebsd1[[0-1]].* )
 			# FreeBSD 7.x and later SCTP support doesn't need -lsctp.
 			;;
 		*)
@@ -699,7 +699,7 @@ case "$enable_cpuutil" in
 			enable_cpuutil="kstat - auto"
 			NETCPU_SOURCE="kstat"
 			;;
-                     *-*-freebsd[[4-8]].* | *-*-netbsd[[1-9]].* )
+                     *-*-freebsd[[4-9]].* | *-*-freebsd1[[0-1]].* | *-*-netbsd[[1-9]].* )
 			use_cpuutil=true
 			AC_DEFINE([USE_SYSCTL],,[Use MumbleBSD's sysctl interface to measure CPU util.])
 			enable_cpuutil="sysctl - auto"
diff --git a/src/dscp.c b/src/dscp.c
index 30fcdac..1b77624 100644
--- a/src/dscp.c
+++ b/src/dscp.c
@@ -54,6 +54,9 @@ const char * iptos2str(int iptos);
  */
 
 #if HAVE_NETINET_IN_SYSTM_H
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#endif
 #include <netinet/in_systm.h>
 #endif
 #if HAVE_NETINET_IP_H
EOT
	patch -p1 < 328fe3b56a8753f6f700aac2b2df84dda5ce93a3.patch
fi

./configure CFLAGS="$CFLAGS"
make -j $NUM_CPU_CORES
echo $? > ~/install-exit-status

cd ~
echo "#!/bin/sh
cd netperf-2.7.0
./src/netperf -P 0 -v 0 \$@ | grep -v is  > \$LOG_FILE
echo \$? > ~/test-exit-status" > netperf
chmod +x netperf

results-definition.xml

<?xml version="1.0"?>
<!--Phoronix Test Suite v9.2.1-->
<PhoronixTestSuite>
  <ResultsParser>
    <OutputTemplate>#_RESULT_#</OutputTemplate>
    <MatchToTestArguments>_STREAM</MatchToTestArguments>
    <ResultScale>Megabits/sec Throughput</ResultScale>
  </ResultsParser>
  <ResultsParser>
    <OutputTemplate>#_RESULT_#</OutputTemplate>
    <MatchToTestArguments>_MAERTS</MatchToTestArguments>
    <ResultScale>Megabits/sec Throughput</ResultScale>
  </ResultsParser>
  <ResultsParser>
    <OutputTemplate>#_RESULT_#</OutputTemplate>
    <MatchToTestArguments>_SENDFILE</MatchToTestArguments>
    <ResultScale>Megabits/sec Throughput</ResultScale>
  </ResultsParser>
  <ResultsParser>
    <OutputTemplate>#_RESULT_#</OutputTemplate>
    <MatchToTestArguments>_RR</MatchToTestArguments>
    <ResultScale>Transaction Rate Per Second</ResultScale>
  </ResultsParser>
</PhoronixTestSuite>

test-definition.xml

<?xml version="1.0"?>
<!--Phoronix Test Suite v9.2.1-->
<PhoronixTestSuite>
  <TestInformation>
    <Title>Netperf</Title>
    <AppVersion>2.7.0</AppVersion>
    <Description>Netperf is a network bandwidth testing software. This test profile is used for automated testing of a netperf client and requires you have access to a netperf server.</Description>
    <Proportion>HIB</Proportion>
    <TimesToRun>3</TimesToRun>
    <PreInstallMessage>This test profile automates the testing of a Netperf client. Ensure you have a suitable Netperf server running on your network prior to running this test.</PreInstallMessage>
  </TestInformation>
  <TestProfile>
    <Version>1.0.4</Version>
    <SupportedPlatforms>Linux, BSD, Solaris, MacOSX, Windows</SupportedPlatforms>
    <SoftwareType>Benchmark</SoftwareType>
    <TestType>Network</TestType>
    <License>Free</License>
    <Status>Verified</Status>
    <ExternalDependencies>build-utilities</ExternalDependencies>
    <RequiresNetwork>TRUE</RequiresNetwork>
    <EnvironmentSize>6</EnvironmentSize>
    <ProjectURL>http://www.netperf.org/netperf/</ProjectURL>
    <Maintainer>Michael Larabel</Maintainer>
  </TestProfile>
  <TestSettings>
    <Option>
      <DisplayName>Server</DisplayName>
      <Identifier>server-address</Identifier>
      <ArgumentPrefix>-H </ArgumentPrefix>
    </Option>
    <Option>
      <DisplayName>Test</DisplayName>
      <Identifier>run-test</Identifier>
      <ArgumentPrefix>-t </ArgumentPrefix>
      <Menu>
        <Entry>
          <Name>TCP Stream - Server To Client</Name>
          <Value>TCP_STREAM</Value>
        </Entry>
        <Entry>
          <Name>TCP Stream - Client To Server</Name>
          <Value>TCP_MAERTS</Value>
        </Entry>
        <Entry>
          <Name>UDP Stream - Server To Client - 10G</Name>
          <Value>UDP_STREAM -b 10G</Value>
        </Entry>
        <Entry>
          <Name>TCP Request Response</Name>
          <Value>TCP_RR</Value>
        </Entry>
        <Entry>
          <Name>UDP Request Response</Name>
          <Value>UDP_RR</Value>
        </Entry>
        <Entry>
          <Name>TCP Send File</Name>
          <Value>TCP_SENDFILE</Value>
        </Entry>
      </Menu>
    </Option>
    <Option>
      <DisplayName>Duration</DisplayName>
      <Identifier>duration</Identifier>
      <ArgumentPrefix>-l </ArgumentPrefix>
      <Menu>
        <Entry>
          <Name>10 Seconds</Name>
          <Value>10</Value>
        </Entry>
        <Entry>
          <Name>60 Seconds</Name>
          <Value>60</Value>
        </Entry>
        <Entry>
          <Name>360 Seconds</Name>
          <Value>360</Value>
        </Entry>
      </Menu>
    </Option>
  </TestSettings>
</PhoronixTestSuite>