[Midnightbsd-cvs] mports [19450] U trunk/benchmarks/netio/files/patch-netio.c: netio 1.32
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jun 10 18:14:35 EDT 2015
Revision: 19450
http://svnweb.midnightbsd.org/mports/?rev=19450
Author: laffer1
Date: 2015-06-10 18:14:34 -0400 (Wed, 10 Jun 2015)
Log Message:
-----------
netio 1.32
Modified Paths:
--------------
trunk/benchmarks/netio/Makefile
trunk/benchmarks/netio/distinfo
trunk/benchmarks/netio/files/patch-netio.c
Property Changed:
----------------
trunk/benchmarks/netio/files/patch-Makefile
trunk/benchmarks/netio/files/patch-netio.c
Modified: trunk/benchmarks/netio/Makefile
===================================================================
--- trunk/benchmarks/netio/Makefile 2015-06-10 21:51:53 UTC (rev 19449)
+++ trunk/benchmarks/netio/Makefile 2015-06-10 22:14:34 UTC (rev 19450)
@@ -2,12 +2,10 @@
# $FreeBSD: ports/benchmarks/netio/Makefile,v 1.5 2006/09/02 12:07:20 arved Exp $
PORTNAME= netio
-PORTVERSION= 1.26
-PORTREVISION= 1
+PORTVERSION= 1.32
CATEGORIES= benchmarks net ipv6
-MASTER_SITES= ${MASTER_SITE_FREEBSD_LOCAL}
-MASTER_SITE_SUBDIR= arved
-DISTNAME= netio126
+MASTER_SITES= FREEBSD_LOCAL/arved
+DISTNAME= netio132
MAINTAINER= ports at MidnightBSD.org
COMMENT= Network benchmark
@@ -21,9 +19,10 @@
WRKSRC= ${WRKDIR}
USES= gmake zip
+PATCH_ARGS= -d ${PATCH_WRKSRC} -N -s -E ${PATCH_STRIP} -l
PLIST_FILES= bin/netio
-CFLAGS+= -DUNIX
+CFLAGS+= -DUNIX -DSOCKLEN_T
LIBS+= -pthread
MAKE_ENV+= OUT=-o
Modified: trunk/benchmarks/netio/distinfo
===================================================================
--- trunk/benchmarks/netio/distinfo 2015-06-10 21:51:53 UTC (rev 19449)
+++ trunk/benchmarks/netio/distinfo 2015-06-10 22:14:34 UTC (rev 19450)
@@ -1,2 +1,2 @@
-SHA256 (netio126.zip) = 86c0bdee3224477b43c0cb6161ce1a20b2a2b6d59ef37f67864227096d9e8d5c
-SIZE (netio126.zip) = 140402
+SHA256 (netio132.zip) = c21550dfac6634558a7a79957eed28c46c62e0543017ef9d5c97c49f3cd41ddd
+SIZE (netio132.zip) = 162484
Index: trunk/benchmarks/netio/files/patch-Makefile
===================================================================
--- trunk/benchmarks/netio/files/patch-Makefile 2015-06-10 21:51:53 UTC (rev 19449)
+++ trunk/benchmarks/netio/files/patch-Makefile 2015-06-10 22:14:34 UTC (rev 19450)
Property changes on: trunk/benchmarks/netio/files/patch-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/benchmarks/netio/files/patch-netio.c
===================================================================
--- trunk/benchmarks/netio/files/patch-netio.c 2015-06-10 21:51:53 UTC (rev 19449)
+++ trunk/benchmarks/netio/files/patch-netio.c 2015-06-10 22:14:34 UTC (rev 19450)
@@ -1,282 +1,335 @@
---- netio.c.orig Tue Aug 30 16:47:18 2005
-+++ netio.c Sat Sep 2 13:46:50 2006
-@@ -782,8 +782,13 @@
+--- netio.c.orig 2012-11-22 17:47:38.000000000 +0100
++++ netio.c 2015-03-23 11:52:42.000000000 +0100
+@@ -136,6 +136,7 @@
+ #include <ctype.h>
+ #include <signal.h>
+ #if defined(UNIX) || defined(DJGPP)
++#include <arpa/inet.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <errno.h>
+@@ -546,7 +547,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)
+ {
+@@ -563,8 +564,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
++#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
++#endif
int udpsocket, udpd;
unsigned long nUDPCount;
-@@ -794,7 +799,11 @@
- char *cBuffer;
- CONTROL ctl;
+@@ -577,7 +583,11 @@
+ TIMER nTimer;
+ long nTime;
long long nData;
-+#ifdef USE_IPV6
-+ struct sockaddr_in6 sa_server, sa_client;
-+#else
++#ifdef USE_IPV6
++ struct sockaddr_in6 sa_server, sa_client;
++#else
struct sockaddr_in sa_server, sa_client;
-+#endif
++#endif
int server, client;
- size_t length;
+ socklen_type length;
struct timeval tv;
-@@ -808,7 +817,11 @@
+@@ -591,7 +601,11 @@
return THREADRESULT;
}
-+#ifdef USE_IPV6
-+ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
-+#else
++#ifdef USE_IPV6
++ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
++#else
if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0)
-+#endif
++#endif
{
psock_errno("socket()");
free(cBuffer);
-@@ -818,10 +831,15 @@
+@@ -601,9 +615,15 @@
setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize));
setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize));
-+#ifdef USE_IPV6
-+ sa_server.sin6_family = AF_INET6;
-+ sa_server.sin6_port = htons(nPort);
-+ sa_server.sin6_addr = addr_local;
-+#else
++#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
++#endif
+
if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
{
- psock_errno("bind()");
-@@ -958,7 +976,11 @@
- long nTime, nResult;
+@@ -753,7 +773,11 @@
+ long nTime;
long long nData;
int i;
-+#ifdef USE_IPV6
-+ struct sockaddr_in6 sa_server;
-+#else
- struct sockaddr_in sa_server;
-+#endif
++#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;
-@@ -969,7 +991,11 @@
+@@ -764,7 +788,11 @@
return;
}
-+#ifdef USE_IPV6
-+ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
-+#else
++#ifdef USE_IPV6
++ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
++#else
if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0)
-+#endif
++#endif
{
psock_errno("socket()");
free(cBuffer);
-@@ -979,9 +1005,16 @@
+@@ -774,21 +802,33 @@
setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize));
setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize));
-+#ifdef USE_IPV6
-+ sa_server.sin6_family = AF_INET6;
-+ sa_server.sin6_port = htons(nPort);
-+ sa_server.sin6_addr = addr_server;
-+
-+#else
++#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)
+ {
+ psock_errno("bind()");
+ soclose(server);
+ free(cBuffer);
+- return THREADRESULT;
++ 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
++#endif
if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
{
-@@ -1121,7 +1154,11 @@
+@@ -911,7 +951,11 @@
THREAD UDP_Receiver(void *arg)
{
char *cBuffer;
-+#ifdef USE_IPV6
-+ struct sockaddr_in6 sa_server, sa_client;
-+#else
++#ifdef USE_IPV6
++ struct sockaddr_in6 sa_server, sa_client;
++#else
struct sockaddr_in sa_server, sa_client;
-+#endif
++#endif
int rc;
- size_t nBytes;
+ socklen_type nBytes;
-@@ -1131,7 +1168,11 @@
+@@ -921,7 +965,11 @@
return THREADRESULT;
}
-+#ifdef USE_IPV6
-+ if ((udpsocket = socket(PF_INET6, SOCK_DGRAM, 0)) < 0)
-+#else
++#ifdef USE_IPV6
++ if ((udpsocket = socket(PF_INET6, SOCK_DGRAM, 0)) < 0)
++#else
if ((udpsocket = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
-+#endif
++#endif
{
psock_errno("socket(DGRAM)");
free(cBuffer);
-@@ -1141,9 +1182,15 @@
+@@ -931,9 +979,15 @@
setsockopt(udpsocket, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize));
setsockopt(udpsocket, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize));
-+#ifdef USE_IPV6
-+ sa_server.sin6_family = AF_INET6;
-+ sa_server.sin6_port = htons(nAuxPort);
-+ sa_server.sin6_addr = addr_local;
-+#else
++#ifdef USE_IPV6
++ sa_server.sin6_family = AF_INET6;
++ sa_server.sin6_port = htons(nAuxPort);
++ sa_server.sin6_addr = addr_local;
++#else
sa_server.sin_family = AF_INET;
sa_server.sin_port = htons(nAuxPort);
sa_server.sin_addr = addr_local;
-+#endif
++#endif
if (bind(udpsocket, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
{
-@@ -1181,7 +1228,11 @@
- char *cBuffer;
- CONTROL ctl;
+@@ -973,7 +1027,11 @@
+ TIMER nTimer;
+ long nTime;
long long nData;
-+#ifdef USE_IPV6
-+ struct sockaddr_in6 sa_server, sa_client;
-+#else
++#ifdef USE_IPV6
++ struct sockaddr_in6 sa_server, sa_client;
++#else
struct sockaddr_in sa_server, sa_client;
-+#endif
++#endif
int server, client;
struct timeval tv;
fd_set fds;
-@@ -1194,7 +1245,11 @@
+@@ -986,7 +1044,11 @@
return THREADRESULT;
}
-+#ifdef USE_IPV6
-+ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
-+#else
++#ifdef USE_IPV6
++ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
++#else
if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0)
-+#endif
++#endif
{
psock_errno("socket(STREAM)");
free(cBuffer);
-@@ -1204,9 +1259,15 @@
+@@ -996,9 +1058,15 @@
setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize));
setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize));
-+#ifdef USE_IPV6
-+ sa_server.sin6_family = AF_INET6;
-+ sa_server.sin6_port = htons(nAuxPort);
-+ sa_server.sin6_addr = addr_local;
-+#else
++#ifdef USE_IPV6
++ sa_server.sin6_family = AF_INET6;
++ sa_server.sin6_port = htons(nAuxPort);
++ sa_server.sin6_addr = addr_local;
++#else
sa_server.sin_family = AF_INET;
sa_server.sin_port = htons(nAuxPort);
sa_server.sin_addr = addr_local;
-+#endif
++#endif
if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
{
-@@ -1252,7 +1313,11 @@
+@@ -1044,7 +1112,11 @@
printf("UDP connection established ... ");
fflush(stdout);
-+#ifdef USE_IPV6
-+ sa_client.sin6_port = htons(nAuxPort);
-+#else
++#ifdef USE_IPV6
++ sa_client.sin6_port = htons(nAuxPort);
++#else
sa_client.sin_port = htons(nAuxPort);
-+#endif
++#endif
for (;;)
{
-@@ -1345,7 +1410,11 @@
- long nTime, nResult, nCount;
+@@ -1160,7 +1232,11 @@
+ long nResult;
long long nData;
int i;
-+#ifdef USE_IPV6
-+ struct sockaddr_in6 sa_server;
-+#else
- struct sockaddr_in sa_server;
-+#endif
++#ifdef USE_IPV6
++ struct sockaddr_in6 sa_server, sa_client;
++#else
+ struct sockaddr_in sa_server, sa_client;
++#endif
int server;
int rc, nByte;
-@@ -1355,7 +1424,11 @@
+@@ -1170,7 +1246,11 @@
return;
}
-+#ifdef USE_IPV6
-+ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
-+#else
++#ifdef USE_IPV6
++ if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
++#else
if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0)
-+#endif
++#endif
{
psock_errno("socket()");
free(cBuffer);
-@@ -1365,9 +1438,15 @@
+@@ -1180,21 +1260,33 @@
setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize));
setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize));
-+#ifdef USE_IPV6
-+ sa_server.sin6_family = AF_INET6;
-+ sa_server.sin6_port = htons(nAuxPort);
-+ sa_server.sin6_addr = addr_server;
-+#else
++#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)
+ {
+ psock_errno("bind(STREAM)");
+ soclose(server);
+ free(cBuffer);
+- return THREADRESULT;
++ return;
+ }
+
++#ifdef USE_IPV6
++ sa_server.sin6_family = AF_INET6;
++ sa_server.sin6_port = htons(nAuxPort);
++ sa_server.sin6_addr = addr_server;
++#else
sa_server.sin_family = AF_INET;
sa_server.sin_port = htons(nAuxPort);
sa_server.sin_addr = addr_server;
-+#endif
++#endif
if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
{
-@@ -1669,17 +1748,29 @@
+@@ -1425,17 +1517,29 @@
return psock_errno("sock_init()"), 1;
if (szLocal == 0)
-+#ifdef USE_IPV6
-+ addr_local = in6addr_any;
-+#else
++#ifdef USE_IPV6
++ addr_local = in6addr_any;
++#else
addr_local.s_addr = INADDR_ANY;
-+#endif
++#endif
else
{
if (isdigit(*szLocal))
-+#ifdef USE_IPV6
-+ inet_pton(AF_INET6, szLocal, &addr_local);
-+#else
++#ifdef USE_IPV6
++ inet_pton(AF_INET6, szLocal, &addr_local);
++#else
addr_local.s_addr = inet_addr(szLocal);
-+#endif
++#endif
else
{
if ((host = gethostbyname(szLocal)) == NULL)
return psock_errno("gethostbyname()"), 1;
-+#ifdef USE_IPV6
-+ addr_local = * (struct in6_addr *) (host->h_addr);
-+#else
++#ifdef USE_IPV6
++ addr_local = * (struct in6_addr *) (host->h_addr);
++#else
addr_local = * (struct in_addr *) (host->h_addr);
-+#endif
++#endif
}
}
-@@ -1689,13 +1780,21 @@
+@@ -1445,13 +1549,21 @@
usage();
if (isdigit(*argv[optind]))
-+#ifdef USE_IPV6
-+ inet_pton(AF_INET6, argv[optind], &addr_server);
-+#else
++#ifdef USE_IPV6
++ inet_pton(AF_INET6, argv[optind], &addr_server);
++#else
addr_server.s_addr = inet_addr(argv[optind]);
-+#endif
++#endif
else
{
if ((host = gethostbyname(argv[optind])) == NULL)
return psock_errno("gethostbyname()"), 1;
-+#ifdef USE_IPV6
-+ addr_server = * (struct in6_addr *) (host->h_addr);
-+#else
++#ifdef USE_IPV6
++ addr_server = * (struct in6_addr *) (host->h_addr);
++#else
addr_server = * (struct in_addr *) (host->h_addr);
-+#endif
++#endif
}
}
}
Property changes on: trunk/benchmarks/netio/files/patch-netio.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list