From nobody Sat Feb 24 09:10:31 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Thh1R14yNz5CNjh; Sat, 24 Feb 2024 09:10:35 +0000 (UTC) (envelope-from daniel.engberg.lists@pyret.net) Received: from smtp-42ad.mail.infomaniak.ch (smtp-42ad.mail.infomaniak.ch [84.16.66.173]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "relay.mail.infomaniak.ch", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Thh1Q4XK1z4Sk6; Sat, 24 Feb 2024 09:10:34 +0000 (UTC) (envelope-from daniel.engberg.lists@pyret.net) Authentication-Results: mx1.freebsd.org; none Received: from smtp-3-0001.mail.infomaniak.ch (smtp-3-0001.mail.infomaniak.ch [10.4.36.108]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4Thh1M6VlfzyN; Sat, 24 Feb 2024 10:10:31 +0100 (CET) Received: from unknown by smtp-3-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4Thh1M3HY7zMpnPf; Sat, 24 Feb 2024 10:10:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pyret.net; s=20231006; t=1708765831; bh=i8EF0msDxFWJu9uT7vqcbNLB4mIt5G+cuxg7k5cLyIw=; h=Date:Subject:From:Reply-To:To:Cc:References:In-Reply-To:From; b=J1uWveeeejAQ73qau7cTm/hwf9yQ/w11d2uL6PN5Pz7TsAikZIIqwmn+7FxxFDA4/ HDvUrlcSWTRj6UsERXyhtJBVrKbSWcULFk5QlP4KtGavy3DlEO+M4Gb6nBaQTsXbyf WlevQPBB2vKB7vQsPY0kZGh9pFGPE6yLrcx2eFfIf3w2mKjc9EM7YO8fFLjVZoV+tX /waGAPqAjhviQ/mHRbUQztLdKQRb3iKhRxXJLhPSsETZWB2AYGAQobtRwH+neuTZDQ vPtDkCu9m74BIrMWyEycWpke/LUOnxpdOv6hTVATx8gT+qGVXEvUgmKOZH49yq8BIF O2ihi5uj9wzWg== Message-ID: Date: Sat, 24 Feb 2024 10:10:31 +0100 Subject: Re: git: 36c21f98ff44 - main - benchmarks/ttcp: Update to 1.13 From: Daniel Engberg Reply-To: Daniel Engberg To: Gleb Popov Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="_=_swift_1708765831_baac66a2834ff01fd98eedf0631e7cc4_=_" X-WS-User-Origin: eyJpdiI6IndvS0xsRERxcmJ3RjI2U0FyOHJLb1E9PSIsInZhbHVlIjoiYy90aFNDU09sbUxXNy9kSlFlQ2VuQT09IiwibWFjIjoiYjEwMGU1Mjk0MDA2MjAxNDU5NWQ0ZjdkODM0NGJlYjIyZDZmMjgzZmQ5ZGVjN2U2MzUzNjQzM2M0YzBjNTU3MSIsInRhZyI6IiJ9 X-WS-User-Mbox: eyJpdiI6Ii8xb2NHYW54empBLzFqNG9Nb1Y1K0E9PSIsInZhbHVlIjoianpxTC83TWJmN1ZSam90UFRDTElWQT09IiwibWFjIjoiMWM3ZDdhNDE2OWIxMDk3N2NkYjY2Mjk3MTg3NDQ2OWMzZTEzYmI5MjRiN2RiOWU2ODQ5MzJhMzdhZmU2M2YxZiIsInRhZyI6IiJ9 X-WS-Location: eJxzKUpMKykGAAfpAmU- X-Mailer: Infomaniak Workspace (1.3.644) References: <202402240847.41O8lN0C026751@gitrepo.freebsd.org> In-Reply-To: <202402240847.41O8lN0C026751@gitrepo.freebsd.org> X-Infomaniak-Routing: alpha X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29222, ipnet:84.16.64.0/19, country:CH] X-Rspamd-Queue-Id: 4Thh1Q4XK1z4Sk6 --_=_swift_1708765831_baac66a2834ff01fd98eedf0631e7cc4_=_ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2024-02-24T09:47:23.000+01:00, Gleb Popov wrote:= >=C2=A0The=C2=A0branch=C2=A0main=C2=A0has=C2=A0been=C2=A0updated= =C2=A0by=C2=A0arrowd: >=C2=A0 >=C2=A0URL:=C2=A0https://cgit.FreeBSD.org= /ports/commit/?id=3D36c21f98ff445e373ab61726ee8b64e02f8984f7 >=C2=A0 >= =C2=A0commit=C2=A036c21f98ff445e373ab61726ee8b64e02f8984f7 >=C2=A0 >= =C2=A0Author:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Chris=C2=A0Hutchinson=C2=A0 >=C2=A0 >=C2=A0AuthorDate:=C2=A02024-02-24=C2= =A008:43:41=C2=A0+0000 >=C2=A0 >=C2=A0Commit:=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0Gleb=C2=A0Popov=C2=A0 >=C2=A0 >=C2=A0Commi= tDate:=C2=A02024-02-24=C2=A008:46:30=C2=A0+0000 >=C2=A0 >=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0benchmarks/ttcp:=C2=A0Update=C2=A0to=C2=A01.13 >= =C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0PR:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0276759 >=C2=A0 >=C2=A0--- >=C2=A0 >=C2=A0= =C2=A0benchmarks/ttcp/Makefile=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A029=C2=A0++--- >=C2=A0 >=C2=A0= =C2=A0benchmarks/ttcp/distinfo=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A0=C2=A09=C2=A0+- >=C2=A0 >=C2=A0= =C2=A0benchmarks/ttcp/files/patch-ttcp.c=C2=A0|=C2=A0257=C2=A0-------------= ------------------------ >=C2=A0 >=C2=A0=C2=A0benchmarks/ttcp/pkg-plist= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2= =A0=C2=A03=C2=A0- >=C2=A0 >=C2=A0=C2=A04=C2=A0files=C2=A0changed,=C2= =A015=C2=A0insertions(+),=C2=A0283=C2=A0deletions(-) >=C2=A0 >=C2=A0dif= f=C2=A0--git=C2=A0a/benchmarks/ttcp/Makefile=C2=A0b/benchmarks/ttcp/Makefil= e >=C2=A0 >=C2=A0index=C2=A0364903c075df..32a074aa304f=C2=A0100644 >= =C2=A0 >=C2=A0---=C2=A0a/benchmarks/ttcp/Makefile >=C2=A0 >=C2=A0+++= =C2=A0b/benchmarks/ttcp/Makefile >=C2=A0 >=C2=A0@@=C2=A0-1,29=C2=A0+1,2= 4=C2=A0@@ >=C2=A0 >=C2=A0=C2=A0PORTNAME=3D=C2=A0=C2=A0=C2=A0=C2=A0ttcp= >=C2=A0 >=C2=A0-PORTVERSION=3D=C2=A0=C2=A0=C2=A0=C2=A01.12 >=C2= =A0 >=C2=A0-PORTREVISION=3D=C2=A0=C2=A0=C2=A0=C2=A03 >=C2=A0 >=C2= =A0+PORTVERSION=3D=C2=A0=C2=A0=C2=A0=C2=A01.13 >=C2=A0 >=C2=A0=C2=A0CAT= EGORIES=3D=C2=A0=C2=A0=C2=A0=C2=A0benchmarks=C2=A0net >=C2=A0 >=C2= =A0-MASTER_SITES=3D=C2=A0=C2=A0=C2=A0=C2=A0https://BSDforge.com/projects/so= urce/benchmarks/ttcp/ >=C2=A0 >=C2=A0-DISTFILES=3D=C2=A0=C2=A0=C2=A0= =C2=A0ttcp.c=C2=A0ttcp.1=C2=A0README >=C2=A0 >=C2=A0-DIST_SUBDIR=3D= =C2=A0=C2=A0=C2=A0=C2=A0${PORTNAME} >=C2=A0 >=C2=A0-EXTRACT_ONLY=3D= =C2=A0=C2=A0=C2=A0=C2=A0#=C2=A0none >=C2=A0 >=C2=A0+MASTER_SITES=3D= =C2=A0=C2=A0=C2=A0=C2=A0https://codeberg.org/BSDforge/${PORTNAME}/archive/= >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0MAINTAINER=3D=C2=A0= =C2=A0=C2=A0=C2=A0portmaster@BSDforge.com >=C2=A0 >=C2=A0=C2=A0COMMENT= =3D=C2=A0=C2=A0=C2=A0=C2=A0Benchmarking=C2=A0tool=C2=A0for=C2=A0analysing= =C2=A0TCP=C2=A0and=C2=A0UDP=C2=A0performance >=C2=A0 >=C2=A0-WWW=3D= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0https://ftp.arl.army.mil/~m= ike/ttcp.html >=C2=A0 >=C2=A0+WWW=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0https://codeberg.org/BSDforge/ttcp/ >=C2=A0 >=C2= =A0=C2=A0 >=C2=A0 >=C2=A0-LICENSE=3D=C2=A0=C2=A0=C2=A0=C2=A0PD >= =C2=A0 >=C2=A0+LICENSE=3D=C2=A0=C2=A0=C2=A0=C2=A0BSD0CLAUSE >=C2=A0 >= =C2=A0=C2=A0 >=C2=A0 >=C2=A0-DEPRECATED=3D=C2=A0=C2=A0=C2=A0=C2=A0Aband= onware,=C2=A0no=C2=A0release=C2=A0in=C2=A0over=C2=A020=C2=A0years.=C2=A0Con= sider=C2=A0using=C2=A0benchmarks/iperf3=C2=A0or=C2=A0benchmarks/nttcp >= =C2=A0 >=C2=A0-EXPIRATION_DATE=3D2024-02-29 >=C2=A0 >=C2=A0- >= =C2=A0 >=C2=A0-NO_WRKSUBDIR=3D=C2=A0=C2=A0=C2=A0=C2=A0yes >=C2=A0 >= =C2=A0+CFLAGS+=3D=C2=A0=C2=A0=C2=A0=C2=A0-Wno-strict-prototypes >=C2= =A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0+PLIST_FILES=3D=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0bin/ttcp=C2=A0share/m= an/man1/ttcp.1.gz >=C2=A0 >=C2=A0+PORTDOCS_PLIST_FILES=3D=C2=A0=C2= =A0=C2=A0=C2=A0share/doc/ttcp/README=C2=A0share/doc/ttcp/CHANGES=C2=A0\ >= =C2=A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0share/doc/ttcp/LICENSE >=C2=A0 >=C2=A0+PORTDOCS=3D= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0README=C2=A0CHANGES=C2= =A0LICENSE >=C2=A0 >=C2=A0=C2=A0OPTIONS_DEFINE=3D=C2=A0=C2=A0=C2=A0= =C2=A0DOCS >=C2=A0 >=C2=A0- >=C2=A0 >=C2=A0+#=C2=A0because=C2=A0the= =C2=A0ports=C2=A0framework=C2=A0doesn't=C2=A0cope=C2=A0well=C2=A0with=C2= =A0bare=C2=A0${PORTNAME}=C2=A0${WRKSRC} >=C2=A0 >=C2=A0=C2=A0post-extra= ct: >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0${CP}=C2=A0${DISTDIR}/${DIS= T_SUBDIR}/ttcp.c=C2=A0${WRKSRC} >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0= =C2=A0${CP}=C2=A0${DISTDIR}/${DIST_SUBDIR}/ttcp.1=C2=A0${WRKSRC} >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0${CP}=C2=A0${DISTDIR}/${DIST_SUBDIR}/= README=C2=A0${WRKSRC} >=C2=A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0${MV}= =C2=A0${WRKDIR}/${PORTNAME}=C2=A0${WRKDIR}/${PORTNAME}-${PORTVERSION} >= =C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0do-build: >=C2=A0 >= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0${CC}=C2=A0${CFLAGS}=C2=A0-o=C2=A0${WRK= SRC}/ttcp=C2=A0${WRKSRC}/ttcp.c >=C2=A0 >=C2=A0@@=C2=A0-34,6=C2=A0+29,6= =C2=A0@@=C2=A0do-install: >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0= =C2=A0do-install-DOCS-on: >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0@${MKDIR}=C2=A0${STAGEDIR}${DOCSDIR} >=C2=A0 >=C2=A0-=C2=A0=C2=A0= =C2=A0=C2=A0${INSTALL_DATA}=C2=A0${WRKSRC}/README=C2=A0${STAGEDIR}${DOCSDIR= } >=C2=A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0${INSTALL_DATA}=C2=A0${PORTDO= CS:S,^,${WRKSRC}/,}=C2=A0${STAGEDIR}${DOCSDIR} >=C2=A0 >=C2=A0=C2=A0 = >=C2=A0 >=C2=A0=C2=A0.include=C2=A0=C2=A0[http://bsd.port.mk= >]; >=C2=A0 >=C2=A0diff=C2=A0--git=C2=A0a/benchmarks/ttcp/distinfo= =C2=A0b/benchmarks/ttcp/distinfo >=C2=A0 >=C2=A0index=C2=A03415da392dd6= ..20f0333e9396=C2=A0100644 >=C2=A0 >=C2=A0---=C2=A0a/benchmarks/ttcp/di= stinfo >=C2=A0 >=C2=A0+++=C2=A0b/benchmarks/ttcp/distinfo >=C2=A0 >= =C2=A0@@=C2=A0-1,6=C2=A0+1,3=C2=A0@@ >=C2=A0 >=C2=A0-SHA256=C2=A0(ttcp/= ttcp.c)=C2=A0=3D=C2=A0e630a95788efacfee226dff3550e58ed908987ef96817efc8ad48= 62657a60c3b >=C2=A0 >=C2=A0-SIZE=C2=A0(ttcp/ttcp.c)=C2=A0=3D=C2=A019170= >=C2=A0 >=C2=A0-SHA256=C2=A0(ttcp/ttcp.1)=C2=A0=3D=C2=A0edb5dbc156c065= 84d7a73b6ffdb0049dca1b819f0c79aa2289005d60acaddbc9 >=C2=A0 >=C2=A0-SIZE= =C2=A0(ttcp/ttcp.1)=C2=A0=3D=C2=A03885 >=C2=A0 >=C2=A0-SHA256=C2=A0(ttc= p/README)=C2=A0=3D=C2=A0a5c033bcfdcbca3cfe82c36b8c82d8b25d7bc1968a5a664f610= 52bfe31a1a531 >=C2=A0 >=C2=A0-SIZE=C2=A0(ttcp/README)=C2=A0=3D=C2=A0781= >=C2=A0 >=C2=A0+TIMESTAMP=C2=A0=3D=C2=A01706864630 >=C2=A0 >=C2= =A0+SHA256=C2=A0(ttcp-1.13.tar.gz)=C2=A0=3D=C2=A0809214c535175139897afba784= e2e6d1eff02efc3d7b90a67f1bb52fb5082027 >=C2=A0 >=C2=A0+SIZE=C2=A0(ttcp-= 1.13.tar.gz)=C2=A0=3D=C2=A010959 >=C2=A0 >=C2=A0diff=C2=A0--git=C2= =A0a/benchmarks/ttcp/files/patch-ttcp.c=C2=A0b/benchmarks/ttcp/files/patch-= ttcp.c >=C2=A0 >=C2=A0deleted=C2=A0file=C2=A0mode=C2=A0100644 >=C2= =A0 >=C2=A0index=C2=A0a055bfeef7ee..000000000000 >=C2=A0 >=C2=A0---= =C2=A0a/benchmarks/ttcp/files/patch-ttcp.c >=C2=A0 >=C2=A0+++=C2=A0/dev= /null >=C2=A0 >=C2=A0@@=C2=A0-1,257=C2=A0+0,0=C2=A0@@ >=C2=A0 >= =C2=A0----=C2=A0ttcp.c.orig=C2=A0=C2=A0=C2=A0=C2=A02016-07-27=C2=A015:06:14= =C2=A0UTC >=C2=A0 >=C2=A0-+++=C2=A0ttcp.c >=C2=A0 >=C2=A0-@@=C2= =A0-55,6=C2=A0+55,9=C2=A0@@=C2=A0static=C2=A0char=C2=A0RCSid[]=C2=A0=3D= =C2=A0"ttcp.c=C2=A0$Revision: >=C2=A0 >=C2=A0-=C2=A0#include=C2=A0 >=C2=A0 >=C2=A0-=C2=A0#include=C2=A0 >=C2=A0 >= =C2=A0-=C2=A0#include=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0/*=C2=A0struct=C2=A0timeval=C2=A0*/ >=C2=A0 >=C2=A0-+#in= clude=C2=A0 >=C2=A0 >=C2=A0-+#include=C2=A0 >= =C2=A0 >=C2=A0-+#include=C2=A0 >=C2=A0 >=C2=A0-=C2=A0 >= =C2=A0 >=C2=A0-=C2=A0#if=C2=A0defined(SYSV) >=C2=A0 >=C2=A0-=C2=A0#in= clude=C2=A0 >=C2=A0 >=C2=A0-@@=C2=A0-133,7=C2=A0+136,7= =C2=A0@@=C2=A0double=C2=A0cput,=C2=A0realt;=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0/*=C2=A0user,=C2=A0real=C2=A0time=C2=A0 >=C2=A0 >= =C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0void=C2=A0err(); >=C2=A0 >= =C2=A0-=C2=A0void=C2=A0mes(); >=C2=A0 >=C2=A0--int=C2=A0pattern(); >= =C2=A0 >=C2=A0-+void=C2=A0pattern(); >=C2=A0 >=C2=A0-=C2=A0void=C2= =A0prep_timer(); >=C2=A0 >=C2=A0-=C2=A0double=C2=A0read_timer(); >= =C2=A0 >=C2=A0-=C2=A0int=C2=A0Nread(); >=C2=A0 >=C2=A0-@@=C2=A0-147,6= =C2=A0+150,7=C2=A0@@=C2=A0sigpipe() >=C2=A0 >=C2=A0-=C2=A0{ >=C2= =A0 >=C2=A0-=C2=A0} >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-+int= >=C2=A0 >=C2=A0-=C2=A0main(argc,argv) >=C2=A0 >=C2=A0-=C2=A0int= =C2=A0argc; >=C2=A0 >=C2=A0-=C2=A0char=C2=A0**argv; >=C2=A0 >=C2= =A0-@@=C2=A0-249,6=C2=A0+253,7=C2=A0@@=C2=A0char=C2=A0**argv; >=C2=A0 >= =C2=A0-=C2=A0#endif=C2=A0/*=C2=A0cray=C2=A0*/ >=C2=A0 >=C2=A0-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} >=C2=A0 >=C2=A0-= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sinhim.sin_port=C2= =A0=3D=C2=A0htons(port); >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0sinme.sin_family=C2=A0=3D=C2=A0AF_INET;=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0/*=C2=A0Solaris=C2=A0needs=C2=A0this=C2=A0*/ >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sinme.s= in_port=C2=A0=3D=C2=A00;=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/*= =C2=A0free=C2=A0choice=C2=A0*/ >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0}=C2=A0else=C2=A0{ >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/*=C2=A0rcvr=C2=A0*/ >=C2=A0 >=C2=A0-@@= =C2=A0-263,29=C2=A0+268,31=C2=A0@@=C2=A0char=C2=A0**argv; >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if=C2=A0(=C2=A0(buf=C2=A0=3D=C2=A0(cha= r=C2=A0*)malloc(buflen+bufalign))=C2=A0=3D=3D=C2=A0(char=C2=A0*)NULL) >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0err(= "malloc"); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if=C2=A0(bufal= ign=C2=A0!=3D=C2=A00) >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0buf=C2=A0+=3D(bufalign=C2=A0-=C2=A0((int)buf=C2=A0%= =C2=A0bufalign)=C2=A0+=C2=A0bufoffset)=C2=A0%=C2=A0bufalign; >=C2=A0 >= =C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0buf=C2=A0+=3D=C2= =A0(bufalign >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0-((unsigned=C2=A0long)buf=C2=A0%=C2= =A0bufalign) >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0+=C2=A0bufoffset)=C2=A0%=C2=A0bufalign;= >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0if=C2=A0(trans)=C2=A0{ >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stdout, >=C2=A0 >=C2=A0-+=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stderr, >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"ttcp-t:=C2= =A0buflen=3D%d,=C2=A0nbuf=3D%d,=C2=A0align=3D%d/%d,=C2=A0port=3D%d", >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0bufl= en,=C2=A0nbuf,=C2=A0bufalign,=C2=A0bufoffset,=C2=A0port); >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if=C2= =A0(sockbufsize) >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0fprintf(stdout,=C2=A0",=C2=A0sockbufsize=3D%d",=C2= =A0sockbufsize); >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0fprintf(stdout,=C2=A0"=C2=A0=C2=A0%s=C2=A0=C2=A0->= =C2=A0%s\n",=C2=A0udp?"udp":"tcp",=C2=A0host); >=C2=A0 >=C2=A0-+=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stderr,=C2=A0",= =C2=A0sockbufsize=3D%d",=C2=A0sockbufsize); >=C2=A0 >=C2=A0-+=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stderr,=C2=A0"= =C2=A0=C2=A0%s=C2=A0=C2=A0->=C2=A0%s\n",=C2=A0udp?"udp":"tcp",=C2=A0host);= >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}=C2=A0else=C2=A0{ >= =C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(s= tdout, >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0fprintf(stderr, >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"ttcp-r:=C2=A0buflen=3D%d,=C2=A0nbuf=3D%d,= =C2=A0align=3D%d/%d,=C2=A0port=3D%d", >=C2=A0 >=C2=A0-=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0buflen,=C2=A0nbuf,=C2=A0buf= align,=C2=A0bufoffset,=C2=A0port); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if=C2=A0(sockbufsize) >= =C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fpr= intf(stdout,=C2=A0",=C2=A0sockbufsize=3D%d",=C2=A0sockbufsize); >=C2= =A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprint= f(stdout,=C2=A0"=C2=A0=C2=A0%s\n",=C2=A0udp?"udp":"tcp"); >=C2=A0 >= =C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stder= r,=C2=A0",=C2=A0sockbufsize=3D%d",=C2=A0sockbufsize); >=C2=A0 >=C2= =A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stderr,= =C2=A0"=C2=A0=C2=A0%s\n",=C2=A0udp?"udp":"tcp"); >=C2=A0 >=C2=A0-=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0} >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2= =A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if=C2=A0((fd=C2=A0=3D=C2=A0socket(AF_INET= ,=C2=A0udp?SOCK_DGRAM:SOCK_STREAM,=C2=A00))=C2=A0<=C2=A00) >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0err("socket");= >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0mes("socket"); >=C2= =A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0if=C2= =A0(bind(fd,=C2=A0&sinme,=C2=A0sizeof(sinme))=C2=A0<=C2=A00) >=C2=A0 >= =C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0if=C2=A0(bind(fd,=C2=A0(struct=C2=A0sockadd= r=C2=A0*)=C2=A0&sinme,=C2=A0sizeof(sinme))=C2=A0<=C2=A00) >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0err("bind");= >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0#if=C2=A0defined(SO_S= NDBUF)=C2=A0||=C2=A0defined(SO_RCVBUF) >=C2=A0 >=C2=A0-@@=C2=A0-326,7= =C2=A0+333,7=C2=A0@@=C2=A0char=C2=A0**argv; >=C2=A0 >=C2=A0-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0mes= ("nodelay"); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0} >=C2=A0 >=C2=A0-=C2=A0#endif >=C2=A0 >=C2=A0--= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if(connect(fd,=C2=A0&sinhim= ,=C2=A0sizeof(sinhim)=C2=A0)=C2=A0<=C2=A00) >=C2=A0 >=C2=A0-+=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if(connect(fd,=C2=A0(struct=C2= =A0sockaddr*)&sinhim,=C2=A0sizeof(sinhim)=C2=A0)=C2=A0<=C2=A00) >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0err("connect"); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0mes("connect"); >=C2=A0 >=C2= =A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}=C2=A0else=C2= =A0{ >=C2=A0 >=C2=A0-@@=C2=A0-348,11=C2=A0+355,11=C2=A0@@=C2=A0char= =C2=A0**argv; >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0} >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0fromlen=C2=A0=3D=C2=A0sizeof(frominet); >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0domain= =C2=A0=3D=C2=A0AF_INET; >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0if((fd=3Daccept(fd,=C2=A0&frominet,=C2=A0&fromlen)= =C2=A0)=C2=A0<=C2=A00) >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0if((fd=3Daccept(fd,=C2=A0(struct=C2=A0sockaddr*)&fromi= net,=C2=A0&fromlen)=C2=A0)=C2=A0<=C2=A00) >=C2=A0 >=C2=A0-=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0err("a= ccept"); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0{=C2=A0struct=C2=A0sockaddr_in=C2=A0peer; >=C2=A0 >=C2= =A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0int= =C2=A0peerlen=C2=A0=3D=C2=A0sizeof(peer); >=C2=A0 >=C2=A0--=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if=C2=A0(getpeername(fd,= =C2=A0(struct=C2=A0sockaddr_in=C2=A0*)=C2=A0&peer,=C2=A0 >=C2=A0 >= =C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if= =C2=A0(getpeername(fd,=C2=A0(struct=C2=A0sockaddr*)=C2=A0&peer,=C2=A0 >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&peerlen)=C2=A0<=C2=A00)= =C2=A0{ >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0err("getpeername"); >=C2=A0 >=C2= =A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} >= =C2=A0 >=C2=A0-@@=C2=A0-412,25=C2=A0+419,25=C2=A0@@=C2=A0char=C2=A0**argv= ; >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} >=C2=A0 >=C2= =A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if(=C2=A0cput=C2=A0<=3D=C2=A00.0=C2= =A0)=C2=A0=C2=A0cput=C2=A0=3D=C2=A00.001; >=C2=A0 >=C2=A0-=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0if(=C2=A0realt=C2=A0<=3D=C2=A00.0=C2=A0)=C2=A0= =C2=A0realt=C2=A0=3D=C2=A00.001; >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0= =C2=A0fprintf(stdout, >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0fprintf(= stderr, >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0"ttcp%s:=C2=A0%.0f=C2=A0bytes=C2=A0in=C2=A0%.2f=C2=A0real=C2= =A0seconds=C2=A0=3D=C2=A0%s/sec=C2=A0+++\n", >=C2=A0 >=C2=A0-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0trans?"-t":"-r", >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0nbytes,= =C2=A0realt,=C2=A0outfmt(nbytes/realt)); >=C2=A0 >=C2=A0-=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0if=C2=A0(verbose)=C2=A0{ >=C2=A0 >=C2=A0--=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stdout, >=C2=A0 >= =C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stderr, >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"ttc= p%s:=C2=A0%.0f=C2=A0bytes=C2=A0in=C2=A0%.2f=C2=A0CPU=C2=A0seconds=C2=A0=3D= =C2=A0%s/cpu=C2=A0sec\n", >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0trans?"-t":"-r", >=C2=A0 >=C2=A0-=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0nbytes,=C2=A0cput,=C2= =A0outfmt(nbytes/cput)); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0} >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stdout, >=C2= =A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stderr, >=C2=A0 >=C2= =A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"ttcp%s:=C2=A0%d= =C2=A0I/O=C2=A0calls,=C2=A0msec/call=C2=A0=3D=C2=A0%.2f,=C2=A0calls/sec= =C2=A0=3D=C2=A0%.2f\n", >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0trans?"-t":"-r", >=C2=A0 >=C2=A0-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0numCalls, >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A01024.0=C2= =A0*=C2=A0realt/((double)numCalls), >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0((double)numCalls)/realt); >=C2= =A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stdout,"ttcp%s:=C2=A0%s\n",= =C2=A0trans?"-t":"-r",=C2=A0stats); >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2= =A0=C2=A0fprintf(stderr,"ttcp%s:=C2=A0%s\n",=C2=A0trans?"-t":"-r",=C2=A0sta= ts); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if=C2=A0(verbose)= =C2=A0{ >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0fprintf(stdout, >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0fprintf(stderr, >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"ttcp%s:=C2=A0buffer=C2=A0address= =C2=A0%#x\n", >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0trans?"-t":"-r", >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0buf); >=C2=A0 >=C2=A0-@@=C2= =A0-459,6=C2=A0+466,7=C2=A0@@=C2=A0char=C2=A0*s; >=C2=A0 >=C2=A0-=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0fprintf(stderr,"ttcp%s:=C2=A0%s\n",=C2=A0trans?"= -t":"-r",=C2=A0s); >=C2=A0 >=C2=A0-=C2=A0} >=C2=A0 >=C2=A0-=C2= =A0 >=C2=A0 >=C2=A0-+void >=C2=A0 >=C2=A0-=C2=A0pattern(=C2=A0cp,= =C2=A0cnt=C2=A0) >=C2=A0 >=C2=A0-=C2=A0register=C2=A0char=C2=A0*cp; >= =C2=A0 >=C2=A0-=C2=A0register=C2=A0int=C2=A0cnt; >=C2=A0 >=C2=A0-@@= =C2=A0-614,13=C2=A0+622,13=C2=A0@@=C2=A0prusage(r0,=C2=A0r1,=C2=A0e,=C2= =A0b,=C2=A0outp) >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'U': >=C2=A0 = >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0tvsub(&tdiff,=C2=A0&r1->ru_utime,=C2=A0&r0->ru_utime); >= =C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0sprintf(outp,"%d.%01d",=C2=A0tdiff.tv_sec,=C2=A0tdiff.tv_= usec/100000); >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%ld.%01ld",=C2=A0tdiff.tv= _sec,=C2=A0tdiff.tv_usec/100000); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0END(outp); >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0break; >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'S':= >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0tvsub(&tdiff,=C2=A0&r1->ru_stime,=C2=A0&r0->ru_s= time); >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%d.%01d",=C2=A0tdiff.tv_sec,= =C2=A0tdiff.tv_usec/100000); >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%ld.%01ld"= ,=C2=A0tdiff.tv_sec,=C2=A0tdiff.tv_usec/100000); >=C2=A0 >=C2=A0-=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0END(outp); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0break; >=C2=A0 >=C2=A0-=C2= =A0 >=C2=A0 >=C2=A0-@@=C2=A0-642,49=C2=A0+650,49=C2=A0@@=C2=A0prusage(r= 0,=C2=A0r1,=C2=A0e,=C2=A0b,=C2=A0outp) >=C2=A0 >=C2=A0-=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0break; = >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'X': >=C2=A0 >=C2=A0--=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp= ,"%d",=C2=A0t=C2=A0=3D=3D=C2=A00=C2=A0?=C2=A00=C2=A0:=C2=A0(r1->ru_ixrss-r0= ->ru_ixrss)/t); >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%ld",=C2=A0t=C2=A0=3D= =3D=C2=A00=C2=A0?=C2=A00=C2=A0:=C2=A0(r1->ru_ixrss-r0->ru_ixrss)/t); >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0END(outp); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0break; >= =C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'D': >=C2=A0 >=C2=A0--=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp= ,"%d",=C2=A0t=C2=A0=3D=3D=C2=A00=C2=A0?=C2=A00=C2=A0: >=C2=A0 >=C2= =A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0sprintf(outp,"%ld",=C2=A0t=C2=A0=3D=3D=C2=A00=C2=A0?=C2=A00=C2=A0: = >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0(r1->ru_idrss+r1->ru_isrss-= (r0->ru_idrss+r0->ru_isrss))/t); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0END(outp); >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0break; >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'K':= >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%d",=C2=A0t=C2=A0=3D=3D=C2=A00=C2= =A0?=C2=A00=C2=A0: >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%ld",=C2=A0t=C2= =A0=3D=3D=C2=A00=C2=A0?=C2=A00=C2=A0: >=C2=A0 >=C2=A0-=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss)=C2=A0- >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0(r0->ru_ixrss+r0->ru_idrss+= r0->ru_isrss))/t); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0END(outp); >=C2=A0 >=C2= =A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0break; >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'M': >=C2=A0 = >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0sprintf(outp,"%d",=C2=A0r1->ru_maxrss/2); >=C2=A0 >=C2=A0-+= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0spr= intf(outp,"%ld",=C2=A0r1->ru_maxrss/2); >=C2=A0 >=C2=A0-=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0END(outp)= ; >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0break; >=C2=A0 >=C2=A0-=C2=A0 >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case= =C2=A0'F': >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%d",=C2=A0r1->ru_majflt-r0->= ru_majflt); >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%ld",=C2=A0r1->ru_majflt-r0-= >ru_majflt); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0END(outp); >=C2=A0 >=C2=A0-= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0break; >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'R': >=C2=A0 >= =C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0sprintf(outp,"%d",=C2=A0r1->ru_minflt-r0->ru_minflt); >=C2=A0 = >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0sprintf(outp,"%ld",=C2=A0r1->ru_minflt-r0->ru_minflt); >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0END(outp); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0break; >= =C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'I': >=C2=A0 >=C2=A0--=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp= ,"%d",=C2=A0r1->ru_inblock-r0->ru_inblock); >=C2=A0 >=C2=A0-+=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(o= utp,"%ld",=C2=A0r1->ru_inblock-r0->ru_inblock); >=C2=A0 >=C2=A0-=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0END(outp); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0break; >=C2=A0 >=C2=A0-=C2= =A0 >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0case=C2=A0'O': >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%d",=C2=A0r1->ru_ou= block-r0->ru_oublock); >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(outp,"%ld",=C2=A0r1->r= u_oublock-r0->ru_oublock); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0END(outp); >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0break; >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case=C2=A0'C': >=C2=A0 >=C2=A0--=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(o= utp,"%d+%d",=C2=A0r1->ru_nvcsw-r0->ru_nvcsw, >=C2=A0 >=C2=A0-+=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sprintf(o= utp,"%ld+%ld",=C2=A0r1->ru_nvcsw-r0->ru_nvcsw, >=C2=A0 >=C2=A0-=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0r1->ru_nivcsw-r0->ru_nivcsw=C2=A0); >=C2=A0 = >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0END(outp); >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0break; >=C2=A0 >= =C2=A0-@@=C2=A0-743,6=C2=A0+751,7=C2=A0@@=C2=A0register=C2=A0char=C2=A0*cp;= >=C2=A0 >=C2=A0-=C2=A0/* >=C2=A0 >=C2=A0-=C2=A0=C2=A0*=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0N=C2=A0R= =C2=A0E=C2=A0A=C2=A0D >=C2=A0 >=C2=A0-=C2=A0=C2=A0*/ >=C2=A0 >= =C2=A0-+int >=C2=A0 >=C2=A0-=C2=A0Nread(=C2=A0fd,=C2=A0buf,=C2=A0count= =C2=A0) >=C2=A0 >=C2=A0-=C2=A0int=C2=A0fd; >=C2=A0 >=C2=A0-=C2= =A0void=C2=A0*buf; >=C2=A0 >=C2=A0-@@=C2=A0-752,7=C2=A0+761,7=C2=A0@@= =C2=A0int=C2=A0count; >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0int= =C2=A0len=C2=A0=3D=C2=A0sizeof(from); >=C2=A0 >=C2=A0-=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0register=C2=A0int=C2=A0cnt; >=C2=A0 >=C2=A0-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0if(=C2=A0udp=C2=A0)=C2=A0=C2=A0{ >=C2=A0 >= =C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cnt=C2=A0=3D=C2= =A0recvfrom(=C2=A0fd,=C2=A0buf,=C2=A0count,=C2=A00,=C2=A0&from,=C2=A0&len= =C2=A0); >=C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0cnt=C2=A0=3D=C2=A0recvfrom(=C2=A0fd,=C2=A0buf,=C2=A0count,=C2=A00,= =C2=A0(struct=C2=A0sockaddr=C2=A0*)&from,=C2=A0&len=C2=A0); >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0numCalls++; = >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}=C2=A0else=C2=A0{ >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if(= =C2=A0b_flag=C2=A0) >=C2=A0 >=C2=A0-@@=C2=A0-774,6=C2=A0+783,7=C2=A0@@= =C2=A0int=C2=A0count; >=C2=A0 >=C2=A0-=C2=A0/* >=C2=A0 >=C2=A0-= =C2=A0=C2=A0*=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0N=C2=A0W=C2=A0R=C2=A0I=C2=A0T=C2=A0E >=C2=A0 >=C2=A0-= =C2=A0=C2=A0*/ >=C2=A0 >=C2=A0-+int >=C2=A0 >=C2=A0-=C2=A0Nwrite(= =C2=A0fd,=C2=A0buf,=C2=A0count=C2=A0) >=C2=A0 >=C2=A0-=C2=A0int=C2= =A0fd; >=C2=A0 >=C2=A0-=C2=A0void=C2=A0*buf; >=C2=A0 >=C2=A0-@@= =C2=A0-782,7=C2=A0+792,7=C2=A0@@=C2=A0int=C2=A0count; >=C2=A0 >=C2= =A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0register=C2=A0int=C2=A0cnt; >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if(=C2=A0udp=C2=A0)=C2=A0=C2=A0{ >= =C2=A0 >=C2=A0-=C2=A0again: >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0cnt=C2=A0=3D=C2=A0sendto(=C2=A0fd,=C2=A0buf,= =C2=A0count,=C2=A00,=C2=A0&sinhim,=C2=A0sizeof(sinhim)=C2=A0); >=C2=A0 = >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cnt=C2=A0=3D=C2= =A0sendto(=C2=A0fd,=C2=A0buf,=C2=A0count,=C2=A00,=C2=A0(struct=C2=A0sockadd= r=C2=A0*)&sinhim,=C2=A0sizeof(sinhim)=C2=A0); >=C2=A0 >=C2=A0-=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0numCalls++; >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if(=C2=A0cnt<0= =C2=A0&&=C2=A0errno=C2=A0=3D=3D=C2=A0ENOBUFS=C2=A0)=C2=A0=C2=A0{ >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0delay(18000); >=C2=A0 >=C2=A0-@@=C2=A0-803,7=C2= =A0+813,7=C2=A0@@=C2=A0delay(us) >=C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >= =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0tv.tv_sec=C2=A0=3D=C2=A00; >=C2= =A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0tv.tv_usec=C2=A0=3D=C2=A0us; = >=C2=A0 >=C2=A0--=C2=A0=C2=A0=C2=A0=C2=A0(void)select(=C2=A01,=C2=A0(char= =C2=A0*)0,=C2=A0(char=C2=A0*)0,=C2=A0(char=C2=A0*)0,=C2=A0&tv=C2=A0); >= =C2=A0 >=C2=A0-+=C2=A0=C2=A0=C2=A0=C2=A0(void)select(=C2=A01,=C2=A0NULL,= =C2=A0NULL,=C2=A0NULL,=C2=A0&tv=C2=A0); >=C2=A0 >=C2=A0-=C2=A0} >= =C2=A0 >=C2=A0-=C2=A0 >=C2=A0 >=C2=A0-=C2=A0/* >=C2=A0 >=C2=A0dif= f=C2=A0--git=C2=A0a/benchmarks/ttcp/pkg-plist=C2=A0b/benchmarks/ttcp/pkg-pl= ist >=C2=A0 >=C2=A0deleted=C2=A0file=C2=A0mode=C2=A0100644 >=C2=A0 = >=C2=A0index=C2=A09e771280ae35..000000000000 >=C2=A0 >=C2=A0---=C2= =A0a/benchmarks/ttcp/pkg-plist >=C2=A0 >=C2=A0+++=C2=A0/dev/null >= =C2=A0 >=C2=A0@@=C2=A0-1,3=C2=A0+0,0=C2=A0@@ >=C2=A0 >=C2=A0-bin/ttcp= >=C2=A0 >=C2=A0-man/man1/ttcp.1.gz >=C2=A0 >=C2=A0-%%PORTDOCS%%%%D= OCSDIR%%/README Hi, Can try to be consistent in the tree? ht= tps://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D276759#c2 wasn't addres= sed at all and now we have 3 ports (where 2 being Chris's) not following = suit. As others have pointed out I'm not sure about the license changes h= e's done in several of his "forks" in general. Best regards, Dani= el --_=_swift_1708765831_baac66a2834ff01fd98eedf0631e7cc4_=_ Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
On 2024-02-24T09:47:23.000+01:00, Gleb Popov <arrowd@FreeBSD.org>= ; wrote:
The bra=
nch main has been updated by arrowd:


=

commit 36c21f98ff445e373ab61726ee8b64e02f8984f7
Author: =
    Chris Hutchinson <portmaster@bsdforge.com>
AuthorDate=
: 2024-02-24 08:43:41 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.or=
g>
CommitDate: 2024-02-24 08:46:30 +0000

benchmarks/ttcp: Update to 1.13

<= /div>
PR: 276759
---
bench= marks/ttcp/Makefile | 29 ++---
benchmarks/ttcp/di= stinfo | 9 +-
benchmarks/ttcp/files/patch-ttcp.c= | 257 -------------------------------------
benchmarks/ttcp= /pkg-plist | 3 -
4 files changed, 15 insertions(+= ), 283 deletions(-)

diff --git a/benchmarks/tt= cp/Makefile b/benchmarks/ttcp/Makefile
index 364903c075df..32= a074aa304f 100644
--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@@ -1,29 +1,24 @@
<= div> PORTNAME=3D=09ttcp
-PORTVERSION=3D=091.12
= -PORTREVISION=3D=093
+PORTVERSION=3D=091.13
CA= TEGORIES=3D=09benchmarks net
-DISTF= ILES=3D=09ttcp.c ttcp.1 README
-DIST_SUBDIR=3D=09${PORTNAME}<= br>
-EXTRACT_ONLY=3D=09# none
+MASTER_SITES=3D=09https://codeber= g.org/BSDforge/${PORTNAME}/archive/

MAIN= TAINER=3D=09portmaster@BSDforge.com
COMMENT=3D=09Benchmarking = tool for analysing TCP and UDP performance

-LICENSE=3D=09PD
<= /div>
+LICENSE=3D=09BSD0CLAUSE

-DEPRECATE= D=3D=09Abandonware, no release in over 20 years. Consider using benchmarks/= iperf3 or benchmarks/nttcp
-EXPIRATION_DATE=3D2024-02-29
<= /div>
-
-NO_WRKSUBDIR=3D=09yes
+CFLAGS+=3D= =09-Wno-strict-prototypes

+PLIST_FILES=3D=09= =09=09bin/ttcp share/man/man1/ttcp.1.gz
+PORTDOCS_PLIST_FILES= =3D=09share/doc/ttcp/README share/doc/ttcp/CHANGES \
+=09=09= =09share/doc/ttcp/LICENSE
+PORTDOCS=3D=09=09README CHANGES LI= CENSE
OPTIONS_DEFINE=3D=09DOCS
-
+# because the ports framework doesn't cope well with bare ${PORTNAME} ${W= RKSRC}
post-extract:
-=09${CP} ${DISTDIR}/${DI= ST_SUBDIR}/ttcp.c ${WRKSRC}
-=09${CP} ${DISTDIR}/${DIST_SUBDI= R}/ttcp.1 ${WRKSRC}
-=09${CP} ${DISTDIR}/${DIST_SUBDIR}/READM= E ${WRKSRC}
+=09${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTN= AME}-${PORTVERSION}

do-build:
= =09${CC} ${CFLAGS} -o ${WRKSRC}/ttcp ${WRKSRC}/ttcp.c
@@ -34= ,6 +29,6 @@ do-install:

do-install-DOCS-on:<= br>
=09@${MKDIR} ${STAGEDIR}${DOCSDIR}
-=09${INSTA= LL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+=09${INSTALL= _DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
diff --git a/benchmarks/ttcp/distinfo = b/benchmarks/ttcp/distinfo
index 3415da392dd6..20f0333e9396 1= 00644
--- a/benchmarks/ttcp/distinfo
+++ b/benc= hmarks/ttcp/distinfo
@@ -1,6 +1,3 @@
-SHA256 (t= tcp/ttcp.c) =3D e630a95788efacfee226dff3550e58ed908987ef96817efc8ad4862657a= 60c3b
-SIZE (ttcp/ttcp.c) =3D 19170
-SHA256 (tt= cp/ttcp.1) =3D edb5dbc156c06584d7a73b6ffdb0049dca1b819f0c79aa2289005d60acad= dbc9
-SIZE (ttcp/ttcp.1) =3D 3885
-SHA256 (ttcp= /README) =3D a5c033bcfdcbca3cfe82c36b8c82d8b25d7bc1968a5a664f61052bfe31a1a5= 31
-SIZE (ttcp/README) =3D 781
+TIMESTAMP =3D 1= 706864630
+SHA256 (ttcp-1.13.tar.gz) =3D 809214c535175139897a= fba784e2e6d1eff02efc3d7b90a67f1bb52fb5082027
+SIZE (ttcp-1.13= .tar.gz) =3D 10959
diff --git a/benchmarks/ttcp/files/patch-t= tcp.c b/benchmarks/ttcp/files/patch-ttcp.c
deleted file mode = 100644
index a055bfeef7ee..000000000000
--- a/b= enchmarks/ttcp/files/patch-ttcp.c
+++ /dev/null
@@ -1,257 +0,0 @@
---- ttcp.c.orig=092016-07-27 15:06:14 UTC=
-+++ ttcp.c
-@@ -55,6 +55,9 @@ static char RCS= id[] =3D "ttcp.c $Revision:
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <sys/tim= e.h>=09=09/* struct timeval */
-+#include <unistd.h>=
-+#include <string.h>
-+#include <std= lib.h>
-
- #if defined(SYSV)
= - #include <sys/times.h>
-@@ -133,7 +136,7 @@ double cp= ut, realt;=09=09/* user, real time
-
- void e= rr();
- void mes();
--int pattern();
<= div>-+void pattern();
- void prep_timer();
- do= uble read_timer();
- int Nread();
-@@ -147,6 +1= 50,7 @@ sigpipe()
- {
- }
-
<= /div>
-+int
- main(argc,argv)
- int argc;
- char **argv;
-@@ -249,6 +253,7 @@ char **argv;=
- #endif /* cray */
- =09=09}
- = =09=09sinhim.sin_port =3D htons(port);
-+=09=09sinme.sin_fami= ly =3D AF_INET; /* Solaris needs this */
- =09=09sinme.si= n_port =3D 0;=09=09/* free choice */
- =09} else {
<= div>- =09=09/* rcvr */
-@@ -263,29 +268,31 @@ char **argv;
- =09if ( (buf =3D (char *)malloc(buflen+bufalign)) =3D=3D (cha= r *)NULL)
- =09=09err("malloc");
- =09if (bufal= ign !=3D 0)
--=09=09buf +=3D(bufalign - ((int)buf % bufalign)= + bufoffset) % bufalign;
-+=09=09buf +=3D (bufalign
-+=09=09=09-((unsigned long)buf % bufalign)
-+=09=09=09= + bufoffset) % bufalign;
-
- =09if (trans) {
--=09 fprintf(stdout,
-+=09 fprintf(stderr= ,
- =09 "ttcp-t: buflen=3D%d, nbuf=3D%d, align=3D%d/%d, po= rt=3D%d",
- =09=09buflen, nbuf, bufalign, bufoffset, port);
- =09 if (sockbufsize)
-- =09=09fprintf(stdo= ut, ", sockbufsize=3D%d", sockbufsize);
-- =09 fprintf(std= out, " %s -> %s\n", udp?"udp":"tcp", host);
-+ =09=09fpr= intf(stderr, ", sockbufsize=3D%d", sockbufsize);
-+ =09 fp= rintf(stderr, " %s -> %s\n", udp?"udp":"tcp", host);
- = =09} else {
--=09 fprintf(stdout,
-+=09 f= printf(stderr,
- =09 "ttcp-r: buflen=3D%d, nbuf=3D%d, ali= gn=3D%d/%d, port=3D%d",
- =09=09buflen, nbuf, bufalign, bufo= ffset, port);
- =09 if (sockbufsize)
-- =09= =09fprintf(stdout, ", sockbufsize=3D%d", sockbufsize);
-- =09= fprintf(stdout, " %s\n", udp?"udp":"tcp");
-+ =09=09fpri= ntf(stderr, ", sockbufsize=3D%d", sockbufsize);
-+ =09 fpr= intf(stderr, " %s\n", udp?"udp":"tcp");
- =09}
-
- =09if ((fd =3D socket(AF_INET, udp?SOCK_DGRAM:SOCK_STRE= AM, 0)) < 0)
- =09=09err("socket");
- =09mes= ("socket");
-
--=09if (bind(fd, &sinme, si= zeof(sinme)) < 0)
-+=09if (bind(fd, (struct sockaddr *) &a= mp;sinme, sizeof(sinme)) < 0)
- =09=09err("bind");
-
- #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
<= /div>
-@@ -326,7 +333,7 @@ char **argv;
- =09=09=09mes("n= odelay");
- =09=09}
- #endif
--= =09=09if(connect(fd, &sinhim, sizeof(sinhim) ) < 0)
-+= =09=09if(connect(fd, (struct sockaddr*)&sinhim, sizeof(sinhim) ) < 0= )
- =09=09=09err("connect");
- =09=09mes("conne= ct");
- =09 } else {
-@@ -348,11 +355,11 @@ = char **argv;
- =09=09}
- =09=09fromlen =3D size= of(frominet);
- =09=09domain =3D AF_INET;
--=09= =09if((fd=3Daccept(fd, &frominet, &fromlen) ) < 0)
-+=09=09if((fd=3Daccept(fd, (struct sockaddr*)&frominet, &fromlen)= ) < 0)
- =09=09=09err("accept");
- =09=09{ = struct sockaddr_in peer;
- =09=09 int peerlen =3D sizeof(pee= r);
--=09=09 if (getpeername(fd, (struct sockaddr_in *) &= ;peer,
-+=09=09 if (getpeername(fd, (struct sockaddr*) &= ;peer,
- =09=09=09=09&peerlen) < 0) {
-= =09=09=09err("getpeername");
- =09=09 }
-@@ -= 412,25 +419,25 @@ char **argv;
- =09}
- =09if( = cput &lt;=3D 0.0 ) cput =3D 0.001;
- =09if( realt &l= t;=3D 0.0 ) realt =3D 0.001;
--=09fprintf(stdout,
<= div>-+=09fprintf(stderr,
- =09=09"ttcp%s: %.0f bytes in %.2f = real seconds =3D %s/sec +++\n",
- =09=09trans?"-t":"-r",
<= /div>
- =09=09nbytes, realt, outfmt(nbytes/realt));
- =09= if (verbose) {
--=09 fprintf(stdout,
-+=09 = fprintf(stderr,
- =09=09"ttcp%s: %.0f bytes in %.2f CPU sec= onds =3D %s/cpu sec\n",
- =09=09trans?"-t":"-r",
- =09=09nbytes, cput, outfmt(nbytes/cput));
- =09}
--=09fprintf(stdout,
-+=09fprintf(stderr,
- =09=09"ttcp%s: %d I/O calls, msec/call =3D %.2f, calls/sec =3D %.2f\n",<= br>
- =09=09trans?"-t":"-r",
- =09=09numCalls,
<= /div>
- =09=091024.0 * realt/((double)numCalls),
- =09=09= ((double)numCalls)/realt);
--=09fprintf(stdout,"ttcp%s: %s\n"= , trans?"-t":"-r", stats);
-+=09fprintf(stderr,"ttcp%s: %s\n"= , trans?"-t":"-r", stats);
- =09if (verbose) {
= --=09 fprintf(stdout,
-+=09 fprintf(stderr,
- =09=09"ttcp%s: buffer address %#x\n",
- =09=09trans?"-t"= :"-r",
- =09=09buf);
-@@ -459,6 +466,7 @@ char = *s;
- =09fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s);<= br>
- }
-
-+void
- pat= tern( cp, cnt )
- register char *cp;
- register= int cnt;
-@@ -614,13 +622,13 @@ prusage(r0, r1, e, b, outp)<= br>
-
- =09=09case 'U':
- =09=09=09t= vsub(&tdiff, &r1->ru_utime, &r0->ru_utime);
--=09=09=09sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
-+=09=09=09sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_use= c/100000);
- =09=09=09END(outp);
- =09=09=09bre= ak;
-
- =09=09case 'S':
- =09=09= =09tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime);
=
--=09=09=09sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000)= ;
-+=09=09=09sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv= _usec/100000);
- =09=09=09END(outp);
- =09=09= =09break;
-
-@@ -642,49 +650,49 @@ prusage(r0,= r1, e, b, outp)
- =09=09=09break;
-
=
- =09=09case 'X':
--=09=09=09sprintf(outp,"%d", t =3D=3D= 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
-+=09=09=09spr= intf(outp,"%ld", t =3D=3D 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
=
- =09=09=09END(outp);
- =09=09=09break;
<= div>-
- =09=09case 'D':
--=09=09=09sprintf(out= p,"%d", t =3D=3D 0 ? 0 :
-+=09=09=09sprintf(outp,"%ld", t =3D= =3D 0 ? 0 :
- =09=09=09 (r1->ru_idrss+r1->ru_isrss-(= r0->ru_idrss+r0->ru_isrss))/t);
- =09=09=09END(outp);
- =09=09=09break;
-
- =09=09case = 'K':
--=09=09=09sprintf(outp,"%d", t =3D=3D 0 ? 0 :
=
-+=09=09=09sprintf(outp,"%ld", t =3D=3D 0 ? 0 :
- =09=09= =09 ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) -
-= =09=09=09 (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t);
- =09=09=09END(outp);
- =09=09=09break;
-
- =09=09case 'M':
--=09=09=09sprintf(outp,"= %d", r1->ru_maxrss/2);
-+=09=09=09sprintf(outp,"%ld", r1-&= gt;ru_maxrss/2);
- =09=09=09END(outp);
- =09=09= =09break;
-
- =09=09case 'F':
--= =09=09=09sprintf(outp,"%d", r1->ru_majflt-r0->ru_majflt);
-+=09=09=09sprintf(outp,"%ld", r1->ru_majflt-r0->ru_majflt);
- =09=09=09END(outp);
- =09=09=09break;
-
- =09=09case 'R':
--=09=09=09sprintf(outp,= "%d", r1->ru_minflt-r0->ru_minflt);
-+=09=09=09sprintf(= outp,"%ld", r1->ru_minflt-r0->ru_minflt);
- =09=09=09EN= D(outp);
- =09=09=09break;
-
- = =09=09case 'I':
--=09=09=09sprintf(outp,"%d", r1->ru_inblo= ck-r0->ru_inblock);
-+=09=09=09sprintf(outp,"%ld", r1->= ru_inblock-r0->ru_inblock);
- =09=09=09END(outp);
- =09=09=09break;
-
- =09=09case 'O':
--=09=09=09sprintf(outp,"%d", r1->ru_oublock-r0->ru_oublo= ck);
-+=09=09=09sprintf(outp,"%ld", r1->ru_oublock-r0->= ru_oublock);
- =09=09=09END(outp);
- =09=09=09b= reak;
- =09=09case 'C':
--=09=09=09sprintf(outp= ,"%d+%d", r1->ru_nvcsw-r0->ru_nvcsw,
-+=09=09=09sprintf= (outp,"%ld+%ld", r1->ru_nvcsw-r0->ru_nvcsw,
- =09=09=09= =09r1->ru_nivcsw-r0->ru_nivcsw );
- =09=09=09END(outp);=
- =09=09=09break;
-@@ -743,6 +751,7 @@ registe= r char *cp;
- /*
- *=09=09=09N R E A D
- */
-+int
- Nread( fd, buf, count )
- int fd;
- void *buf;
-@@ -752,7 += 761,7 @@ int count;
- =09int len =3D sizeof(from);
<= div>- =09register int cnt;
- =09if( udp ) {
--= =09=09cnt =3D recvfrom( fd, buf, count, 0, &from, &len );
=
-+=09=09cnt =3D recvfrom( fd, buf, count, 0, (struct sockaddr *)&f= rom, &len );
- =09=09numCalls++;
- =09} els= e {
- =09=09if( b_flag )
-@@ -774,6 +783,7 @@ i= nt count;
- /*
- *=09=09=09N W R I T E
- */
-+int
- Nwrite( fd, buf, count )
- int fd;
- void *buf;
-@@ -782,7 = +792,7 @@ int count;
- =09register int cnt;
- = =09if( udp ) {
- again:
--=09=09cnt =3D sendto= ( fd, buf, count, 0, &sinhim, sizeof(sinhim) );
-+=09=09c= nt =3D sendto( fd, buf, count, 0, (struct sockaddr *)&sinhim, sizeof(si= nhim) );
- =09=09numCalls++;
- =09=09if( cnt<= ;0 && errno =3D=3D ENOBUFS ) {
- =09=09=09delay(1800= 0);
-@@ -803,7 +813,7 @@ delay(us)
-
=
- =09tv.tv_sec =3D 0;
- =09tv.tv_usec =3D us;
<= div>--=09(void)select( 1, (char *)0, (char *)0, (char *)0, &tv );
-+=09(void)select( 1, NULL, NULL, NULL, &tv );
-= }
-
- /*
diff --git a/benchmark= s/ttcp/pkg-plist b/benchmarks/ttcp/pkg-plist
deleted file mod= e 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

Hi,

Can try to be consistent in the tree?

ht= tps://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D276759#c2 wasn't addr= essed at all and now we have 3 ports (where 2 being Chris's) not following = suit. As others have pointed out I'm not sure about the license changes he'= s done in several of his "forks" in general.

<= /div>
Best regards,
Daniel

=

--_=_swift_1708765831_baac66a2834ff01fd98eedf0631e7cc4_=_--