pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/benchmarks/netio Update to netio 1.33
details: https://anonhg.NetBSD.org/pkgsrc/rev/e5552c4113e5
branches: trunk
changeset: 414445:e5552c4113e5
user: jdolecek <jdolecek%pkgsrc.org@localhost>
date: Fri Mar 27 16:02:04 2020 +0000
description:
Update to netio 1.33
Change list since 1.26 not available, but at least the ancient patch
fixing compilation with GCC seems to no longer be available.
Bring over also patch from FreeBSD ports to compile a variant
with rudimentary IPv6 support.
diffstat:
benchmarks/netio/Makefile | 19 +-
benchmarks/netio/PLIST | 3 +-
benchmarks/netio/distinfo | 13 +-
benchmarks/netio/patches/patch-Makefile | 16 +
benchmarks/netio/patches/patch-aa | 41 ---
benchmarks/netio/patches/patch-netio.c | 335 ++++++++++++++++++++++++++++++++
6 files changed, 373 insertions(+), 54 deletions(-)
diffs (truncated from 475 to 300 lines):
diff -r bd27a6a3919e -r e5552c4113e5 benchmarks/netio/Makefile
--- a/benchmarks/netio/Makefile Fri Mar 27 15:55:15 2020 +0000
+++ b/benchmarks/netio/Makefile Fri Mar 27 16:02:04 2020 +0000
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.21 2015/10/11 10:56:43 tron Exp $
+# $NetBSD: Makefile,v 1.22 2020/03/27 16:02:04 jdolecek Exp $
-DISTNAME= netio126
-PKGNAME= netio-1.26
+DISTNAME= netio133
+PKGNAME= netio-1.33
CATEGORIES= benchmarks net
-MASTER_SITES= http://www.ars.de/ars/ars.nsf/f24a6a0b94c22d82862566960071bf5a/aa577bc4be573b05c125706d004c75b5/\$$FILE/
+MASTER_SITES= http://www.ars.de/
EXTRACT_SUFX= .zip
-HOMEPAGE= http://www.ars.de/ars/ars.nsf/docs/netio
+HOMEPAGE= https://web.ars.de/netio/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Network benchmark for OS/2 2.x, Windows NT/2000 and Unix
LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}
-MAKE_FLAGS+= CC=${CC:Q} CFLAGS="-DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}" \
+NETIO_CFLAGS+= -DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}
+MAKE_FLAGS+= CC=${CC:Q} CFLAGS="${NETIO_CFLAGS}" \
LFLAGS="${PTHREAD_LDFLAGS} ${LDFLAGS}" \
LIBS="${PTHREAD_LIBS} ${LIBS}" O=.o OUT=-o X=
@@ -22,8 +23,14 @@
INSTALLATION_DIRS= bin
+post-build:
+ ${RUN}cd ${WRKSRC} && \
+ ${BUILD_MAKE_CMD} O=.6o X=6 CFLAGS="${NETIO_CFLAGS} -DUSE_IPV6" \
+ ${BUILD_TARGET}
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/netio ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/netio
${INSTALL_DATA} ${WRKSRC}/netio.doc \
${DESTDIR}${PREFIX}/share/doc/netio/netio.txt
diff -r bd27a6a3919e -r e5552c4113e5 benchmarks/netio/PLIST
--- a/benchmarks/netio/PLIST Fri Mar 27 15:55:15 2020 +0000
+++ b/benchmarks/netio/PLIST Fri Mar 27 16:02:04 2020 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:33:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/03/27 16:02:04 jdolecek Exp $
bin/netio
+bin/netio6
share/doc/netio/netio.txt
diff -r bd27a6a3919e -r e5552c4113e5 benchmarks/netio/distinfo
--- a/benchmarks/netio/distinfo Fri Mar 27 15:55:15 2020 +0000
+++ b/benchmarks/netio/distinfo Fri Mar 27 16:02:04 2020 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 00:25:51 agc Exp $
+$NetBSD: distinfo,v 1.12 2020/03/27 16:02:04 jdolecek Exp $
-SHA1 (netio126.zip) = ef63e9b0564445a1831b53be98a5472dbceaa922
-RMD160 (netio126.zip) = bff92f25df1df87c7075432b1da3e0f7defe1e30
-SHA512 (netio126.zip) = ff3d704621d6dcee11c88a79cc8037b3d3c8afb7fb508256c4045e119e65b754749355d12262d8f1039779cf45cb2e9f116a186f0c9ec822b66251d984e7025a
-Size (netio126.zip) = 140402 bytes
-SHA1 (patch-aa) = 194bb630fd09f2cc5c8a6842212eb01adb676584
+SHA1 (netio133.zip) = ffc562dfe45127e58fcfb7dcf325317e29809baf
+RMD160 (netio133.zip) = 544a3bcc53db6363c7d2601d63430e102237f75e
+SHA512 (netio133.zip) = 79a4d8ad5a5d9750a19bf7f8f4cc762e6d1a866a63138bfc1cf8614057eb8ade147817e489f93210990ce9d82be03a5053821663212fbee71c4cd46c2f9c9232
+Size (netio133.zip) = 235931 bytes
+SHA1 (patch-Makefile) = 79bff1eb7b526a0f41fbb89e646c66a16b78c23e
+SHA1 (patch-netio.c) = bdd658e03101fa820e614c0a1113a8688e485a7f
diff -r bd27a6a3919e -r e5552c4113e5 benchmarks/netio/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/netio/patches/patch-Makefile Fri Mar 27 16:02:04 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2020/03/27 16:02:04 jdolecek Exp $
+
+Patch to add way to compile with IPv6 support. Patch taken from:
+https://svnweb.freebsd.org/ports/head/benchmarks/netio/files/patch-Makefile
+
+--- Makefile.orig 2012-12-11 20:54:30.000000000 +0000
++++ Makefile
+@@ -111,7 +111,7 @@ netio$X: netio$O getopt$O
+
+ .SUFFIXES: .c $O
+ .c$O:
+- $(CC) $(CFLAGS) $(INC) -c $*.c
++ $(CC) $(OUT) $@ $(CFLAGS) $(INC) -c $*.c
+
+ netio$O: netio.c getopt.h
+ getopt$O: getopt.c getopt.h
diff -r bd27a6a3919e -r e5552c4113e5 benchmarks/netio/patches/patch-aa
--- a/benchmarks/netio/patches/patch-aa Fri Mar 27 15:55:15 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/07/02 15:12:52 tron Exp $
-
---- netio.c.orig 2005-08-30 16:47:18.000000000 +0100
-+++ netio.c 2006-07-02 16:08:52.000000000 +0100
-@@ -796,7 +796,7 @@
- long long nData;
- struct sockaddr_in sa_server, sa_client;
- int server, client;
-- size_t length;
-+ socklen_t length;
- struct timeval tv;
- fd_set fds;
- int rc;
-@@ -1123,7 +1123,7 @@
- char *cBuffer;
- struct sockaddr_in sa_server, sa_client;
- int rc;
-- size_t nBytes;
-+ socklen_t nBytes;
-
- if ((cBuffer = InitBuffer(TMAXSIZE)) == NULL)
- {
-@@ -1187,6 +1187,7 @@
- fd_set fds;
- int rc, nByte;
- size_t nLength;
-+ socklen_t sLength;
-
- if ((cBuffer = InitBuffer(TMAXSIZE)) == NULL)
- {
-@@ -1242,8 +1243,8 @@
- if (rc == 0 || FD_ISSET(server, &fds) == 0)
- continue;
-
-- nLength = sizeof(sa_client);
-- if ((client = accept(server, (struct sockaddr *) &sa_client, &nLength)) == -1)
-+ sLength = sizeof(sa_client);
-+ if ((client = accept(server, (struct sockaddr *) &sa_client, &sLength)) == -1)
- continue;
-
- setsockopt(client, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize));
diff -r bd27a6a3919e -r e5552c4113e5 benchmarks/netio/patches/patch-netio.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/netio/patches/patch-netio.c Fri Mar 27 16:02:04 2020 +0000
@@ -0,0 +1,335 @@
+$NetBSD: patch-netio.c,v 1.1 2020/03/27 16:02:04 jdolecek Exp $
+
+Add support for compiling with IPv6 support. Patch taken from:
+https://svnweb.freebsd.org/ports/head/benchmarks/netio/files/patch-netio.c
+
+--- netio.c.orig 2018-12-16 23:44:34.000000000 +0100
++++ netio.c 2020-03-27 16:37:07.000000000 +0100
+@@ -142,6 +142,7 @@
+ #include <signal.h>
+ #include <time.h>
+ #if defined(UNIX) || defined(DJGPP)
++#include <arpa/inet.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <errno.h>
+@@ -559,7 +560,7 @@
+
+ int recv_data(int socket, void *buffer, size_t size, int flags)
+ {
+- size_t rc = recv(socket, buffer, size, flags);
++ ssize_t rc = recv(socket, buffer, size, flags);
+
+ if (rc < 0)
+ {
+@@ -576,8 +577,13 @@
+ const int sobufsize = 131072;
+ int nPort = DEFAULTPORT;
+ int nAuxPort = DEFAULTPORT + 1;
++#ifdef USE_IPV6
++struct in6_addr addr_server;
++struct in6_addr addr_local;
++#else
+ struct in_addr addr_server;
+ struct in_addr addr_local;
++#endif
+
+ int udpsocket, udpd;
+ unsigned long nUDPCount;
+@@ -590,7 +596,11 @@
+ TIMER nTimer;
+ long nTime;
+ long long nData;
++#ifdef USE_IPV6
++ struct sockaddr_in6 sa_server, sa_client;
++#else
+ struct sockaddr_in sa_server, sa_client;
++#endif
+ int server, client;
+ socklen_type length;
+ struct timeval tv;
+@@ -605,7 +615,11 @@
+ return THREADRESULT;
+ }
+
++#ifdef USE_IPV6
++ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
++#else
+ if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0)
++#endif
+ {
+ psock_errno("socket()");
+ free(cBuffer);
+@@ -616,9 +630,15 @@
+ setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize));
+ setsockopt(server, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
+
++#ifdef USE_IPV6
++ sa_server.sin6_family = AF_INET6;
++ sa_server.sin6_port = htons(nPort);
++ sa_server.sin6_addr = addr_local;
++#else
+ sa_server.sin_family = AF_INET;
+ sa_server.sin_port = htons(nPort);
+ sa_server.sin_addr = addr_local;
++#endif
+
+ if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
+ {
+@@ -768,7 +788,11 @@
+ long nTime;
+ long long nData;
+ int i;
++#ifdef USE_IPV6
++ struct sockaddr_in6 sa_server, sa_client;
++#else
+ struct sockaddr_in sa_server, sa_client;
++#endif
+ int server;
+ int rc;
+ int nByte;
+@@ -780,7 +804,11 @@
+ return;
+ }
+
++#ifdef USE_IPV6
++ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
++#else
+ if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0)
++#endif
+ {
+ psock_errno("socket()");
+ free(cBuffer);
+@@ -791,9 +819,15 @@
+ setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize));
+ setsockopt(server, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
+
++#ifdef USE_IPV6
++ sa_client.sin6_family = AF_INET6;
++ sa_client.sin6_port = htons(0);
++ sa_client.sin6_addr = addr_local;
++#else
+ sa_client.sin_family = AF_INET;
+ sa_client.sin_port = htons(0);
+ sa_client.sin_addr = addr_local;
++#endif
+
+ if (bind(server, (struct sockaddr *) &sa_client, sizeof(sa_client)) < 0)
+ {
+@@ -803,9 +837,15 @@
+ return;
+ }
+
++#ifdef USE_IPV6
++ sa_server.sin6_family = AF_INET6;
++ sa_server.sin6_port = htons(nPort);
++ sa_server.sin6_addr = addr_server;
++#else
+ sa_server.sin_family = AF_INET;
+ sa_server.sin_port = htons(nPort);
+ sa_server.sin_addr = addr_server;
++#endif
+
+ if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
+ {
+@@ -928,7 +968,11 @@
+ THREAD UDP_Receiver(void *arg)
+ {
+ char *cBuffer;
++#ifdef USE_IPV6
++ struct sockaddr_in6 sa_server, sa_client;
++#else
+ struct sockaddr_in sa_server, sa_client;
++#endif
+ int rc;
+ socklen_type nBytes;
+
+@@ -938,7 +982,11 @@
+ return THREADRESULT;
+ }
+
++#ifdef USE_IPV6
++ if ((udpsocket = socket(PF_INET6, SOCK_DGRAM, 0)) < 0)
++#else
+ if ((udpsocket = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
++#endif
+ {
+ psock_errno("socket(DGRAM)");
+ free(cBuffer);
+@@ -948,9 +996,15 @@
+ setsockopt(udpsocket, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize));
Home |
Main Index |
Thread Index |
Old Index