Attachment #150144 for bug #218223

View | Details | Raw Unified | Return to bug 218223
Collapse All | Expand All

Lines 789-794 flowoplib_aiowait(threadflow_t *threadfl Link Here

(-)filebench-1.2.4/filebench/flowop_library.c (+1 lines)
789	for (ncompleted = 0, inprogress = 0,	789	for (ncompleted = 0, inprogress = 0,
790	aio = flowop->fo_thread->tf_aiolist;	790	aio = flowop->fo_thread->tf_aiolist;
791	ncompleted < todo, aio != NULL; aio = aio->al_next) {	791	ncompleted < todo, aio != NULL; aio = aio->al_next) {
		792	int result;
792		793
793	result = aio_error64(&aio->al_aiocb);	794	result = aio_error64(&aio->al_aiocb);
794		795




#include <math.h>
#include <libgen.h>
#include <sys/mman.h>

#include "filebench.h"
#include "fileset.h"
#include "gamma_dist.h"

/*

			/* we are re-using */
			reusing = 1;
			filebench_log(LOG_VERBOSE,
			    "Re-using %s %s.",
			    fileset_entity_name(fileset),
			    fileset_name);
		}
	}
	(void) mkdir(path, 0755);

Lines 32-37 Link Here

(-)filebench-1.2.4/filebench/filebench.h (+9 lines)
32		32
33	#include <stdio.h>	33	#include <stdio.h>
34	#include <string.h>	34	#include <string.h>
		35	#include <sys/errno.h>
		36
		37	#ifndef HAVE_BOOLEAN_T
		38	typedef enum { B_FALSE, B_TRUE } boolean_t;
		39	#endif
		40
		41	#ifndef HAVE_U_LONGLONG_T
		42	typedef unsigned long long u_longlong_t;
		43	#endif
35		44
36	#include "vars.h"	45	#include "vars.h"
37	#include "misc.h"	46	#include "misc.h"

Lines 40-48 Link Here

(-)filebench-1.2.4/filebench/eventgen.c (-1 / +2 lines)
40	*/	40	*/
41		41
42	#include <sys/time.h>	42	#include <sys/time.h>
		43
		44	#include "filebench.h"
43	#include "vars.h"	45	#include "vars.h"
44	#include "eventgen.h"	46	#include "eventgen.h"
45	#include "filebench.h"
46	#include "flowop.h"	47	#include "flowop.h"
47	#include "ipc.h"	48	#include "ipc.h"
48		49




#include <sys/stat.h>
#include <sys/wait.h>

#include "procflow.h"
#include "filebench.h"
#include "procflow.h"
#include "flowop.h"
#include "ipc.h"


		}

#else
		if (execlp(execname, procname, "-a", procname, "-i",
		    instance, "-s", shmaddr, "-m", shmpath, NULL) < 0) {
			filebench_log(LOG_ERROR,
			    "procflow exec proc failed: %s",

Lines 31-38 Link Here

(-)filebench-1.2.4/filebench/threadflow.c (-1 / +2 lines)
31	#include <sys/lwp.h>	31	#include <sys/lwp.h>
32	#endif	32	#endif
33	#include <signal.h>	33	#include <signal.h>
34	#include "threadflow.h"	34
35	#include "filebench.h"	35	#include "filebench.h"
		36	#include "threadflow.h"
36	#include "flowop.h"	37	#include "flowop.h"
37	#include "ipc.h"	38	#include "ipc.h"
38		39

Lines 34-39 Link Here

(-)filebench-1.2.4/filebench/utils.c (+2 lines)
34	#ifdef HAVE_STDINT_H	34	#ifdef HAVE_STDINT_H
35	#include <stdint.h>	35	#include <stdint.h>
36	#endif	36	#endif
		37
		38	#include "filebench.h"
37	#include "utils.h"	39	#include "utils.h"
38	#include "parsertypes.h"	40	#include "parsertypes.h"
39		41




#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);




#ifdef HAVE_LIBTECLA
#include <libtecla.h>
#endif

#include "filebench.h"
#include "parsertypes.h"
#include "utils.h"
#include "stats.h"
#include "vars.h"

	} else {
		filebench_log(LOG_INFO,
		    "load <personality> (ls "
		    FILEBENCHDIR "/workloads for list)");
	}
}


Lines 38-46 Link Here

(-)filebench-1.2.4/filebench/parser_lex.l (-1 / +2 lines)
38	#ifdef HAVE_STDINT_H	38	#ifdef HAVE_STDINT_H
39	#include <stdint.h>	39	#include <stdint.h>
40	#endif	40	#endif
		41
		42	#include "filebench.h"
41	#include "parsertypes.h"	43	#include "parsertypes.h"
42	#include "utils.h"	44	#include "utils.h"
43	#include "filebench.h"
44		45
45	#include "parser_gram.h"	46	#include "parser_gram.h"
46		47




#

bin_PROGRAMS = go_filebench
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
INCLUDES = -I../intl -DFILEBENCHDIR=\"$(datadir)/filebench\"
INCLUDES = -I../intl -DFILEBENCHDIR=\"$(prefix)/filebench\"

MV=@MV@
LEX=@LEX@
YACC=@YACC@
AM_LFLAGS = @LFLAGS@
AM_YFLAGS = @YFLAGS@
DEFS = -D_REENTRANT @DEFINES@
LIBS = @LDLIBS@
BUILD = @BUILD@

parser_lex.c: parser_lex.l parser_gram.h Makefile

Lines 73-80 case "$host_os$host_cpu" in Link Here

(-)filebench-1.2.4/configure.in (-3 / +3 lines)
73	YFLAGS="-d"	73	YFLAGS="-d"
74	AC_DEFINE(HAVE_OFF64_T, 1,	74	AC_DEFINE(HAVE_OFF64_T, 1,
75	[ Define if we can use 64 bit files ])	75	[ Define if we can use 64 bit files ])
76	FILEBENCHDIR=${prefix}/filebench	76	FILEBENCHDIR=${datadir}/filebench
77	FILEBENCHBIN=${prefix}/bin	77	FILEBENCHBIN=${bindir}
78	;;	78	;;
79	esac	79	esac
80		80
Lines 324-329 AC_SUBST(SRCDIR) Link Here
324	AC_SUBST(FILEBENCHDIR)	324	AC_SUBST(FILEBENCHDIR)
325	AC_SUBST(FILEBENCHBIN)	325	AC_SUBST(FILEBENCHBIN)
326		326
327	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])	327	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])
328		328
329	AC_OUTPUT	329	AC_OUTPUT




#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

int
main(int argc, char *argv[], char *envp[])
{
	char *shell;
	char cmd[2048];

	*cmd = '\0';
	shell=getenv("SHELL");
	argv++;
	argc--;
	while(argc-- != 0) {
		(void) strcat(cmd,*argv);
		(void) strcat(cmd," ");
		argv++;
	}

	execlp(shell, shell, "-c", cmd, (char *) 0);

	/* control should not reach here */
	return -1;
}

Lines 6-13 Link Here

(-)filebench-1.2.4/benchpoint/config/Makefile.am (-2 / +1 lines)
6	# See the file LICENSING in this distribution for details.	6	# See the file LICENSING in this distribution for details.
7	#	7	#
8		8
9	filebenchdir = $(prefix)/filebench	9	configdir = ${FILEBENCHDIR}/config
10	configdir = $(filebenchdir)/config
11		10
12	config_DATA = *.conf	11	config_DATA = *.conf
13		12

Lines 6-13 Link Here

(-)filebench-1.2.4/benchpoint/profiles/Makefile.am (-2 / +1 lines)
6	# See the file LICENSING in this distribution for details.	6	# See the file LICENSING in this distribution for details.
7	#	7	#
8		8
9	filebenchdir = $(prefix)/filebench	9	configdir = ${FILEBENCHDIR}/config
10	configdir = $(filebenchdir)/config
11		10
12	config_DATA = *.prof	11	config_DATA = *.prof
13		12

Lines 6-13 Link Here

(-)filebench-1.2.4/bin/Makefile.am (-4 / +1 lines)
6	# See the file LICENSING in this distribution for details.	6	# See the file LICENSING in this distribution for details.
7	#	7	#
8		8
9	filebenchdir = $(prefix)/filebench	9	bin_SCRIPTS = filebench
10	scriptsdir = $(filebenchdir)/bin
11
12	scripts_SCRIPTS = filebench
13		10

Lines 6-13 Link Here

(-)filebench-1.2.4/benchpoint/functions/Makefile.am (-2 / +1 lines)
6	# See the file LICENSING in this distribution for details.	6	# See the file LICENSING in this distribution for details.
7	#	7	#
8		8
9	filebenchdir = $(prefix)/filebench	9	configdir = ${FILEBENCHDIR}/config
10	configdir = $(filebenchdir)/config
11		10
12	config_SCRIPTS = *.func	11	config_SCRIPTS = *.func
13		12

Lines 6-13 Link Here

(-)filebench-1.2.4/scripts/Makefile.am (-2 / +1 lines)
6	# See the file LICENSING in this distribution for details.	6	# See the file LICENSING in this distribution for details.
7	#	7	#
8		8
9	filebenchdir = $(prefix)/filebench	9	scriptsdir = ${FILEBENCHDIR}/scripts
10	scriptsdir = $(filebenchdir)/scripts
11		10
12	scripts_SCRIPTS = filebench_compare filebench_summary filebench_plot fs_flush	11	scripts_SCRIPTS = filebench_compare filebench_summary filebench_plot fs_flush
13		12

Lines 6-13 Link Here

(-)filebench-1.2.4/workloads/Makefile.am (-2 lines)
6	# See the file LICENSING in this distribution for details.	6	# See the file LICENSING in this distribution for details.
7	#	7	#
8		8
9	filebenchdir = $(datadir)/filebench
10
11	SUBDIRS = build	9	SUBDIRS = build
12		10
13	pkg: filebench	11	pkg: filebench

Lines 6-13 Link Here

(-)filebench-1.2.4/workloads/build/Makefile.am (-2 / +1 lines)
6	# See the file LICENSING in this distribution for details.	6	# See the file LICENSING in this distribution for details.
7	#	7	#
8		8
9	filebenchdir = $(prefix)/filebench	9	workloadsdir = ${FILEBENCHDIR}/workloads
10	workloadsdir = $(filebenchdir)/workloads
11		10
12	workloads_DATA = BUILD \	11	workloads_DATA = BUILD \
13	bringover.f \	12	bringover.f \

Return to bug 218223

Lines 32-39 Link Here

(-)filebench-1.2.4/filebench/fileset.c (-3 / +4 lines)
32	#include <math.h>	32	#include <math.h>
33	#include <libgen.h>	33	#include <libgen.h>
34	#include <sys/mman.h>	34	#include <sys/mman.h>
35	#include "fileset.h"	35
36	#include "filebench.h"	36	#include "filebench.h"
		37	#include "fileset.h"
37	#include "gamma_dist.h"	38	#include "gamma_dist.h"
38		39
39	/*	40	/*
Lines 631-639 fileset_create(fileset_t *fileset) Link Here
631	/* we are re-using */	632	/* we are re-using */
632	reusing = 1;	633	reusing = 1;
633	filebench_log(LOG_VERBOSE,	634	filebench_log(LOG_VERBOSE,
634	"Re-using %s %s on %s file system.",	635	"Re-using %s %s.",
635	fileset_entity_name(fileset),	636	fileset_entity_name(fileset),
636	fileset_name, sb.st_fstype);	637	fileset_name);
637	}	638	}
638	}	639	}
639	(void) mkdir(path, 0755);	640	(void) mkdir(path, 0755);

Lines 30-37 Link Here

(-)filebench-1.2.4/filebench/procflow.c (-2 / +2 lines)
30	#include <sys/stat.h>	30	#include <sys/stat.h>
31	#include <sys/wait.h>	31	#include <sys/wait.h>
32		32
33	#include "procflow.h"
34	#include "filebench.h"	33	#include "filebench.h"
		34	#include "procflow.h"
35	#include "flowop.h"	35	#include "flowop.h"
36	#include "ipc.h"	36	#include "ipc.h"
37		37
Lines 162-168 procflow_createproc(procflow_t *procflow Link Here
162	}	162	}
163		163
164	#else	164	#else
165	if (execl(execname, procname, "-a", procname, "-i",	165	if (execlp(execname, procname, "-a", procname, "-i",
166	instance, "-s", shmaddr, "-m", shmpath, NULL) < 0) {	166	instance, "-s", shmaddr, "-m", shmpath, NULL) < 0) {
167	filebench_log(LOG_ERROR,	167	filebench_log(LOG_ERROR,
168	"procflow exec proc failed: %s",	168	"procflow exec proc failed: %s",

Lines 30-41 Link Here

(-)filebench-1.2.4/filebench/vars.c (-1 / +1 lines)
30	#include <string.h>	30	#include <string.h>
31	#include <errno.h>	31	#include <errno.h>
32		32
		33	#include "filebench.h"
33	#include "vars.h"	34	#include "vars.h"
34	#include "misc.h"	35	#include "misc.h"
35	#include "utils.h"	36	#include "utils.h"
36	#include "stats.h"	37	#include "stats.h"
37	#include "eventgen.h"	38	#include "eventgen.h"
38	#include "filebench.h"
39	#include "fb_random.h"	39	#include "fb_random.h"
40		40
41	static var_t var_find_dynamic(char name);	41	static var_t var_find_dynamic(char name);

Lines 46-53 Link Here

(-)filebench-1.2.4/filebench/parser_gram.y (-2 / +3 lines)
46	#ifdef HAVE_LIBTECLA	46	#ifdef HAVE_LIBTECLA
47	#include <libtecla.h>	47	#include <libtecla.h>
48	#endif	48	#endif
49	#include "parsertypes.h"	49
50	#include "filebench.h"	50	#include "filebench.h"
		51	#include "parsertypes.h"
51	#include "utils.h"	52	#include "utils.h"
52	#include "stats.h"	53	#include "stats.h"
53	#include "vars.h"	54	#include "vars.h"
Lines 2642-2648 parser_help(cmd_t *cmd) Link Here
2642	} else {	2643	} else {
2643	filebench_log(LOG_INFO,	2644	filebench_log(LOG_INFO,
2644	"load <personality> (ls "	2645	"load <personality> (ls "
2645	"/usr/benchmarks/filebench/workloads for list)");	2646	FILEBENCHDIR "/workloads for list)");
2646	}	2647	}
2647	}	2648	}
2648		2649

Lines 7-25 Link Here

(-)filebench-1.2.4/filebench/Makefile.am (-5 / +5 lines)
7	#	7	#
8		8
9	bin_PROGRAMS = go_filebench	9	bin_PROGRAMS = go_filebench
10	filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \	10	go_filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \
11	utils.c flowop.c flowop_library.c ipc.c \	11	utils.c flowop.c flowop_library.c ipc.c \
12	vars.c stats.c eventgen.c fileset.c fb_random.c \	12	vars.c stats.c eventgen.c fileset.c fb_random.c \
13	parser_gram.y parser_lex.l	13	parser_gram.y parser_lex.l
14	filebenchdir = $(datadir)/filebench	14	INCLUDES = -I../intl -DFILEBENCHDIR=\"$(datadir)/filebench\"
15	INCLUDES = -I../intl -DFILEBENCHDIR=\"$(prefix)/filebench\"
16		15
17	MV=@MV@	16	MV=@MV@
18	LEX=@LEX@	17	LEX=@LEX@
19	YACC=@YACC@	18	YACC=@YACC@
20	LFLAGS = @LFLAGS@	19	AM_LFLAGS = @LFLAGS@
21	YFLAGS = @YFLAGS@	20	AM_YFLAGS = @YFLAGS@
22	DEFS = -D_REENTRANT @DEFINES@	21	DEFS = -D_REENTRANT @DEFINES@
		22	LIBS = @LDLIBS@
23	BUILD = @BUILD@	23	BUILD = @BUILD@
24		24
25	parser_lex.c: parser_lex.l parser_gram.h Makefile	25	parser_lex.c: parser_lex.l parser_gram.h Makefile

Lines 1-23 Link Here

(-)filebench-1.2.4/fastsu/fastsu.c (-5 / +8 lines)
1	#include <unistd.h>	1	#include <unistd.h>
2	#include <stdio.h>	2	#include <stdio.h>
3	#include <stdlib.h>	3	#include <stdlib.h>
4	#include <strings.h>	4	#include <string.h>
5		5
6	void	6	int
7	main(int argc, char argv[], char envp[])	7	main(int argc, char argv[], char envp[])
8	{	8	{
9	char *shell;	9	char *shell;
10	char cmd[2048];	10	char cmd[2048];
11		11
12	*cmd = NULL;	12	*cmd = '\0';
13	shell=getenv("SHELL");	13	shell=getenv("SHELL");
14	*(argv++);	14	argv++;
15	argc--;	15	argc--;
16	while(argc-- != 0) {	16	while(argc-- != 0) {
17	(void) strcat(cmd,*argv);	17	(void) strcat(cmd,*argv);
18	(void) strcat(cmd," ");	18	(void) strcat(cmd," ");
19	*(argv++);	19	argv++;
20	}	20	}
21		21
22	execlp(shell, shell, "-c", cmd, (char *) 0);	22	execlp(shell, shell, "-c", cmd, (char *) 0);
		23
		24	/* control should not reach here */
		25	return -1;
23	}	26	}