1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From: Andrej Shadura <andrewsh@debian.org>
Subject: Fix paths in the scripts as we install them under /usr/lib
--- 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"
--- 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
--- 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; }
|
