From owner-svn-ports-branches@freebsd.org Wed Jan 6 19:05:47 2021 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 68AE34DAAED; Wed, 6 Jan 2021 19:05:47 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9zNC2VMGz4lt9; Wed, 6 Jan 2021 19:05:47 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 48228236DE; Wed, 6 Jan 2021 19:05:47 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 106J5l2b068771; Wed, 6 Jan 2021 19:05:47 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 106J5kx5068769; Wed, 6 Jan 2021 19:05:46 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202101061905.106J5kx5068769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 6 Jan 2021 19:05:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r560558 - branches/2021Q1/benchmarks/iperf/files X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2021Q1/benchmarks/iperf/files X-SVN-Commit-Revision: 560558 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 19:05:47 -0000 Author: sunpoet Date: Wed Jan 6 19:05:46 2021 New Revision: 560558 URL: https://svnweb.freebsd.org/changeset/ports/560558 Log: MFH: r560244 r560245 Fix build on i386 PR: 252280 Reported by: Victor Sudakov Submitted by: dim Fix build on armv6 PR: 251448 Submitted by: Martin Birgmeier Added: branches/2021Q1/benchmarks/iperf/files/patch-src-Settings.cpp - copied, changed from r560244, head/benchmarks/iperf/files/patch-src-Settings.cpp branches/2021Q1/benchmarks/iperf/files/patch-src-histogram.c - copied unchanged from r560244, head/benchmarks/iperf/files/patch-src-histogram.c Modified: Directory Properties: branches/2021Q1/ (props changed) Copied and modified: branches/2021Q1/benchmarks/iperf/files/patch-src-Settings.cpp (from r560244, head/benchmarks/iperf/files/patch-src-Settings.cpp) ============================================================================== --- head/benchmarks/iperf/files/patch-src-Settings.cpp Sun Jan 3 20:30:07 2021 (r560244, copy source) +++ branches/2021Q1/benchmarks/iperf/files/patch-src-Settings.cpp Wed Jan 6 19:05:46 2021 (r560558) @@ -9,3 +9,39 @@ // fill out the formats in the event they are needed per an time error char start_timebuf[80]; struct tm ts = *localtime(&mExtSettings->txstart_epoch.tv_sec); +@@ -1731,13 +1731,13 @@ int Settings_GenerateClientHdr (struct thread_Settings + if (isFullDuplex(client) || isReverse(client)) { + upperflags |= HEADER_ISOCH_SETTINGS; + hdr->isoch_settings.FPSl = htonl((long)(client->mFPS)); +- hdr->isoch_settings.FPSu = htonl(((client->mFPS - (long)(client->mFPS)) * rMillion)); ++ hdr->isoch_settings.FPSu = htonl((long)((client->mFPS - (long)(client->mFPS)) * rMillion)); + hdr->isoch_settings.Meanl = htonl((long)(client->mMean)); +- hdr->isoch_settings.Meanu = htonl((((client->mMean) - (long)(client->mMean)) * rMillion)); ++ hdr->isoch_settings.Meanu = htonl((long)(((client->mMean) - (long)(client->mMean)) * rMillion)); + hdr->isoch_settings.Variancel = htonl((long)(client->mVariance)); +- hdr->isoch_settings.Varianceu = htonl(((client->mVariance - (long)(client->mVariance)) * rMillion)); ++ hdr->isoch_settings.Varianceu = htonl((long)((client->mVariance - (long)(client->mVariance)) * rMillion)); + hdr->isoch_settings.BurstIPGl = htonl((long)(client->mBurstIPG)); +- hdr->isoch_settings.BurstIPGu = htonl(((client->mBurstIPG - (long)(client->mBurstIPG)) * rMillion)); ++ hdr->isoch_settings.BurstIPGu = htonl((long)((client->mBurstIPG - (long)(client->mBurstIPG)) * rMillion)); + len += sizeof(struct client_hdrext_isoch_settings); + } + } +@@ -1822,13 +1822,13 @@ int Settings_GenerateClientHdr (struct thread_Settings + upperflags |= HEADER_ISOCH; + if (isFullDuplex(client) || isReverse(client)) { + upperflags |= HEADER_ISOCH_SETTINGS; +- hdr->isoch_settings.FPSl = htonl(client->mFPS); ++ hdr->isoch_settings.FPSl = htonl((long)client->mFPS); + hdr->isoch_settings.FPSu = htonl(((long)(client->mFPS) - (long)client->mFPS * rMillion)); +- hdr->isoch_settings.Meanl = htonl(client->mMean); ++ hdr->isoch_settings.Meanl = htonl((long)client->mMean); + hdr->isoch_settings.Meanu = htonl(((long)(client->mMean) - (long)client->mMean * rMillion)); +- hdr->isoch_settings.Variancel = htonl(client->mVariance); ++ hdr->isoch_settings.Variancel = htonl((long)client->mVariance); + hdr->isoch_settings.Varianceu = htonl(((long)(client->mVariance) - (long)client->mVariance * rMillion)); +- hdr->isoch_settings.BurstIPGl = htonl(client->mBurstIPG); ++ hdr->isoch_settings.BurstIPGl = htonl((long)client->mBurstIPG); + hdr->isoch_settings.BurstIPGu = htonl(((long)(client->mBurstIPG) - (long)client->mBurstIPG * rMillion)); + len += sizeof(struct client_hdrext_isoch_settings); + } Copied: branches/2021Q1/benchmarks/iperf/files/patch-src-histogram.c (from r560244, head/benchmarks/iperf/files/patch-src-histogram.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/benchmarks/iperf/files/patch-src-histogram.c Wed Jan 6 19:05:46 2021 (r560558, copy of r560244, head/benchmarks/iperf/files/patch-src-histogram.c) @@ -0,0 +1,16 @@ +--- src/histogram.c.orig 2020-11-30 18:53:55 UTC ++++ src/histogram.c +@@ -239,11 +239,11 @@ void histogram_print(struct histogram *h, double start + fprintf(stdout, "%s (%.2f/%.2f/99.7%%=%d/%d/%d,Outliers=%d,obl/obu=%d/%d)", \ + h->outbuf, h->ci_lower, h->ci_upper, lowerci, upperci, upper3stdev, outliercnt, oob_l, oob_u); + if (!h->final && (h->maxval > 0)) { +- fprintf(stdout, " (%0.3f ms/%ld.%ld)\n", (h->maxval * 1e3), h->maxts.tv_sec, (long) h->maxts.tv_usec); ++ fprintf(stdout, " (%0.3f ms/%ld.%ld)\n", (h->maxval * 1e3), (long) h->maxts.tv_sec, (long) h->maxts.tv_usec); + h->maxbin = -1; + h->maxval = 0; + } else if (h->final && (h->fmaxval > 0)) { +- fprintf(stdout, " (%0.3f ms/%ld.%ld)\n", (h->fmaxval * 1e3), h->fmaxts.tv_sec, (long) h->fmaxts.tv_usec); ++ fprintf(stdout, " (%0.3f ms/%ld.%ld)\n", (h->fmaxval * 1e3), (long) h->fmaxts.tv_sec, (long) h->fmaxts.tv_usec); + } else { + fprintf(stdout, "\n"); + }