Changes 2.6.0:

*) Initial pass at support for --enable-intervals (WANT_INTERVALS) for
   Windows, courtesy of Jonathan Cook.

*) When in demo mode (./configure --enable-demo and a global -D
   <interval> option netperf will make sure it emits "one last
   interval result" when the test is terminated.  This should assist
   when post-processing results through the likes of rrdtool when
   there is a slow-down in the performance just at the end that would
   have stretched the interval to beyond the test termination.

*) A fix to have the AF_UNIX tests realize that the value for "take
   the system default" socket buffer size became -1 years ago.  Bug
   found by Eric Dumazet.

*) Include a patch from Dave Taht to enable symbolic manipulation of
   IP_TOS values.

*) Include a patch from Sachar Raindel to enable the omni tests to get
   ENOBUFS under Linux when the socket buffer is larger than the tx
   queue of the egress interface.  This will help preclude netperf's
   reporting a larger than link-rate send-side figure.

*) Fix a problem with late checking of the return from select() in
   src/netserver.c. Reported by Waqar Sheikh.

*) A new global -Z option has been added to netperf and netserver.
   This takes as an argument a passphrase.  In the case of netserver
   it will expect a control message with the passphrase as the first
   thing it receives on the control connection.  If netserver does not
   receive a control message with the passphrase it will close the
   control connection and move-on.  If the netserver receives a
   control message with a passprhase when it is not lookign for one,
   it will be ignored. There is at present a 20 second timeout on the
   attempted receipt of the request message. In the case of netperf,
   the passphrase will be the first thing sent on the control
   connection.  There is no response to a passphrase control message.

*) Demo mode output format will now track the omni output format. So,
   if the omni ouput format is CSV then the interim results will be
   emitted in csv. Likewise for keyval.  If the mode is human (default
   and test-specific -O) then the output remains unchanged.  Keyval
   output includes the count of interval, with a mind towards being
   able to source it in shells and whatnot.  Subject to change without
   notice.

*) A patch to correctly handle IPv6 addresses in the control messages,
   courtesy of Bjoern Zeeb.

*) The global -F option can now be used specify a local and/or remote
   fill file.

*) It is now possible to set/get the TCP congestion control algorithm
   being used by either end of the test connection when using the omni
   code.  The output selectors are LOCAL_CONG_CONTROL and
   REMOTE_CONG_CONTROL and setting is via the test-specific -K option.

*) Stop leaking file descriptors when looking-up probable egress
   interface names and I/O slot numbers.

*) The global -Y option can be used to set IP_TOS on those platforms
   which support it.  Since this is specific to IP (v4 or v6) it may
   move to a test-specific otion in the future.  It is presently
   global for foolish consistency with the -y option to set
   SO_PRIORITY.

*) The global -y option can be used to set SO_PRIORITY on those
   platforms which support it.  Based on patches from Amir Vidai.

*) The control message size has been increased from 256 bytes to 512
   bytes. THIS WILL BREAK COMPATABILITY WITH PREVIOUS VERSIONS OF
   NETPERF. However, we need more room on the pinhead on which the
   angels dance.

*) Make the "sum" field of the histogram structure a 64 bit int to
   avoid having it wrap-around on tests where the sum of all the
   measured latencies was larger than 31 bits. This was causing
   statistics like stddev to go negative in some cases.

*) If the time delta between two events is negative, do not bother
   doing any math with it in the histogram/statistics code, just
   increment the ridiculous count and move-on.

*) Fixed a bug which caused local transport retransmissions to be
   reported as -1 even though the getsockopt() call was
   successful. (Linux).  Later included remote transport
   retransmissions.

*) The src/nettest_omni.c and re-written src/netserver.c code are now
   known to have compiled under Windows 7 x64 with the Microsoft
   WDK. There remains a timing issue with confidence intervals which
   is yet to be addressed, and may have been there for ages. Netserver
   has been run as a non-spawning (-f) server, netperf has been run,
   both have run "classic" and "omni" tests.

6 files changed, 26 insertions, 39 deletions

diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index eca29c1a2f9..0fc01497e70 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/09/11 22:37:13 asau Exp $
+# $NetBSD: Makefile,v 1.10 2014/04/01 11:13:27 adam Exp $
 
-DISTNAME=	netperf-2.4.5
+DISTNAME=	netperf-2.6.0
 CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://ftp.netperf.org/netperf/
 EXTRACT_SUFX=	.tar.bz2
@@ -8,6 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.netperf.org/
 COMMENT=	Rick Jones' network performance benchmarking package
+LICENSE=	modified-bsd
 
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
@@ -18,10 +19,9 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 # The sources assume <malloc.h> exists.  Create a fake one for platforms
 # that don't have it.
+.if !exists(/usr/include/malloc.h)
 post-wrapper:
-	if ${TEST} ! -f /usr/include/malloc.h; then		\
-		${ECHO} "#include <stdlib.h>"			\
-			> ${BUILDLINK_DIR}/include/malloc.h;	\
-	fi
+	${ECHO} "#include <stdlib.h>" > ${BUILDLINK_DIR}/include/malloc.h
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/netperf/distinfo b/benchmarks/netperf/distinfo
index 2233031f548..bdcaa5b40c3 100644
--- a/benchmarks/netperf/distinfo
+++ b/benchmarks/netperf/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2010/12/30 08:05:18 obache Exp $
+$NetBSD: distinfo,v 1.7 2014/04/01 11:13:27 adam Exp $
 
-SHA1 (netperf-2.4.5.tar.bz2) = ccfe3d11ce520c75dc394277b1bea49f353e032d
-RMD160 (netperf-2.4.5.tar.bz2) = 5791ebfcc798b968dd85e591bb96ade925208294
-Size (netperf-2.4.5.tar.bz2) = 960609 bytes
-SHA1 (patch-aa) = a910b966c414f3a7cd5b0d898726966e47969522
-SHA1 (patch-ab) = 0c6114063e3bf0bf0875013aa55a03f7533ff9a6
-SHA1 (patch-ah) = 6ca99c4ce567ff2a36f49426e604c7bdfd31f02d
-SHA1 (patch-ak) = 98228d85034878ff3f0c25bebcc80a6006a2f9f4
+SHA1 (netperf-2.6.0.tar.bz2) = 3e1be4e7c3f7a838c4d5c00c6d20a619b320bfef
+RMD160 (netperf-2.6.0.tar.bz2) = c3adf0b67e1d8e8a51c229910aa7347182991df2
+Size (netperf-2.6.0.tar.bz2) = 1032953 bytes
+SHA1 (patch-ab) = 096eed1eccf6a2f7003898711384ed67019800d7
+SHA1 (patch-ah) = b2ee5c6312ed987d6b796fa462dcc3557146580f
+SHA1 (patch-ak) = 68628408979f164f2843bbe0eac0cb122af3b4fc
diff --git a/benchmarks/netperf/patches/patch-aa b/benchmarks/netperf/patches/patch-aa
deleted file mode 100644
index 5e5126f1db4..00000000000
--- a/benchmarks/netperf/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2010/05/06 11:14:01 adam Exp $
-
---- src/net_uuid.c.orig	2010-05-06 12:52:11.000000000 +0000
-+++ src/net_uuid.c
-@@ -38,7 +38,6 @@
- #else
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/sysinfo.h>
- #endif
- 
- /* system dependent call to get the current system time. Returned as
diff --git a/benchmarks/netperf/patches/patch-ab b/benchmarks/netperf/patches/patch-ab
index 46268051bbf..a99080fe128 100644
--- a/benchmarks/netperf/patches/patch-ab
+++ b/benchmarks/netperf/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2010/12/30 08:05:18 obache Exp $
+$NetBSD: patch-ab,v 1.4 2014/04/01 11:13:27 adam Exp $
 
 * sendfile(2) of DragonFly is FreeBSD in origin. 
 
---- src/nettest_bsd.c.orig	2009-06-04 00:31:15.000000000 +0000
+--- src/nettest_bsd.c.orig	2012-06-19 20:32:47.000000000 +0000
 +++ src/nettest_bsd.c
-@@ -4372,7 +4372,7 @@ Size (bytes)\n\
+@@ -4560,7 +4560,7 @@ Size (bytes)\n\
        sv.sfv_off = send_ring->offset;
        sv.sfv_len =  send_ring->length;
        if ((len = sendfilev(send_socket, &sv, 1, &scratch_len)) != send_size)
 -#elif defined(__FreeBSD__)
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
  	/* so close to HP-UX and yet so far away... :) */
- 	if ((sendfile(send_ring->fildes, 
- 		      send_socket, 
+ 	if ((sendfile(send_ring->fildes,
+ 		      send_socket,
diff --git a/benchmarks/netperf/patches/patch-ah b/benchmarks/netperf/patches/patch-ah
index fa0dc929f01..accad6ff3c9 100644
--- a/benchmarks/netperf/patches/patch-ah
+++ b/benchmarks/netperf/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.2 2010/05/06 11:14:01 adam Exp $
+$NetBSD: patch-ah,v 1.3 2014/04/01 11:13:27 adam Exp $
 
---- src/netlib.h.orig	2008-10-30 20:48:46.000000000 +0000
+--- src/netlib.h.orig	2012-06-19 20:46:47.000000000 +0000
 +++ src/netlib.h
-@@ -476,6 +476,7 @@ extern  int     lib_num_rem_cpus;
+@@ -489,6 +489,7 @@ extern  int     lib_num_rem_cpus;
  extern  SOCKET  server_sock;
  extern  int     times_up;
  extern  FILE    *where;
 +extern	 int     fd;
  extern  int     loops_per_msec;
  extern  float   lib_local_per_cpu_util[];
-   
+ 
diff --git a/benchmarks/netperf/patches/patch-ak b/benchmarks/netperf/patches/patch-ak
index eb471319961..f5efc4f3469 100644
--- a/benchmarks/netperf/patches/patch-ak
+++ b/benchmarks/netperf/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.2 2010/05/06 11:14:01 adam Exp $
+$NetBSD: patch-ak,v 1.3 2014/04/01 11:13:27 adam Exp $
 
---- src/netlib.c.orig	2009-05-27 22:27:34.000000000 +0000
+--- src/netlib.c.orig	2012-06-19 20:32:29.000000000 +0000
 +++ src/netlib.c
-@@ -262,6 +262,7 @@ union   netperf_request_struct  netperf_
+@@ -259,6 +259,7 @@ union   netperf_request_struct  netperf_
  union   netperf_response_struct netperf_response;
  
  FILE    *where;
 +int     fd = -1;
  
  char    libfmt = '?';
-         
+