diff --git a/.portsignore b/.portsignore index bba33949adcb..bfd86af0f0ea 100644 --- a/.portsignore +++ b/.portsignore @@ -718,6 +718,7 @@ audio/zplugins-lv2 audio/zrythm audio/zynaddsubfx benchmarks/gtkperf +benchmarks/iorate benchmarks/kdiskmark benchmarks/linux-gputest benchmarks/linux-unigine-heaven diff --git a/benchmarks/Makefile b/benchmarks/Makefile index b134af77cce4..1e8866fa82d1 100644 --- a/benchmarks/Makefile +++ b/benchmarks/Makefile @@ -31,7 +31,6 @@ SUBDIR += inferno SUBDIR += interbench SUBDIR += ior - SUBDIR += iorate SUBDIR += iozone SUBDIR += ipc-bench SUBDIR += iperf diff --git a/benchmarks/iorate/Makefile b/benchmarks/iorate/Makefile deleted file mode 100644 index e201f96ea75d..000000000000 --- a/benchmarks/iorate/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PORTNAME= iorate -DISTVERSION= 3-05 -PORTREVISION= 1 -CATEGORIES= benchmarks -MASTER_SITES= http://sites.google.com/site/vwiorate/downloads/${DISTVERSION}/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-src -EXTRACT_SUFX= .tar - -MAINTAINER= blttll@gmail.com -COMMENT= General purpose storage I/O benchmarking tool -WWW= http://iorate.org/ - -USES= alias bison -MAKEFILE= makefile -MAKE_ARGS= CC="${CC}" -NO_WRKSUBDIR= yes - -PORTDOCS= README README.versions - -OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -e 's,^CFLAGS ,&+,' ${WRKSRC}/${MAKEFILE} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/iorate ${WRKSRC}/ior_rand \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${PREFIX}/share/man/man1 - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/cycle ${WRKSRC}/gen_* ${WRKSRC}/run_* \ - ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.ior ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - -.include diff --git a/benchmarks/iorate/distinfo b/benchmarks/iorate/distinfo deleted file mode 100644 index 912a516acbb3..000000000000 --- a/benchmarks/iorate/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (iorate-3.05-src.tar) = 6305413dc3ac7d833b0e4d99e30ac6cfd67b2f943b758166a3661c8f96b2480e -SIZE (iorate-3.05-src.tar) = 460800 diff --git a/benchmarks/iorate/files/patch-ior__mach.c b/benchmarks/iorate/files/patch-ior__mach.c deleted file mode 100644 index b651b09d7be3..000000000000 --- a/benchmarks/iorate/files/patch-ior__mach.c +++ /dev/null @@ -1,48 +0,0 @@ ---- ior_mach.c.orig 2011-11-03 15:27:58 UTC -+++ ior_mach.c -@@ -41,6 +41,7 @@ static char rcsid[] = "$Header: /home/we - #include - #include - #include -+#include - - /* - * Solaris needs ior_mach.h to be after the above or -@@ -411,6 +411,10 @@ int ior_dev_lock( ior_config *cfg, long - }; - - #else -+#if defined(IOR_LARGE_FILES) && defined(__FreeBSD__) -+#define IOR_SET_LOCK_FLAG F_SETLK -+ struct flock d_lock; /* lock command to run */ -+#else - #ifdef IOR_LARGE_FILES - #define IOR_SET_LOCK_FLAG F_SETLK64 - struct flock64 d_lock; /* lock command to run */ -@@ -418,6 +422,7 @@ int ior_dev_lock( ior_config *cfg, long - #define IOR_SET_LOCK_FLAG F_SETLK - struct flock d_lock; /* lock command to run */ - #endif -+#endif - - result = 0; /* all OK so far */ - -@@ -486,6 +491,10 @@ int ior_dev_unlock( ior_config *cfg, lon - }; - - #else -+#if defined(IOR_LARGE_FILES) && defined(__FreeBSD__) -+#define IOR_SET_LOCK_FLAG F_SETLK -+ struct flock d_lock; /* lock command to run */ -+#else - #ifdef IOR_LARGE_FILES - #define IOR_SET_LOCK_FLAG F_SETLK64 - struct flock64 d_lock; /* lock command to run */ -@@ -493,6 +502,7 @@ int ior_dev_unlock( ior_config *cfg, lon - #define IOR_SET_LOCK_FLAG F_SETLK - struct flock d_lock; /* lock command to run */ - #endif -+#endif - - result = 0; /* all OK so far */ - diff --git a/benchmarks/iorate/files/patch-ior__mach.h b/benchmarks/iorate/files/patch-ior__mach.h deleted file mode 100644 index 426e44ce2d02..000000000000 --- a/benchmarks/iorate/files/patch-ior__mach.h +++ /dev/null @@ -1,36 +0,0 @@ ---- ior_mach.h.orig 2011-11-03 15:50:06 UTC -+++ ior_mach.h -@@ -142,7 +142,6 @@ - #define IOR_MAX_SEEK (HUGE)(4398046511104LL) /* 4 TB */ - #endif - -- - /************************ OS is LINUX? ************************/ - /* - * Since RedHat uses their own version, check for it -@@ -203,6 +202,16 @@ - #endif - - -+/************************ OS is FreeBSD? ***********************/ -+#ifdef __FreeBSD__ -+#include -+#ifdef IOR_LARGE_FILES -+#define HUGE __off_t -+#define IOR_SEEK lseek -+#define IOR_MAX_SEEK (HUGE)(4398046511104LL) /* 4 TB */ -+#endif -+#endif -+ - /************************ OS is unknown? ************************/ - /* - * OK, not a known type, or did not set up large file support -@@ -240,7 +249,7 @@ - /* - * process exit status - */ --#if defined( _AIX ) || defined( HPUX ) || defined( __CYGWIN__ ) -+#if defined( _AIX ) || defined( HPUX ) || defined( __CYGWIN__ ) || defined(__FreeBSD__) - #include - #else - #include diff --git a/benchmarks/iorate/files/patch-ior__rand.c b/benchmarks/iorate/files/patch-ior__rand.c deleted file mode 100644 index 2d5e50e8cf0c..000000000000 --- a/benchmarks/iorate/files/patch-ior__rand.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ior_rand.c.orig 2016-08-02 17:15:56 UTC -+++ ior_rand.c -@@ -24,6 +24,7 @@ static char rcsid[] = "$Header: /home/we - #include - #include - #include -+#include - - /* - * Solaris needs ior_mach.h to be after the above or diff --git a/benchmarks/iorate/pkg-descr b/benchmarks/iorate/pkg-descr deleted file mode 100644 index f9682dc64af2..000000000000 --- a/benchmarks/iorate/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Iorate is a general purpose storage I/O benchmarking tool. - -Iorate was created in 1997 by Vince Westin of EMC while working with Cliff -Burrell of FedEx to fill a need to perform a set of storage I/O benchmarks. -Though Iorate was developed by EMC staff with EMC resources there are no -EMC-specific pieces to the testing, it just tests storage. diff --git a/benchmarks/iorate/pkg-plist b/benchmarks/iorate/pkg-plist deleted file mode 100644 index c8e510c8c391..000000000000 --- a/benchmarks/iorate/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -bin/ior_rand -bin/iorate -share/man/man1/iorate.1.gz -%%DATADIR%%/cycle -%%DATADIR%%/devices.ior -%%DATADIR%%/gen_dev.awk -%%DATADIR%%/gen_devs -%%DATADIR%%/gen_iops -%%DATADIR%%/gen_iops.awk -%%DATADIR%%/gen_stats -%%DATADIR%%/gen_stats.awk -%%DATADIR%%/gen_sum.awk -%%DATADIR%%/gen_sums -%%DATADIR%%/gen_totals -%%DATADIR%%/gen_totals.awk -%%DATADIR%%/patterns.ior -%%DATADIR%%/run_ast -%%DATADIR%%/run_test -%%DATADIR%%/run_var -%%DATADIR%%/tests-ast.ior -%%DATADIR%%/tests-fx.ior -%%DATADIR%%/tests-var.ior -%%DATADIR%%/tests.ior