diff options
Diffstat (limited to 'benchmarks/netperf/patches')
| -rw-r--r-- | benchmarks/netperf/patches/patch-aa | 12 | ||||
| -rw-r--r-- | benchmarks/netperf/patches/patch-ab | 10 | ||||
| -rw-r--r-- | benchmarks/netperf/patches/patch-ah | 8 | ||||
| -rw-r--r-- | benchmarks/netperf/patches/patch-ak | 8 |
4 files changed, 13 insertions, 25 deletions
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 = '?'; - + |