diff --git a/benchmarks/uperf/Makefile b/benchmarks/uperf/Makefile index 47cacf998e2e..8fe36210cb25 100644 --- a/benchmarks/uperf/Makefile +++ b/benchmarks/uperf/Makefile @@ -1,39 +1,40 @@ PORTNAME= uperf -DISTVERSION= 1.0.7 +DISTVERSIONPREFIX= v +DISTVERSION= 1.0.8 PORTEPOCH= 1 CATEGORIES= benchmarks MAINTAINER= 0mp@FreeBSD.org COMMENT= Network performance tool to model and replay of networking patterns WWW= https://uperf.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= ssl +USES= autoreconf ssl USE_GITHUB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR}/workloads OPTIONS_DEFINE= DOCS post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/tests (cd ${WRKSRC}/tests && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tests \ "! -name Makefile.in ! -name Makefile.am ! -name Makefile") post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS README.md ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR}/docs (cd ${WRKSRC}/docs && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/docs "! -name CNAME") @${MKDIR} ${STAGEDIR}${DOCSDIR}/manual (cd ${WRKSRC}/manual && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/manual "! -name Makefile") .include diff --git a/benchmarks/uperf/distinfo b/benchmarks/uperf/distinfo index 0af129d4d459..7a782001808b 100644 --- a/benchmarks/uperf/distinfo +++ b/benchmarks/uperf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1587210531 -SHA256 (uperf-uperf-1.0.7_GH0.tar.gz) = fca4358c60c5db93ada1ef387962d669f2531796c6cd6dda702c2a27df3cd09a -SIZE (uperf-uperf-1.0.7_GH0.tar.gz) = 242287 +TIMESTAMP = 1789390786 +SHA256 (uperf-uperf-v1.0.8_GH0.tar.gz) = 972ee45ec926d72b6444412c8edf873bc6db0b32ca5df42f2d5d815887a9fee4 +SIZE (uperf-uperf-v1.0.8_GH0.tar.gz) = 131612 diff --git a/benchmarks/uperf/files/patch-src_shm.c b/benchmarks/uperf/files/patch-src_shm.c new file mode 100644 index 000000000000..8e4d15a727fb --- /dev/null +++ b/benchmarks/uperf/files/patch-src_shm.c @@ -0,0 +1,14 @@ +--- src/shm.c.orig 2026-09-14 13:20:51 UTC ++++ src/shm.c +@@ -290,7 +290,11 @@ shm_update_strand_exit(uperf_shm_t *shm) + shm_update_strand_exit(uperf_shm_t *shm) + { + #ifdef HAVE_STDATOMIC_H ++#ifdef __FreeBSD__ ++ (void) __atomic_fetch_add(&shm->finished, 1, __ATOMIC_SEQ_CST); ++#else + (void) atomic_fetch_add(&shm->finished, 1); ++#endif + #elif defined(HAVE_ATOMIC_H) + atomic_add_32(&shm->finished, 1); + #else diff --git a/benchmarks/uperf/files/patch-src_sync.c b/benchmarks/uperf/files/patch-src_sync.c new file mode 100644 index 000000000000..5ba6eab268b5 --- /dev/null +++ b/benchmarks/uperf/files/patch-src_sync.c @@ -0,0 +1,14 @@ +--- src/sync.c.orig 2026-09-14 13:23:38 UTC ++++ src/sync.c +@@ -95,7 +95,11 @@ wait_barrier(barrier_t *bar) + assert(bar->limit > 0); + + #ifdef HAVE_STDATOMIC_H ++#ifdef __FreeBSD__ ++ (void) __atomic_fetch_add(&bar->count, 1, __ATOMIC_SEQ_CST); ++#else + (void) atomic_fetch_add(&bar->count, 1); ++#endif + #elif defined(HAVE_ATOMIC_H) + atomic_add_32(&bar->count, 1); + #else diff --git a/benchmarks/uperf/pkg-plist b/benchmarks/uperf/pkg-plist index d915cc1d470d..f91064f27bd4 100644 --- a/benchmarks/uperf/pkg-plist +++ b/benchmarks/uperf/pkg-plist @@ -1,63 +1,66 @@ bin/uperf -%%DATADIR%%/workloads/connect.xml -%%DATADIR%%/workloads/iperf.xml -%%DATADIR%%/workloads/ldap.xml -%%DATADIR%%/workloads/netperf.xml -%%DATADIR%%/workloads/oltpnet.xml -%%DATADIR%%/workloads/oraclerac.xml -%%DATADIR%%/workloads/sctp.xml -%%DATADIR%%/workloads/specweb.xml -%%DATADIR%%/workloads/ssl.xml -%%DATADIR%%/workloads/telnet.xml -%%DATADIR%%/workloads/two-hosts.xml +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/docs/index.html +%%PORTDOCS%%%%DOCSDIR%%/docs/manual.css +%%PORTDOCS%%%%DOCSDIR%%/docs/manual.html +%%PORTDOCS%%%%DOCSDIR%%/docs/uperf.css +%%PORTDOCS%%%%DOCSDIR%%/manual/bidirectional.xml +%%PORTDOCS%%%%DOCSDIR%%/manual/design_notes.txt +%%PORTDOCS%%%%DOCSDIR%%/manual/netperf.xml.txt +%%PORTDOCS%%%%DOCSDIR%%/manual/rds.txt +%%PORTDOCS%%%%DOCSDIR%%/manual/throughput.xml +%%PORTDOCS%%%%DOCSDIR%%/manual/uperf-default-output.txt +%%PORTDOCS%%%%DOCSDIR%%/manual/uperf-help.txt +%%PORTDOCS%%%%DOCSDIR%%/manual/uperf.css +%%PORTDOCS%%%%DOCSDIR%%/manual/uperf.html +%%PORTDOCS%%%%DOCSDIR%%/manual/uperf.xml +%%PORTDOCS%%%%DOCSDIR%%/manual/uperf.xsl %%DATADIR%%/tests/01simple_sctp.xml %%DATADIR%%/tests/01simple_ssl.xml %%DATADIR%%/tests/01simple_tcp.xml %%DATADIR%%/tests/01simple_udp.xml +%%DATADIR%%/tests/01simple_vsock.vsock.xml %%DATADIR%%/tests/02_2proto1group.xml %%DATADIR%%/tests/02two_groups.xml %%DATADIR%%/tests/3proto.xml %%DATADIR%%/tests/a.xml %%DATADIR%%/tests/accept-connect.xml %%DATADIR%%/tests/accept-sctp.xml %%DATADIR%%/tests/accept-tcp.xml %%DATADIR%%/tests/canfail.xml %%DATADIR%%/tests/disconnect_iter.xml %%DATADIR%%/tests/friendliness.xml %%DATADIR%%/tests/high_connection_count.xml +%%DATADIR%%/tests/max_procs_count.xml +%%DATADIR%%/tests/max_thread_count.xml %%DATADIR%%/tests/mix_thr_proc.xml %%DATADIR%%/tests/multi_proto_connect.xml %%DATADIR%%/tests/parse_err.xml %%DATADIR%%/tests/test-duration-process.xml %%DATADIR%%/tests/test-rate.xml %%DATADIR%%/tests/test-sendfile.xml %%DATADIR%%/tests/test-sendfilev-chunked.xml %%DATADIR%%/tests/test-sendfilev.xml %%DATADIR%%/tests/test-ssize-flowop-count-dur.xml %%DATADIR%%/tests/test-ssize-iperf.xml -%%DATADIR%%/tests/test.rb %%DATADIR%%/tests/test.sh %%DATADIR%%/tests/test_4groups.xml %%DATADIR%%/tests/test_netperf.xml %%DATADIR%%/tests/test_rds.xml %%DATADIR%%/tests/test_send_recv.xml %%DATADIR%%/tests/test_udp.xml +%%DATADIR%%/tests/test_vsock.vsock.xml %%DATADIR%%/tests/throughput_sctp.xml %%DATADIR%%/tests/unknown_proto.xml -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/docs/index.html -%%PORTDOCS%%%%DOCSDIR%%/docs/manual.css -%%PORTDOCS%%%%DOCSDIR%%/docs/manual.html -%%PORTDOCS%%%%DOCSDIR%%/docs/uperf.css -%%PORTDOCS%%%%DOCSDIR%%/manual/bidirectional.xml -%%PORTDOCS%%%%DOCSDIR%%/manual/design_notes.txt -%%PORTDOCS%%%%DOCSDIR%%/manual/netperf.xml.txt -%%PORTDOCS%%%%DOCSDIR%%/manual/rds.txt -%%PORTDOCS%%%%DOCSDIR%%/manual/throughput.xml -%%PORTDOCS%%%%DOCSDIR%%/manual/uperf-default-output.txt -%%PORTDOCS%%%%DOCSDIR%%/manual/uperf-help.txt -%%PORTDOCS%%%%DOCSDIR%%/manual/uperf.css -%%PORTDOCS%%%%DOCSDIR%%/manual/uperf.html -%%PORTDOCS%%%%DOCSDIR%%/manual/uperf.xml -%%PORTDOCS%%%%DOCSDIR%%/manual/uperf.xsl +%%DATADIR%%/workloads/connect.xml +%%DATADIR%%/workloads/iperf.xml +%%DATADIR%%/workloads/ldap.xml +%%DATADIR%%/workloads/netperf.xml +%%DATADIR%%/workloads/oltpnet.xml +%%DATADIR%%/workloads/oraclerac.xml +%%DATADIR%%/workloads/sctp.xml +%%DATADIR%%/workloads/specweb.xml +%%DATADIR%%/workloads/ssl.xml +%%DATADIR%%/workloads/telnet.xml +%%DATADIR%%/workloads/two-hosts.xml