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=\"$(datadir)/filebench\" 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 \