summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-benchmarks/filebench
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-benchmarks/filebench')
-rw-r--r--app-benchmarks/filebench/Manifest1
-rw-r--r--app-benchmarks/filebench/filebench-1.4.9.1.ebuild37
-rw-r--r--app-benchmarks/filebench/files/linux-port.patch369
-rw-r--r--app-benchmarks/filebench/metadata.xml8
4 files changed, 415 insertions, 0 deletions
diff --git a/app-benchmarks/filebench/Manifest b/app-benchmarks/filebench/Manifest
new file mode 100644
index 00000000000..43f88c7173e
--- /dev/null
+++ b/app-benchmarks/filebench/Manifest
@@ -0,0 +1 @@
+DIST filebench-1.4.9.1.tar.gz 349535 SHA256 a1d1516083a1d46bccf6246caf709e800e93eccf17572583343e77726b720678 SHA512 a6400aba4266fcf98e46c4824796a594adc5d5e7f9605f6e1ab01973ce448e27948991e453b186947a8d89f8603a69a3ba955edf2a1abccd2935196af7b6f0d1 WHIRLPOOL 5d5a5c1a2d9eeaaaaf14cd97725ce8ba47ed1f06e1713a6315320697a37a5b12027aa09f819c3e3b1a75cc435823d661e532e7ca319009eb928dc62a778b9bf4
diff --git a/app-benchmarks/filebench/filebench-1.4.9.1.ebuild b/app-benchmarks/filebench/filebench-1.4.9.1.ebuild
new file mode 100644
index 00000000000..bc981643acd
--- /dev/null
+++ b/app-benchmarks/filebench/filebench-1.4.9.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools
+
+DESCRIPTION="Filebench - A Model Based File System Workload Generator"
+HOMEPAGE="http://sourceforge.net/projects/filebench/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libaio
+ sys-devel/flex
+ sys-devel/bison"
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ #epatch "${FILESDIR}/linux-port.patch"
+ eautoreconf
+}
+
+src_compile() {
+ econf
+ emake -j1 || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+
+ dodoc README AUTHORS
+}
diff --git a/app-benchmarks/filebench/files/linux-port.patch b/app-benchmarks/filebench/files/linux-port.patch
new file mode 100644
index 00000000000..c0608128d55
--- /dev/null
+++ b/app-benchmarks/filebench/files/linux-port.patch
@@ -0,0 +1,369 @@
+Index: filebench-1.2.4/filebench/flowop_library.c
+===================================================================
+--- filebench-1.2.4.orig/filebench/flowop_library.c
++++ filebench-1.2.4/filebench/flowop_library.c
+@@ -789,6 +789,7 @@ flowoplib_aiowait(threadflow_t *threadfl
+ for (ncompleted = 0, inprogress = 0,
+ aio = flowop->fo_thread->tf_aiolist;
+ ncompleted < todo, aio != NULL; aio = aio->al_next) {
++ int result;
+
+ result = aio_error64(&aio->al_aiocb);
+
+Index: filebench-1.2.4/filebench/fileset.c
+===================================================================
+--- filebench-1.2.4.orig/filebench/fileset.c
++++ filebench-1.2.4/filebench/fileset.c
+@@ -32,8 +32,9 @@
+ #include <math.h>
+ #include <libgen.h>
+ #include <sys/mman.h>
+-#include "fileset.h"
++
+ #include "filebench.h"
++#include "fileset.h"
+ #include "gamma_dist.h"
+
+ /*
+@@ -631,9 +632,9 @@ fileset_create(fileset_t *fileset)
+ /* we are re-using */
+ reusing = 1;
+ filebench_log(LOG_VERBOSE,
+- "Re-using %s %s on %s file system.",
++ "Re-using %s %s.",
+ fileset_entity_name(fileset),
+- fileset_name, sb.st_fstype);
++ fileset_name);
+ }
+ }
+ (void) mkdir(path, 0755);
+Index: filebench-1.2.4/filebench/filebench.h
+===================================================================
+--- filebench-1.2.4.orig/filebench/filebench.h
++++ filebench-1.2.4/filebench/filebench.h
+@@ -32,6 +32,15 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <errno.h>
++
++#ifndef HAVE_BOOLEAN_T
++typedef enum { B_FALSE, B_TRUE } boolean_t;
++#endif
++
++#ifndef HAVE_U_LONGLONG_T
++typedef unsigned long long u_longlong_t;
++#endif
+
+ #include "vars.h"
+ #include "misc.h"
+Index: filebench-1.2.4/filebench/eventgen.c
+===================================================================
+--- filebench-1.2.4.orig/filebench/eventgen.c
++++ filebench-1.2.4/filebench/eventgen.c
+@@ -40,9 +40,10 @@
+ */
+
+ #include <sys/time.h>
++
++#include "filebench.h"
+ #include "vars.h"
+ #include "eventgen.h"
+-#include "filebench.h"
+ #include "flowop.h"
+ #include "ipc.h"
+
+Index: filebench-1.2.4/filebench/procflow.c
+===================================================================
+--- filebench-1.2.4.orig/filebench/procflow.c
++++ filebench-1.2.4/filebench/procflow.c
+@@ -30,8 +30,8 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+
+-#include "procflow.h"
+ #include "filebench.h"
++#include "procflow.h"
+ #include "flowop.h"
+ #include "ipc.h"
+
+@@ -162,7 +162,7 @@ procflow_createproc(procflow_t *procflow
+ }
+
+ #else
+- if (execl(execname, procname, "-a", procname, "-i",
++ if (execlp(execname, procname, "-a", procname, "-i",
+ instance, "-s", shmaddr, "-m", shmpath, NULL) < 0) {
+ filebench_log(LOG_ERROR,
+ "procflow exec proc failed: %s",
+Index: filebench-1.2.4/filebench/threadflow.c
+===================================================================
+--- filebench-1.2.4.orig/filebench/threadflow.c
++++ filebench-1.2.4/filebench/threadflow.c
+@@ -31,8 +31,9 @@
+ #include <sys/lwp.h>
+ #endif
+ #include <signal.h>
+-#include "threadflow.h"
++
+ #include "filebench.h"
++#include "threadflow.h"
+ #include "flowop.h"
+ #include "ipc.h"
+
+Index: filebench-1.2.4/filebench/utils.c
+===================================================================
+--- filebench-1.2.4.orig/filebench/utils.c
++++ filebench-1.2.4/filebench/utils.c
+@@ -34,6 +34,8 @@
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
++
++#include "filebench.h"
+ #include "utils.h"
+ #include "parsertypes.h"
+
+Index: filebench-1.2.4/filebench/vars.c
+===================================================================
+--- filebench-1.2.4.orig/filebench/vars.c
++++ filebench-1.2.4/filebench/vars.c
+@@ -30,12 +30,12 @@
+ #include <string.h>
+ #include <errno.h>
+
++#include "filebench.h"
+ #include "vars.h"
+ #include "misc.h"
+ #include "utils.h"
+ #include "stats.h"
+ #include "eventgen.h"
+-#include "filebench.h"
+ #include "fb_random.h"
+
+ static var_t *var_find_dynamic(char *name);
+Index: filebench-1.2.4/filebench/parser_gram.y
+===================================================================
+--- filebench-1.2.4.orig/filebench/parser_gram.y
++++ filebench-1.2.4/filebench/parser_gram.y
+@@ -46,8 +46,9 @@
+ #ifdef HAVE_LIBTECLA
+ #include <libtecla.h>
+ #endif
+-#include "parsertypes.h"
++
+ #include "filebench.h"
++#include "parsertypes.h"
+ #include "utils.h"
+ #include "stats.h"
+ #include "vars.h"
+@@ -2642,7 +2643,7 @@ parser_help(cmd_t *cmd)
+ } else {
+ filebench_log(LOG_INFO,
+ "load <personality> (ls "
+- "/usr/benchmarks/filebench/workloads for list)");
++ FILEBENCHDIR "/workloads for list)");
+ }
+ }
+
+Index: filebench-1.2.4/filebench/parser_lex.l
+===================================================================
+--- filebench-1.2.4.orig/filebench/parser_lex.l
++++ filebench-1.2.4/filebench/parser_lex.l
+@@ -38,9 +38,10 @@
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
++
++#include "filebench.h"
+ #include "parsertypes.h"
+ #include "utils.h"
+-#include "filebench.h"
+
+ #include "parser_gram.h"
+
+Index: filebench-1.2.4/filebench/Makefile.am
+===================================================================
+--- filebench-1.2.4.orig/filebench/Makefile.am
++++ filebench-1.2.4/filebench/Makefile.am
+@@ -7,19 +7,19 @@
+ #
+
+ bin_PROGRAMS = go_filebench
+-filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \
++go_filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \
+ utils.c flowop.c flowop_library.c ipc.c \
+ vars.c stats.c eventgen.c fileset.c fb_random.c \
+ parser_gram.y parser_lex.l
+-filebenchdir = $(datadir)/filebench
+-INCLUDES = -I../intl -DFILEBENCHDIR=\"$(prefix)/filebench\"
++INCLUDES = -I../intl -DFILEBENCHDIR=\"$(FILEBENCHDIR)\"
+
+ MV=@MV@
+ LEX=@LEX@
+ YACC=@YACC@
+-LFLAGS = @LFLAGS@
+-YFLAGS = @YFLAGS@
++AM_LFLAGS = @LFLAGS@
++AM_YFLAGS = @YFLAGS@
+ DEFS = -D_REENTRANT @DEFINES@
++LIBS = @LDLIBS@
+ BUILD = @BUILD@
+
+ parser_lex.c: parser_lex.l parser_gram.h Makefile
+Index: filebench-1.2.4/configure.in
+===================================================================
+--- filebench-1.2.4.orig/configure.in
++++ filebench-1.2.4/configure.in
+@@ -73,8 +73,8 @@ case "$host_os$host_cpu" in
+ YFLAGS="-d"
+ AC_DEFINE(HAVE_OFF64_T, 1,
+ [ Define if we can use 64 bit files ])
+- FILEBENCHDIR=${prefix}/filebench
+- FILEBENCHBIN=${prefix}/bin
++ FILEBENCHDIR=${datadir}/filebench
++ FILEBENCHBIN=${bindir}
+ ;;
+ esac
+
+@@ -324,6 +324,6 @@ AC_SUBST(SRCDIR)
+ AC_SUBST(FILEBENCHDIR)
+ AC_SUBST(FILEBENCHBIN)
+
+-AC_CONFIG_FILES([Makefile filebench/Makefile fastsu/Makefile workloads/Makefile workloads/build/Makefile scripts/Makefile benchpoint/Makefile benchpoint/bin/Makefile benchpoint/config/Makefile benchpoint/functions/Makefile benchpoint/profiles/Makefile])
++AC_CONFIG_FILES([Makefile filebench/Makefile fastsu/Makefile workloads/Makefile workloads/build/Makefile scripts/Makefile benchpoint/Makefile benchpoint/bin/Makefile benchpoint/config/Makefile benchpoint/functions/Makefile benchpoint/profiles/Makefile bin/Makefile])
+
+ AC_OUTPUT
+Index: filebench-1.2.4/fastsu/fastsu.c
+===================================================================
+--- filebench-1.2.4.orig/fastsu/fastsu.c
++++ filebench-1.2.4/fastsu/fastsu.c
+@@ -1,23 +1,26 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <strings.h>
++#include <string.h>
+
+-void
++int
+ main(int argc, char *argv[], char *envp[])
+ {
+ char *shell;
+ char cmd[2048];
+
+- *cmd = NULL;
++ *cmd = '\0';
+ shell=getenv("SHELL");
+- *(argv++);
++ argv++;
+ argc--;
+ while(argc-- != 0) {
+ (void) strcat(cmd,*argv);
+ (void) strcat(cmd," ");
+- *(argv++);
++ argv++;
+ }
+
+ execlp(shell, shell, "-c", cmd, (char *) 0);
++
++ /* control should not reach here */
++ return -1;
+ }
+Index: filebench-1.2.4/benchpoint/config/Makefile.am
+===================================================================
+--- filebench-1.2.4.orig/benchpoint/config/Makefile.am
++++ filebench-1.2.4/benchpoint/config/Makefile.am
+@@ -6,8 +6,7 @@
+ # See the file LICENSING in this distribution for details.
+ #
+
+-filebenchdir = $(prefix)/filebench
+-configdir = $(filebenchdir)/config
++configdir = ${FILEBENCHDIR}/config
+
+ config_DATA = *.conf
+
+Index: filebench-1.2.4/benchpoint/profiles/Makefile.am
+===================================================================
+--- filebench-1.2.4.orig/benchpoint/profiles/Makefile.am
++++ filebench-1.2.4/benchpoint/profiles/Makefile.am
+@@ -6,8 +6,7 @@
+ # See the file LICENSING in this distribution for details.
+ #
+
+-filebenchdir = $(prefix)/filebench
+-configdir = $(filebenchdir)/config
++configdir = ${FILEBENCHDIR}/config
+
+ config_DATA = *.prof
+
+Index: filebench-1.2.4/bin/Makefile.am
+===================================================================
+--- filebench-1.2.4.orig/bin/Makefile.am
++++ filebench-1.2.4/bin/Makefile.am
+@@ -6,8 +6,5 @@
+ # See the file LICENSING in this distribution for details.
+ #
+
+-filebenchdir = $(prefix)/filebench
+-scriptsdir = $(filebenchdir)/bin
+-
+-scripts_SCRIPTS = filebench
++bin_SCRIPTS = filebench
+
+Index: filebench-1.2.4/benchpoint/functions/Makefile.am
+===================================================================
+--- filebench-1.2.4.orig/benchpoint/functions/Makefile.am
++++ filebench-1.2.4/benchpoint/functions/Makefile.am
+@@ -6,8 +6,7 @@
+ # See the file LICENSING in this distribution for details.
+ #
+
+-filebenchdir = $(prefix)/filebench
+-configdir = $(filebenchdir)/config
++configdir = ${FILEBENCHDIR}/config
+
+ config_SCRIPTS = *.func
+
+Index: filebench-1.2.4/scripts/Makefile.am
+===================================================================
+--- filebench-1.2.4.orig/scripts/Makefile.am
++++ filebench-1.2.4/scripts/Makefile.am
+@@ -6,8 +6,7 @@
+ # See the file LICENSING in this distribution for details.
+ #
+
+-filebenchdir = $(prefix)/filebench
+-scriptsdir = $(filebenchdir)/scripts
++scriptsdir = ${FILEBENCHDIR}/scripts
+
+ scripts_SCRIPTS = filebench_compare filebench_summary filebench_plot fs_flush
+
+Index: filebench-1.2.4/workloads/Makefile.am
+===================================================================
+--- filebench-1.2.4.orig/workloads/Makefile.am
++++ filebench-1.2.4/workloads/Makefile.am
+@@ -6,8 +6,6 @@
+ # See the file LICENSING in this distribution for details.
+ #
+
+-filebenchdir = $(datadir)/filebench
+-
+ SUBDIRS = build
+
+ pkg: filebench
+Index: filebench-1.2.4/workloads/build/Makefile.am
+===================================================================
+--- filebench-1.2.4.orig/workloads/build/Makefile.am
++++ filebench-1.2.4/workloads/build/Makefile.am
+@@ -6,8 +6,7 @@
+ # See the file LICENSING in this distribution for details.
+ #
+
+-filebenchdir = $(prefix)/filebench
+-workloadsdir = $(filebenchdir)/workloads
++workloadsdir = ${FILEBENCHDIR}/workloads
+
+ workloads_DATA = BUILD \
+ bringover.f \
diff --git a/app-benchmarks/filebench/metadata.xml b/app-benchmarks/filebench/metadata.xml
new file mode 100644
index 00000000000..fd1acd6e5c2
--- /dev/null
+++ b/app-benchmarks/filebench/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>benchmarks</herd>
+ <upstream>
+ <remote-id type="sourceforge">filebench</remote-id>
+ </upstream>
+</pkgmetadata>