diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile index 364903c075df..32a074aa304f 100644 --- a/benchmarks/ttcp/Makefile +++ b/benchmarks/ttcp/Makefile @@ -1,39 +1,34 @@ PORTNAME= ttcp -PORTVERSION= 1.12 -PORTREVISION= 3 +PORTVERSION= 1.13 CATEGORIES= benchmarks net -MASTER_SITES= https://BSDforge.com/projects/source/benchmarks/ttcp/ -DISTFILES= ttcp.c ttcp.1 README -DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= # none +MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/ MAINTAINER= portmaster@BSDforge.com COMMENT= Benchmarking tool for analysing TCP and UDP performance -WWW= https://ftp.arl.army.mil/~mike/ttcp.html +WWW= https://codeberg.org/BSDforge/ttcp/ -LICENSE= PD +LICENSE= BSD0CLAUSE -DEPRECATED= Abandonware, no release in over 20 years. Consider using benchmarks/iperf3 or benchmarks/nttcp -EXPIRATION_DATE=2024-02-29 - -NO_WRKSUBDIR= yes +CFLAGS+= -Wno-strict-prototypes +PLIST_FILES= bin/ttcp share/man/man1/ttcp.1.gz +PORTDOCS_PLIST_FILES= share/doc/ttcp/README share/doc/ttcp/CHANGES \ + share/doc/ttcp/LICENSE +PORTDOCS= README CHANGES LICENSE OPTIONS_DEFINE= DOCS - +# because the ports framework doesn't cope well with bare ${PORTNAME} ${WRKSRC} post-extract: - ${CP} ${DISTDIR}/${DIST_SUBDIR}/ttcp.c ${WRKSRC} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/ttcp.1 ${WRKSRC} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/README ${WRKSRC} + ${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION} do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/ttcp ${WRKSRC}/ttcp.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ttcp ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/ttcp.1 ${STAGEDIR}${PREFIX}/share/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include diff --git a/benchmarks/ttcp/distinfo b/benchmarks/ttcp/distinfo index 3415da392dd6..20f0333e9396 100644 --- a/benchmarks/ttcp/distinfo +++ b/benchmarks/ttcp/distinfo @@ -1,6 +1,3 @@ -SHA256 (ttcp/ttcp.c) = e630a95788efacfee226dff3550e58ed908987ef96817efc8ad4862657a60c3b -SIZE (ttcp/ttcp.c) = 19170 -SHA256 (ttcp/ttcp.1) = edb5dbc156c06584d7a73b6ffdb0049dca1b819f0c79aa2289005d60acaddbc9 -SIZE (ttcp/ttcp.1) = 3885 -SHA256 (ttcp/README) = a5c033bcfdcbca3cfe82c36b8c82d8b25d7bc1968a5a664f61052bfe31a1a531 -SIZE (ttcp/README) = 781 +TIMESTAMP = 1706864630 +SHA256 (ttcp-1.13.tar.gz) = 809214c535175139897afba784e2e6d1eff02efc3d7b90a67f1bb52fb5082027 +SIZE (ttcp-1.13.tar.gz) = 10959 diff --git a/benchmarks/ttcp/files/patch-ttcp.c b/benchmarks/ttcp/files/patch-ttcp.c deleted file mode 100644 index a055bfeef7ee..000000000000 --- a/benchmarks/ttcp/files/patch-ttcp.c +++ /dev/null @@ -1,257 +0,0 @@ ---- ttcp.c.orig 2016-07-27 15:06:14 UTC -+++ ttcp.c -@@ -55,6 +55,9 @@ static char RCSid[] = "ttcp.c $Revision: - #include - #include - #include /* struct timeval */ -+#include -+#include -+#include - - #if defined(SYSV) - #include -@@ -133,7 +136,7 @@ double cput, realt; /* user, real time - - void err(); - void mes(); --int pattern(); -+void pattern(); - void prep_timer(); - double read_timer(); - int Nread(); -@@ -147,6 +150,7 @@ sigpipe() - { - } - -+int - main(argc,argv) - int argc; - char **argv; -@@ -249,6 +253,7 @@ char **argv; - #endif /* cray */ - } - sinhim.sin_port = htons(port); -+ sinme.sin_family = AF_INET; /* Solaris needs this */ - sinme.sin_port = 0; /* free choice */ - } else { - /* rcvr */ -@@ -263,29 +268,31 @@ char **argv; - if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL) - err("malloc"); - if (bufalign != 0) -- buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign; -+ buf += (bufalign -+ -((unsigned long)buf % bufalign) -+ + bufoffset) % bufalign; - - if (trans) { -- fprintf(stdout, -+ fprintf(stderr, - "ttcp-t: buflen=%d, nbuf=%d, align=%d/%d, port=%d", - buflen, nbuf, bufalign, bufoffset, port); - if (sockbufsize) -- fprintf(stdout, ", sockbufsize=%d", sockbufsize); -- fprintf(stdout, " %s -> %s\n", udp?"udp":"tcp", host); -+ fprintf(stderr, ", sockbufsize=%d", sockbufsize); -+ fprintf(stderr, " %s -> %s\n", udp?"udp":"tcp", host); - } else { -- fprintf(stdout, -+ fprintf(stderr, - "ttcp-r: buflen=%d, nbuf=%d, align=%d/%d, port=%d", - buflen, nbuf, bufalign, bufoffset, port); - if (sockbufsize) -- fprintf(stdout, ", sockbufsize=%d", sockbufsize); -- fprintf(stdout, " %s\n", udp?"udp":"tcp"); -+ fprintf(stderr, ", sockbufsize=%d", sockbufsize); -+ fprintf(stderr, " %s\n", udp?"udp":"tcp"); - } - - if ((fd = socket(AF_INET, udp?SOCK_DGRAM:SOCK_STREAM, 0)) < 0) - 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 +333,7 @@ char **argv; - 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 +355,11 @@ char **argv; - } - 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"); - } -@@ -412,25 +419,25 @@ char **argv; - } - if( cput <= 0.0 ) cput = 0.001; - if( realt <= 0.0 ) realt = 0.001; -- fprintf(stdout, -+ fprintf(stderr, - "ttcp%s: %.0f bytes in %.2f real seconds = %s/sec +++\n", - trans?"-t":"-r", - nbytes, realt, outfmt(nbytes/realt)); - if (verbose) { -- fprintf(stdout, -+ fprintf(stderr, - "ttcp%s: %.0f bytes in %.2f CPU seconds = %s/cpu sec\n", - trans?"-t":"-r", - nbytes, cput, outfmt(nbytes/cput)); - } -- fprintf(stdout, -+ fprintf(stderr, - "ttcp%s: %d I/O calls, msec/call = %.2f, calls/sec = %.2f\n", - trans?"-t":"-r", - numCalls, - 1024.0 * realt/((double)numCalls), - ((double)numCalls)/realt); -- fprintf(stdout,"ttcp%s: %s\n", trans?"-t":"-r", stats); -+ fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", stats); - if (verbose) { -- fprintf(stdout, -+ fprintf(stderr, - "ttcp%s: buffer address %#x\n", - trans?"-t":"-r", - buf); -@@ -459,6 +466,7 @@ char *s; - fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s); - } - -+void - pattern( cp, cnt ) - register char *cp; - register int cnt; -@@ -614,13 +622,13 @@ prusage(r0, r1, e, b, outp) - - case 'U': - tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime); -- sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000); -+ sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000); - END(outp); - break; - - case 'S': - tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime); -- sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000); -+ sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000); - END(outp); - break; - -@@ -642,49 +650,49 @@ prusage(r0, r1, e, b, outp) - break; - - case 'X': -- sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t); -+ sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t); - END(outp); - break; - - case 'D': -- sprintf(outp,"%d", t == 0 ? 0 : -+ sprintf(outp,"%ld", t == 0 ? 0 : - (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t); - END(outp); - break; - - case 'K': -- sprintf(outp,"%d", t == 0 ? 0 : -+ sprintf(outp,"%ld", t == 0 ? 0 : - ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) - - (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t); - END(outp); - break; - - case 'M': -- sprintf(outp,"%d", r1->ru_maxrss/2); -+ sprintf(outp,"%ld", r1->ru_maxrss/2); - END(outp); - break; - - case 'F': -- sprintf(outp,"%d", r1->ru_majflt-r0->ru_majflt); -+ sprintf(outp,"%ld", r1->ru_majflt-r0->ru_majflt); - END(outp); - break; - - case 'R': -- sprintf(outp,"%d", r1->ru_minflt-r0->ru_minflt); -+ sprintf(outp,"%ld", r1->ru_minflt-r0->ru_minflt); - END(outp); - break; - - case 'I': -- sprintf(outp,"%d", r1->ru_inblock-r0->ru_inblock); -+ sprintf(outp,"%ld", r1->ru_inblock-r0->ru_inblock); - END(outp); - break; - - case 'O': -- sprintf(outp,"%d", r1->ru_oublock-r0->ru_oublock); -+ sprintf(outp,"%ld", r1->ru_oublock-r0->ru_oublock); - END(outp); - break; - case 'C': -- sprintf(outp,"%d+%d", r1->ru_nvcsw-r0->ru_nvcsw, -+ sprintf(outp,"%ld+%ld", r1->ru_nvcsw-r0->ru_nvcsw, - r1->ru_nivcsw-r0->ru_nivcsw ); - END(outp); - break; -@@ -743,6 +751,7 @@ register char *cp; - /* - * N R E A D - */ -+int - Nread( fd, buf, count ) - int fd; - void *buf; -@@ -752,7 +761,7 @@ int count; - 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 ) -@@ -774,6 +783,7 @@ int count; - /* - * N W R I T E - */ -+int - Nwrite( fd, buf, count ) - int fd; - void *buf; -@@ -782,7 +792,7 @@ int count; - 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 +813,7 @@ delay(us) - - tv.tv_sec = 0; - tv.tv_usec = us; -- (void)select( 1, (char *)0, (char *)0, (char *)0, &tv ); -+ (void)select( 1, NULL, NULL, NULL, &tv ); - } - - /* diff --git a/benchmarks/ttcp/pkg-plist b/benchmarks/ttcp/pkg-plist deleted file mode 100644 index 9e771280ae35..000000000000 --- a/benchmarks/ttcp/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/ttcp -man/man1/ttcp.1.gz -%%PORTDOCS%%%%DOCSDIR%%/README