Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Jan 2022 14:41:02 GMT
From:      Luca Pizzamiglio <pizzamig@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 76adbd76453a - main - benchmarks/stress-ng: several improvements and fixes
Message-ID:  <202201051441.205Ef2lg078087@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pizzamig:

URL: https://cgit.FreeBSD.org/ports/commit/?id=76adbd76453a0ef566ae11214b7e70b542f04506

commit 76adbd76453a0ef566ae11214b7e70b542f04506
Author:     Luca Pizzamiglio <pizzamig@FreeBSD.org>
AuthorDate: 2022-01-05 14:33:15 +0000
Commit:     Luca Pizzamiglio <pizzamig@FreeBSD.org>
CommitDate: 2022-01-05 14:33:15 +0000

    benchmarks/stress-ng: several improvements and fixes
    
    Enable on aarch64
    Connect a few libs
    Fix build on CURRENT
    PR:             260893
    Reported by:    Daniel Engberg <diizzy@FreeBSD.org>
---
 benchmarks/stress-ng/Makefile                      | 31 +++++++++++++++-------
 .../stress-ng/files/patch-stress-tlb-shootdown.c   | 14 ----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile
index 5d591fbe1c10..eb5f18e7de38 100644
--- a/benchmarks/stress-ng/Makefile
+++ b/benchmarks/stress-ng/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	stress-ng
 DISTVERSIONPREFIX=	V
 DISTVERSION=	0.13.09
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 
 MAINTAINER=	pizzamig@FreeBSD.org
@@ -10,9 +10,7 @@ COMMENT=	Stress test benchmarks
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_aarch64=	Fails to link: missing sbrk
-
-USES=		compiler:c11 gmake tar:xz
+USES=		compiler:c11 gmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	ColinIanKing
 
@@ -20,13 +18,26 @@ ALL_TARGET=	# empty
 
 PLIST_FILES=	bin/stress-ng man/man1/stress-ng.1.gz
 
-OPTIONS_DEFINE=	LIBINOTIFY
-OPTIONS_DEFAULT=	LIBINOTIFY
-LIBINOTIFY_DESC=	Install the kevent based libinotify to enable its stress
+OPTIONS_DEFINE=		JUDY LIBINOTIFY
+OPTIONS_DEFINE_amd64=	INTELIPSEC
+OPTIONS_DEFAULT=	JUDY LIBINOTIFY
+OPTIONS_DEFAULT_amd64=	INTELIPSEC
+
+INTELIPSEC_DESC=	Enable support for Intel's IPsec library
+JUDY_DESC=		Enable support for (lib)Judy
+LIBINOTIFY_DESC=	Enable support for libinotify
+
+INTELIPSEC_LIB_DEPENDS=		libIPSec_MB.so:security/intel-ipsec-mb
+INTELIPSEC_MAKE_ARGS_OFF=	HAVE_LIB_IPSEC_MB=0
+
+JUDY_LIB_DEPENDS=		libJudy.so:devel/judy
+JUDY_MAKE_ARGS_OFF=		HAVE_LIB_JUDY=0
+
+LIBINOTIFY_LIB_DEPENDS=		libinotify.so:devel/libinotify
+LIBINOTIFY_LDFLAGS=		-linotify
+LIBINOTIFY_MAKE_ARGS_OFF=	HAVE_SYS_INOTIFY_H=0
 
-LIBINOTIFY_CFLAGS	+=	-I${LOCALBASE}/include
-LIBINOTIFY_LDFLAGS	+=	-L${LOCALBASE}/lib -linotify
-LIBINOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
+MAKE_ARGS=	VERBOSE=1
 
 post-patch:
 	${REINPLACE_CMD} -e \
diff --git a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c
deleted file mode 100644
index d54609e2fc7f..000000000000
--- a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- stress-tlb-shootdown.c.orig	2021-12-19 20:49:35 UTC
-+++ stress-tlb-shootdown.c
-@@ -64,7 +64,11 @@ static int stress_tlb_shootdown(const stress_args_t *a
- 		const int32_t max_cpus = stress_get_processors_configured();
- 
- 		CPU_ZERO(&proc_mask);
-+#ifdef CPU_ALLOC
- 		CPU_OR(&proc_mask, &proc_mask_initial, &proc_mask);
-+#else
-+		CPU_OR(&proc_mask, &proc_mask_initial);
-+#endif
- 
- 		tlb_procs = max_cpus;
- 		if (tlb_procs > MAX_TLB_PROCS)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201051441.205Ef2lg078087>