From 2ad1d1178da43f21e186618f8e745686ade84628 Mon Sep 17 00:00:00 2001 From: "Denis Cheng (raeLLL)" Date: Sun, 20 Apr 2008 01:18:45 +0000 Subject: app-benchmarks/filebench: New ebuild for bug 218223 svn path=/sunrise/; revision=6072 --- app-benchmarks/filebench/ChangeLog | 8 + app-benchmarks/filebench/Manifest | 5 + app-benchmarks/filebench/filebench-1.2.4.ebuild | 36 +++ app-benchmarks/filebench/files/linux-port.patch | 369 ++++++++++++++++++++++++ app-benchmarks/filebench/metadata.xml | 5 + 5 files changed, 423 insertions(+) create mode 100644 app-benchmarks/filebench/ChangeLog create mode 100644 app-benchmarks/filebench/Manifest create mode 100644 app-benchmarks/filebench/filebench-1.2.4.ebuild create mode 100644 app-benchmarks/filebench/files/linux-port.patch create mode 100644 app-benchmarks/filebench/metadata.xml (limited to 'app-benchmarks') diff --git a/app-benchmarks/filebench/ChangeLog b/app-benchmarks/filebench/ChangeLog new file mode 100644 index 000000000..defa97de2 --- /dev/null +++ b/app-benchmarks/filebench/ChangeLog @@ -0,0 +1,8 @@ +# ChangeLog for app-benchmarks/filebench +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 20 Apr 2008; Denis Cheng (raeLLL) + +filebench-1.2.4.ebuild, +files/linux-port.patch, +metadata.xml: + New ebuild for bug 218223 + diff --git a/app-benchmarks/filebench/Manifest b/app-benchmarks/filebench/Manifest new file mode 100644 index 000000000..c10e4b696 --- /dev/null +++ b/app-benchmarks/filebench/Manifest @@ -0,0 +1,5 @@ +AUX linux-port.patch 10777 RMD160 6f6733fcb276f358e1de34981f41fac9a96e87b2 SHA1 6b75250beaae2d7fe1a3b82fb30cf5d67c876d0b SHA256 9dbe27de791428350693b2e506585f2aab76a15a4be07e7544f8ca46e3f526ac +DIST filebench-1.2.4.tar.gz 7303885 RMD160 2e29c9caad5389f8590fff0cfe55a76b42b45dc1 SHA1 aeeb35486b9e59148082f3f3dada57900e365031 SHA256 e283917083fb15b93ce0672632fe146c079a5ed395f77eced7b28cba3b2327d8 +EBUILD filebench-1.2.4.ebuild 717 RMD160 45062f48c300a617f305ac0a2ba6359d88167e81 SHA1 e4b82be80b6bf56d6ab7ebdc97fbeb60045c325c SHA256 366f5fbf03785013ca9a546c70bf89df1de724e0f0554e52c822faa3e0b661fe +MISC ChangeLog 276 RMD160 8122a5ce0f9eab470b006cf6e4dc10aca57520be SHA1 3576e186cc6a53e6ee6959cf86b5702e92155848 SHA256 8f4fdd98dfa2b574ecc02b02e51d854e678970aee6cb3d32df9f07e6d8ef7c52 +MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/app-benchmarks/filebench/filebench-1.2.4.ebuild b/app-benchmarks/filebench/filebench-1.2.4.ebuild new file mode 100644 index 000000000..9b30489bc --- /dev/null +++ b/app-benchmarks/filebench/filebench-1.2.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +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="~x86" +IUSE="" + +DEPEND="sys-devel/flex + sys-devel/bison" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/linux-port.patch" + eautoreconf +} + +src_compile() { + econf || die "econf failed" + emake -j1 || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + + dodoc README AUTHORS docs/README.benchpoint +} diff --git a/app-benchmarks/filebench/files/linux-port.patch b/app-benchmarks/filebench/files/linux-port.patch new file mode 100644 index 000000000..c0608128d --- /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 + #include + #include +-#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 + #include ++#include ++ ++#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 ++ ++#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 + #include + +-#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 + #endif + #include +-#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 + #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 + #include + ++#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 + #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 (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 + #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 + #include + #include +-#include ++#include + +-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 000000000..7e3286984 --- /dev/null +++ b/app-benchmarks/filebench/metadata.xml @@ -0,0 +1,5 @@ + + + +maintainer-wanted + -- cgit v1.2.3-65-gdbad