svn commit: r560558 - branches/2021Q1/benchmarks/iperf/files

[Sunpoet Po-Chuan Hsieh]

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 <vas at sibptus.ru>
  Submitted by:	dim
  
  Fix build on armv6
  
  PR:		251448
  Submitted by:	Martin Birgmeier <d8zNeCFG at aon.at>

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");
+     }