From 1706de5927c396e820f2596c98a06cc0b47c7578 Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 17 Apr 2001 11:57:41 +0000 Subject: Move "ttcp" package to category "benchmarks". --- benchmarks/Makefile | 3 +- benchmarks/ttcp/Makefile | 25 +++++++++++++ benchmarks/ttcp/distinfo | 5 +++ benchmarks/ttcp/patches/patch-aa | 14 +++++++ benchmarks/ttcp/patches/patch-ab | 79 ++++++++++++++++++++++++++++++++++++++++ benchmarks/ttcp/pkg/DESCR | 5 +++ benchmarks/ttcp/pkg/PLIST | 4 ++ net/Makefile | 3 +- net/ttcp/Makefile | 25 ------------- net/ttcp/distinfo | 5 --- net/ttcp/patches/patch-aa | 14 ------- net/ttcp/patches/patch-ab | 79 ---------------------------------------- net/ttcp/pkg/DESCR | 5 --- net/ttcp/pkg/PLIST | 4 -- 14 files changed, 135 insertions(+), 135 deletions(-) create mode 100644 benchmarks/ttcp/Makefile create mode 100644 benchmarks/ttcp/distinfo create mode 100644 benchmarks/ttcp/patches/patch-aa create mode 100644 benchmarks/ttcp/patches/patch-ab create mode 100644 benchmarks/ttcp/pkg/DESCR create mode 100644 benchmarks/ttcp/pkg/PLIST delete mode 100644 net/ttcp/Makefile delete mode 100644 net/ttcp/distinfo delete mode 100644 net/ttcp/patches/patch-aa delete mode 100644 net/ttcp/patches/patch-ab delete mode 100644 net/ttcp/pkg/DESCR delete mode 100644 net/ttcp/pkg/PLIST diff --git a/benchmarks/Makefile b/benchmarks/Makefile index 20b6aef60f9..8245fea7ab4 100644 --- a/benchmarks/Makefile +++ b/benchmarks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/02/16 15:51:47 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2001/04/17 11:57:41 tron Exp $ # COMMENT= Benchmarking tools @@ -20,6 +20,7 @@ SUBDIR+= lmbench SUBDIR+= nsieve SUBDIR+= paranoia SUBDIR+= postmark +SUBDIR+= ttcp SUBDIR+= whetstone SUBDIR+= xengine diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile new file mode 100644 index 00000000000..3fecb350900 --- /dev/null +++ b/benchmarks/ttcp/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1 2001/04/17 11:57:41 tron Exp $ + +DISTNAME= ttcp +PKGNAME= ${DISTNAME}-1.12 +CATEGORIES= benchmarks net +MASTER_SITES= http://www.ccci.com/tools/ttcp/ +EXTRACT_SUFX= .tar.Z + +MAINTAINER= thorpej@netbsd.org +HOMEPAGE= http://www.ccci.com/tools/ttcp/ +COMMENT= TCP testing and performance measuring tool + +.include "../../mk/bsd.prefs.mk" + +MANCOMPRESSED_IF_MANZ= YES +WRKSRC= ${WRKDIR} + +.if (${OPSYS} == SunOS) +do-build: + cd ${WRKSRC} && \ + ${CC} ttcp.c ${CFLAGS} $(LDFLAGS) -lsocket -lnsl -o ttcp && \ + nroff -man ttcp.1 >ttcp.cat1 +.endif + +.include "../../mk/bsd.pkg.mk" diff --git a/benchmarks/ttcp/distinfo b/benchmarks/ttcp/distinfo new file mode 100644 index 00000000000..59c317b1400 --- /dev/null +++ b/benchmarks/ttcp/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2001/04/17 11:57:41 tron Exp $ + +MD5 (ttcp.tar.Z) = 3688ca186d5da6fd83ade7c6a0150b1d +SHA1 (patch-aa) = 19d81ba1e6bfaf6527eb8fce29f2276c89f9a35e +SHA1 (patch-ab) = 888878128e67dfb88d9898a27af765334264e6ef diff --git a/benchmarks/ttcp/patches/patch-aa b/benchmarks/ttcp/patches/patch-aa new file mode 100644 index 00000000000..90734063da1 --- /dev/null +++ b/benchmarks/ttcp/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1 2001/04/17 11:57:42 tron Exp $ + +--- Makefile.orig Sat Mar 7 13:39:48 1998 ++++ Makefile Sat Mar 7 13:40:07 1998 +@@ -0,0 +1,9 @@ ++ ++PROG= ttcp ++ ++BINDIR=${PREFIX}/bin ++MANDIR=${PREFIX}/man ++ ++MANINSTALL= maninstall catinstall ++ ++.include diff --git a/benchmarks/ttcp/patches/patch-ab b/benchmarks/ttcp/patches/patch-ab new file mode 100644 index 00000000000..66a084b75c9 --- /dev/null +++ b/benchmarks/ttcp/patches/patch-ab @@ -0,0 +1,79 @@ +$NetBSD: patch-ab,v 1.1 2001/04/17 11:57:42 tron Exp $ +--- ttcp.c.orig Fri Aug 6 15:30:21 1999 ++++ ttcp.c Fri Aug 6 15:30:21 1999 +@@ -55,6 +55,7 @@ + #include + #include + #include /* struct timeval */ ++#include + + #if defined(SYSV) + #include +@@ -263,7 +264,7 @@ + if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL) + err("malloc"); + if (bufalign != 0) +- buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign; ++ buf +=(bufalign - ((u_long)buf % bufalign) + bufoffset) % bufalign; + + if (trans) { + fprintf(stdout, +@@ -285,7 +286,7 @@ + err("socket"); + mes("socket"); + +- if (bind(fd, &sinme, sizeof(sinme)) < 0) ++ if (bind(fd, (struct sockaddr *)&sinme, sizeof(sinme)) < 0) + err("bind"); + + #if defined(SO_SNDBUF) || defined(SO_RCVBUF) +@@ -326,7 +327,7 @@ + mes("nodelay"); + } + #endif +- if(connect(fd, &sinhim, sizeof(sinhim) ) < 0) ++ if(connect(fd, (struct sockaddr *)&sinhim, sizeof(sinhim) ) < 0) + err("connect"); + mes("connect"); + } else { +@@ -348,11 +349,11 @@ + } + fromlen = sizeof(frominet); + domain = AF_INET; +- if((fd=accept(fd, &frominet, &fromlen) ) < 0) ++ if((fd=accept(fd, (struct sockaddr *)&frominet, &fromlen) ) < 0) + err("accept"); + { struct sockaddr_in peer; + int peerlen = sizeof(peer); +- if (getpeername(fd, (struct sockaddr_in *) &peer, ++ if (getpeername(fd, (struct sockaddr *) &peer, + &peerlen) < 0) { + err("getpeername"); + } +@@ -752,7 +753,7 @@ + int len = sizeof(from); + register int cnt; + if( udp ) { +- cnt = recvfrom( fd, buf, count, 0, &from, &len ); ++ cnt = recvfrom( fd, buf, count, 0, (struct sockaddr *)&from, &len ); + numCalls++; + } else { + if( b_flag ) +@@ -782,7 +783,7 @@ + register int cnt; + if( udp ) { + again: +- cnt = sendto( fd, buf, count, 0, &sinhim, sizeof(sinhim) ); ++ cnt = sendto( fd, buf, count, 0, (struct sockaddr *)&sinhim, sizeof(sinhim) ); + numCalls++; + if( cnt<0 && errno == ENOBUFS ) { + delay(18000); +@@ -803,7 +804,7 @@ + + tv.tv_sec = 0; + tv.tv_usec = us; +- (void)select( 1, (char *)0, (char *)0, (char *)0, &tv ); ++ (void)select( 1, (void *)0, (void *)0, (void *)0, &tv ); + } + + /* diff --git a/benchmarks/ttcp/pkg/DESCR b/benchmarks/ttcp/pkg/DESCR new file mode 100644 index 00000000000..9db116e1eb5 --- /dev/null +++ b/benchmarks/ttcp/pkg/DESCR @@ -0,0 +1,5 @@ +Ttcp (test TCP) times the transmission and reception of data between two +systems using the UDP or TCP protocols. It differs from common ``blast'' +tests, which tend to measure the remote inetd as much as the network +performance, and which usually do not allow measurements at the remote end +of a UDP transmission. diff --git a/benchmarks/ttcp/pkg/PLIST b/benchmarks/ttcp/pkg/PLIST new file mode 100644 index 00000000000..1ef63850a48 --- /dev/null +++ b/benchmarks/ttcp/pkg/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1 2001/04/17 11:57:42 tron Exp $ +bin/ttcp +man/cat1/ttcp.0 +man/man1/ttcp.1 diff --git a/net/Makefile b/net/Makefile index e58dc8584c5..18154c61409 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.211 2001/04/09 12:25:53 lukem Exp $ +# $NetBSD: Makefile,v 1.212 2001/04/17 11:57:42 tron Exp $ # COMMENT= Networking tools @@ -149,7 +149,6 @@ SUBDIR+= tkined SUBDIR+= tn5250 SUBDIR+= totd SUBDIR+= trafshow -SUBDIR+= ttcp SUBDIR+= ttt SUBDIR+= ucd-snmp SUBDIR+= ucd-snmp-current diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile deleted file mode 100644 index 708584b44ee..00000000000 --- a/net/ttcp/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: Makefile,v 1.17 2001/02/17 18:19:48 wiz Exp $ - -DISTNAME= ttcp -PKGNAME= ${DISTNAME}-1.12 -CATEGORIES= net benchmarks -MASTER_SITES= http://www.ccci.com/tools/ttcp/ -EXTRACT_SUFX= .tar.Z - -MAINTAINER= thorpej@netbsd.org -HOMEPAGE= http://www.ccci.com/tools/ttcp/ -COMMENT= TCP testing and performance measuring tool - -.include "../../mk/bsd.prefs.mk" - -MANCOMPRESSED_IF_MANZ= YES -WRKSRC= ${WRKDIR} - -.if (${OPSYS} == SunOS) -do-build: - cd ${WRKSRC} && \ - ${CC} ttcp.c ${CFLAGS} $(LDFLAGS) -lsocket -lnsl -o ttcp && \ - nroff -man ttcp.1 >ttcp.cat1 -.endif - -.include "../../mk/bsd.pkg.mk" diff --git a/net/ttcp/distinfo b/net/ttcp/distinfo deleted file mode 100644 index 51f2de0f7e5..00000000000 --- a/net/ttcp/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.1 2001/04/17 11:54:16 agc Exp $ - -MD5 (ttcp.tar.Z) = 3688ca186d5da6fd83ade7c6a0150b1d -SHA1 (patch-aa) = 19d81ba1e6bfaf6527eb8fce29f2276c89f9a35e -SHA1 (patch-ab) = 888878128e67dfb88d9898a27af765334264e6ef diff --git a/net/ttcp/patches/patch-aa b/net/ttcp/patches/patch-aa deleted file mode 100644 index 8a81fa7a81b..00000000000 --- a/net/ttcp/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.5 1998/08/07 11:11:02 agc Exp $ - ---- Makefile.orig Sat Mar 7 13:39:48 1998 -+++ Makefile Sat Mar 7 13:40:07 1998 -@@ -0,0 +1,9 @@ -+ -+PROG= ttcp -+ -+BINDIR=${PREFIX}/bin -+MANDIR=${PREFIX}/man -+ -+MANINSTALL= maninstall catinstall -+ -+.include diff --git a/net/ttcp/patches/patch-ab b/net/ttcp/patches/patch-ab deleted file mode 100644 index cd97fd6fc0b..00000000000 --- a/net/ttcp/patches/patch-ab +++ /dev/null @@ -1,79 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2000/01/10 01:24:41 wiz Exp $ ---- ttcp.c.orig Fri Aug 6 15:30:21 1999 -+++ ttcp.c Fri Aug 6 15:30:21 1999 -@@ -55,6 +55,7 @@ - #include - #include - #include /* struct timeval */ -+#include - - #if defined(SYSV) - #include -@@ -263,7 +264,7 @@ - if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL) - err("malloc"); - if (bufalign != 0) -- buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign; -+ buf +=(bufalign - ((u_long)buf % bufalign) + bufoffset) % bufalign; - - if (trans) { - fprintf(stdout, -@@ -285,7 +286,7 @@ - err("socket"); - mes("socket"); - -- if (bind(fd, &sinme, sizeof(sinme)) < 0) -+ if (bind(fd, (struct sockaddr *)&sinme, sizeof(sinme)) < 0) - err("bind"); - - #if defined(SO_SNDBUF) || defined(SO_RCVBUF) -@@ -326,7 +327,7 @@ - mes("nodelay"); - } - #endif -- if(connect(fd, &sinhim, sizeof(sinhim) ) < 0) -+ if(connect(fd, (struct sockaddr *)&sinhim, sizeof(sinhim) ) < 0) - err("connect"); - mes("connect"); - } else { -@@ -348,11 +349,11 @@ - } - fromlen = sizeof(frominet); - domain = AF_INET; -- if((fd=accept(fd, &frominet, &fromlen) ) < 0) -+ if((fd=accept(fd, (struct sockaddr *)&frominet, &fromlen) ) < 0) - err("accept"); - { struct sockaddr_in peer; - int peerlen = sizeof(peer); -- if (getpeername(fd, (struct sockaddr_in *) &peer, -+ if (getpeername(fd, (struct sockaddr *) &peer, - &peerlen) < 0) { - err("getpeername"); - } -@@ -752,7 +753,7 @@ - int len = sizeof(from); - register int cnt; - if( udp ) { -- cnt = recvfrom( fd, buf, count, 0, &from, &len ); -+ cnt = recvfrom( fd, buf, count, 0, (struct sockaddr *)&from, &len ); - numCalls++; - } else { - if( b_flag ) -@@ -782,7 +783,7 @@ - register int cnt; - if( udp ) { - again: -- cnt = sendto( fd, buf, count, 0, &sinhim, sizeof(sinhim) ); -+ cnt = sendto( fd, buf, count, 0, (struct sockaddr *)&sinhim, sizeof(sinhim) ); - numCalls++; - if( cnt<0 && errno == ENOBUFS ) { - delay(18000); -@@ -803,7 +804,7 @@ - - tv.tv_sec = 0; - tv.tv_usec = us; -- (void)select( 1, (char *)0, (char *)0, (char *)0, &tv ); -+ (void)select( 1, (void *)0, (void *)0, (void *)0, &tv ); - } - - /* diff --git a/net/ttcp/pkg/DESCR b/net/ttcp/pkg/DESCR deleted file mode 100644 index 9db116e1eb5..00000000000 --- a/net/ttcp/pkg/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -Ttcp (test TCP) times the transmission and reception of data between two -systems using the UDP or TCP protocols. It differs from common ``blast'' -tests, which tend to measure the remote inetd as much as the network -performance, and which usually do not allow measurements at the remote end -of a UDP transmission. diff --git a/net/ttcp/pkg/PLIST b/net/ttcp/pkg/PLIST deleted file mode 100644 index ae0e886af72..00000000000 --- a/net/ttcp/pkg/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 1998/03/07 13:57:00 tron Exp $ -bin/ttcp -man/cat1/ttcp.0 -man/man1/ttcp.1 -- cgit v1.2.3