diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rwxr-xr-x | scripts/graph.sh | 6 | ||||
| -rw-r--r-- | scripts/modules/00_main.sh | 2 | ||||
| -rw-r--r-- | scripts/modules/82_wipe.sh | 2 | ||||
| -rw-r--r-- | scripts/modules/lib.sh | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
6 files changed, 15 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 1d7b4cd..aee343f 100644 --- a/configure.ac +++ b/configure.ac @@ -73,14 +73,10 @@ AC_FUNC_MALLOC AC_CHECK_FUNCS([clock_gettime floor memset mkdir strerror]) AC_CONFIG_FILES([Makefile - src/Makefile - src/arch.m32/Makefile - src/arch.m64/Makefile]) + src/Makefile]) #################################################### # customization suffix -m4_include([src/arch.m32/subconfigure.ac]) -m4_include([src/arch.m64/subconfigure.ac]) AM_PROG_CC_C_O diff --git a/scripts/graph.sh b/scripts/graph.sh index b4c348a..b843a1a 100755 --- a/scripts/graph.sh +++ b/scripts/graph.sh @@ -366,7 +366,7 @@ for mode in reads writes r_push w_push all; do cat $inp.nosort.rqsize |\ cut -d ';' -f 4 |\ tee $side.rqsize.stat |\ - $bin_dir/bins.exe >\ + $bin_dir/bins >\ $out.g40.$outp.rqsize.bins & mkfifo $inp.nosort.rqpos mkfifo $side.rqpos_tmp @@ -445,12 +445,12 @@ for mode in reads writes r_push w_push all; do mkfifo $inp.nosort.dyn.6 cat $inp.nosort.dyn.6 |\ cut -d ';' -f 7 |\ - $bin_dir/bins.exe >\ + $bin_dir/bins >\ $out.g06.$outp.latency.bins & mkfifo $inp.nosort.dyn.7 cat $inp.nosort.dyn.7 |\ cut -d ';' -f 6 |\ - $bin_dir/bins.exe >\ + $bin_dir/bins >\ $out.g07.$outp.delay.bins & mkfifo $inp.nosort.dyn.8 mkfifo $side.latency.flying.stat diff --git a/scripts/modules/00_main.sh b/scripts/modules/00_main.sh index 4c11107..c5b51c8 100644 --- a/scripts/modules/00_main.sh +++ b/scripts/modules/00_main.sh @@ -225,7 +225,7 @@ function main_finish # In modules, the lists must be _extended_ only (prepend / append) prepare_list="main_prepare" -setup_list="main_setup" +setup_list="" run_list="main_run" cleanup_list="main_cleanup" finish_list="main_finish" diff --git a/scripts/modules/82_wipe.sh b/scripts/modules/82_wipe.sh index 7a14900..57e6dc6 100644 --- a/scripts/modules/82_wipe.sh +++ b/scripts/modules/82_wipe.sh @@ -24,7 +24,7 @@ function wipe_setup (( !enable_wipe )) && return 0 echo "$FUNCNAME filling all devices with random data" for i in $(eval echo {0..$replay_max}); do - cmd="time ./random_data.exe > ${replay_device[$i]}" + cmd="time $bin_dir/random_data > ${replay_device[$i]}" echo "host $host: running command '$cmd'" remote "${replay_host[$i]}" "$cmd" & done diff --git a/scripts/modules/lib.sh b/scripts/modules/lib.sh index 2540be5..dcd4b6a 100644 --- a/scripts/modules/lib.sh +++ b/scripts/modules/lib.sh @@ -25,12 +25,12 @@ fi # $sript_dir is assumed to be already set by the caller base_dir="$(cd "$script_dir/.."; pwd)" -bin_dir="$base_dir/src" +bin_dir="$base_dir" module_dir="$script_dir/modules" download_dir="$base_dir/downloads" -mkdir -p "$download_dir" || exit -1 +# mkdir -p "$download_dir" || exit -1 -[ -x $bin_dir/bins.exe ] || \ +[ -x $bin_dir/bins ] || \ (cd $base_dir && ./configure && make) ||\ { echo "Could not make binaries. Sorry." ; exit -1; } diff --git a/src/Makefile.am b/src/Makefile.am index 0d10924..19b1842 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,12 @@ -bin_PROGRAMS = bins.exe random_data.exe blkreplay.exe +bin_PROGRAMS = bins random_data blkreplay -bins_exe_SOURCES = bins.c +bins_SOURCES = bins.c -random_data_exe_SOURCES = random_data.c +random_data_SOURCES = random_data.c -blkreplay_exe_SOURCES = blkreplay.c +blkreplay_SOURCES = blkreplay.c # errors in these subdirectories are (mostly) ignored. # try to build as much architectures as possible, but don't insist. -AM_MAKEFLAGS = -i -SUBDIRS = arch.m32 arch.m64 +# AM_MAKEFLAGS = -i +# SUBDIRS = arch.m32 arch.m64 |