Fixes on alias evaluation (#210)

Author: dkarnikis

evaluation/benchmarks/aliases/select/1.tomp3.sh evaluation/benchmarks/aliases/1.tomp3.sh

@@ -3,8 +3,8 @@
 # tag: wav-to-mp3
 set -e
 
-IN=${WAV:-$PASH_TOP/evaluation/benchmarks/aliases/meta/wav}
-OUT=${OUT:-PASH_TOP/evaluation/benchmarks/aliases/meta/out}
+IN=${WAV:-$PASH_TOP/evaluation/benchmarks/aliases/input/wav}
+OUT=${OUT:-$PASH_TOP/evaluation/benchmarks/aliases/input/out}
 
 find $IN -name '*.wav' | 
     xargs -n1 basename |

evaluation/benchmarks/aliases/2.unrtf.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+#tag: rtf-to-txt
+set -e
+IN=${RTF:-$PASH_TOP/evaluation/benchmarks/aliases/input/rtf}
+OUT=${OUT:-PASH_TOP/evaluation/benchmarks/aliases/input/out}
+find $IN -name '*.rtf' | xargs -I {} unrtf {} --text > /dev/null

evaluation/benchmarks/aliases/select/3.resiz.sh evaluation/benchmarks/aliases/3.resiz.sh

@@ -4,8 +4,8 @@
 set -e
 
 
-IN=${JPG:-$PASH_TOP/evaluation/benchmarks/aliases/meta/jpg}
-OUT=${OUT:-PASH_TOP/evaluation/benchmarks/aliases/meta/out}
+IN=${JPG:-$PASH_TOP/evaluation/benchmarks/aliases/input/jpg}
+OUT=${OUT:-PASH_TOP/evaluation/benchmarks/aliases/input/out}
 
 find $IN -name "*.jpg" | 
   xargs -n1 basename |

evaluation/benchmarks/aliases/select/4.gitkernel.sh evaluation/benchmarks/aliases/4.gitkernel.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # First command is almost always a generator
 set -e
-IN=${GIT:-$PASH_TOP/evaluation/benchmarks/aliases/meta/linux}
+IN=${GIT:-$PASH_TOP/evaluation/benchmarks/aliases/input/linux}
 
 #FIXME define a complex expression
 COMPLEX=""

evaluation/benchmarks/aliases/select/5.apachelog.sh evaluation/benchmarks/aliases/5.apachelog.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 # fetch hit count for each ip ?
 set -e
-IN=${IN:-$PASH_TOP/evaluation/benchmarks/aliases/meta/}
+IN=${IN:-$PASH_TOP/evaluation/benchmarks/aliases/input/}
 
 # 405 original
 # cat ${IN}/apache.log | grep  "\->" | grep -o "from [^ ]*" | cut -d ' ' -f2 | sort | uniq -c | sort -nr | less
 # FIXME need apache error logs ..
-cat ${IN}/apache.log  | grep -o "from [^ ]*" | cut -d ' ' -f2 | sort | uniq -c | sort -nr
+cat ${IN}apache.log  | grep -o "from [^ ]*" | cut -d ' ' -f2 | sort | uniq -c | sort -nr

evaluation/benchmarks/aliases/select/6.msg.sh evaluation/benchmarks/aliases/6.msg.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # First command is almost always a generator
 set -e
-OUT=${OUT:-$PASH_TOP/evaluation/benchmarks/aliases/meta/out}
+OUT=${OUT:-$PASH_TOP/evaluation/benchmarks/aliases/input/out}
 
 
 # grep -iv ': starting\|kernel: .*: Power Button\|watching system buttons\|Stopped Cleaning Up\|Started Crash recovery kernel' /var/log/messages /var/log/syslog /var/log/* 2> /dev/null | grep -iw 'recover[a-z]*\|power[a-z]*\|shut[a-z ]*down\|rsyslogd\|ups' > /tmp/__shutdown.log && echo 'File written to /tmp__shutdown.log'

evaluation/benchmarks/aliases/select/7.nginx.sh evaluation/benchmarks/aliases/7.nginx.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # fetch hit count for each ip ?
 set -e
-IN=${IN:-${PASH_TOP}/evaluation/benchmarks/aliases/meta}
+IN=${IN:-${PASH_TOP}/evaluation/benchmarks/aliases/input}
 # original command  tail -10000 /var/log/nginx/access.log | cut -d "" "" -f1 | sort | uniq -c | sort -n | tail -n 30 | sort -nrk 1 | awk
 cat ${IN}/access.log | cut -d ' ' -f1 | sort | uniq -c | sort -n | tail -n 30 | sort -nrk 1  

evaluation/benchmarks/aliases/select/8.varlog.sh evaluation/benchmarks/aliases/8.varlog.sh

@@ -1,6 +1,6 @@
 # install dependencies
 pkgs='ffmpeg unrtf imagemagick'
 if ! dpkg -s $pkgs >/dev/null 2>&1; then
-  sudo apt-get install $pkgs
+  sudo apt-get install $pkgs -y
 fi
 

evaluation/benchmarks/aliases/meta/install-deps.sh evaluation/benchmarks/aliases/input/install-deps.sh

@@ -4,8 +4,8 @@
 set -e
 
 
-IN=$PASH_TOP/evaluation/benchmarks/aliases/meta/
-OUT=$PASH_TOP/evaluation/benchmarks/aliases/meta/out
+IN=$PASH_TOP/evaluation/benchmarks/aliases/input/
+OUT=$PASH_TOP/evaluation/benchmarks/aliases/input/out
 if [[ "$1" == "-c" ]]; then
     rm -rf ${IN}/jpg
     rm -rf ${IN}/rtf

evaluation/benchmarks/aliases/meta/setup.sh evaluation/benchmarks/aliases/input/setup.sh

@@ -252,34 +252,59 @@ poets(){
 
 
 aliases(){
-  cd aliases/
-  if [ -e ./seq.res ]; then
-    echo "skipping $(basename $(pwd))/seq.res"
+  seq_times_file="seq.res"
+  outputs_suffix="seq.out"
+  outputs_dir="outputs"
+  if [ -e "aliases/${seq_times_file}" ]; then
+    echo "skipping aliases/${seq_times_file}"
     return 0
   fi
 
-  cd meta/
+  cd aliases/
+
+  cd input/
   ./setup.sh
+  ./install-deps.sh
   cd ..
-  echo '' > seq.res
-  echo executing aliases $(date) | tee -a ./seq.res
-  cd select
-  export WAV=$PASH_TOP/evaluation/benchmarks/aliases/meta/wav
-  export JPG=$PASH_TOP/evaluation/benchmarks/aliases/meta/jpg
-  export RTF=$PASH_TOP/evaluation/benchmarks/aliases/meta/rtf
-  export GIT=$PASH_TOP/evaluation/benchmarks/aliases/meta/linux
-  export IN=$PASH_TOP/evaluation/benchmarks/aliases/meta/
-  export OUT=$PASH_TOP/evaluation/benchmarks/aliases/meta/out
-  echo tomp3: $({ time ./1.tomp3.sh > /dev/null; } 2>&1) | tee -a ../seq.res
-  echo unrtf: $({ time ./2.unrtf.sh > /dev/null; } 2>&1) | tee -a ../seq.res
-  echo convertjpg: $({ time ./3.resiz.sh > /dev/null; } 2>&1) | tee -a ../seq.res
-  #echo gitkernel: $({ time ./4.gitkernel.sh > /dev/null; } 2>&1) | tee -a ../seq.res  FIXME need complex grep command
-  echo apachelog: $({ time ./5.apachelog.sh > /dev/null; } 2>&1) | tee -a ../seq.res
-  echo msg: $({ time ./6.msg.sh > /dev/null; } 2>&1) | tee -a ../seq.res 
-  echo nginx: $({ time ./7.nginx.sh > /dev/null; } 2>&1) | tee -a ../seq.res
-  echo varlog: $({ time ./8.varlog.sh > /dev/null; } 2>&1) | tee -a ../seq.res
-}
 
+  mkdir -p "$outputs_dir"
+
+  names_scripts=(
+    #"tomp3;1.tomp3"
+    #"unrtf;2.unrtf"
+    #"convertjpg;3.resiz"
+    # "gitkernel;4.gitkernel" # needs complex grep command
+    "apachelog;5.apachelog"
+    "msg;6.msg"
+    "nginx;7.nginx"
+    "varlog;8.varlog"
+  )
+
+  touch "$seq_times_file"
+  echo executing aliases $(date) | tee -a "$seq_times_file"
+  echo '' >> "$seq_times_file"
+
+  export WAV=$PASH_TOP/evaluation/benchmarks/aliases/input/wav
+  export JPG=$PASH_TOP/evaluation/benchmarks/aliases/input/jpg
+  export RTF=$PASH_TOP/evaluation/benchmarks/aliases/input/rtf
+  export GIT=$PASH_TOP/evaluation/benchmarks/aliases/input/linux
+  export IN=$PASH_TOP/evaluation/benchmarks/aliases/input/
+  export OUT=$PASH_TOP/evaluation/benchmarks/aliases/input/out
+  for name_script in ${names_scripts[@]}
+  do
+    IFS=";" read -r -a name_script_parsed <<< "${name_script}"
+    name="${name_script_parsed[0]}"
+    script="${name_script_parsed[1]}"
+    printf -v pad %30s
+    padded_script="${name}.sh:${pad}"
+    padded_script=${padded_script:0:30}
+
+    outputs_file="${outputs_dir}/${script}.${outputs_suffix}"
+
+    echo "${padded_script}" $({ time ./${script}.sh > "$outputs_file"; } 2>&1) | tee -a "$seq_times_file"
+  done
+  cd ..
+}
 
 bio() {
   cd bio
@@ -369,8 +394,8 @@ posh() {
 
 
 
-posh
+#posh
 #poets
-#aliases
-dgsh
-
+aliases
+#dgsh
+#