This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton-private Repository". The branch, master has been updated via ae59435a6f4aaf4f56a87cfa91b7fe96c4eb951f (commit) from 80382e6f15e1c19a20de782d336b952bd101f70d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ae59435a6f4aaf4f56a87cfa91b7fe96c4eb951f Author: Kevin Harms <[email protected]> Date: Sat Feb 25 22:30:25 2012 -0600 Update graph creation so that rotated text works in png images. This may only work on ubuntu. Also make thread names match in time and latency graphs ----------------------------------------------------------------------- Summary of changes: papers/2011/aesop/fig/Makefile | 2 +- papers/2011/aesop/fig/gendata.sh | 29 ++++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) Diff of changes: diff --git a/papers/2011/aesop/fig/Makefile b/papers/2011/aesop/fig/Makefile index dea2ee3..dbb0f76 100644 --- a/papers/2011/aesop/fig/Makefile +++ b/papers/2011/aesop/fig/Makefile @@ -28,7 +28,7 @@ clean:: inkscape -d $(DPI) -e $@ $< %.png: %.gnuplot %.data - @echo 'set terminal "png" transparent large; set output "$@"' | gnuplot - $< + @echo 'set terminal "png" transparent large font "/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf, 12"; set output "$@"' | gnuplot - $< %.pdf: %.gnuplot %.data diff --git a/papers/2011/aesop/fig/gendata.sh b/papers/2011/aesop/fig/gendata.sh index c89c375..7a175e7 100755 --- a/papers/2011/aesop/fig/gendata.sh +++ b/papers/2011/aesop/fig/gendata.sh @@ -67,12 +67,21 @@ then for type in aesop thread thread-nb thread-per-op thread-pool event; do j=0; - #for nodes in 16 32 64; for nodes in 64; do procs=$((nodes*16)) - #echo -n "$type-$procs " >> ${test}.data; - echo -n "$type " >> ${test}.data; + + if [ $type = "thread" ]; + then + prettytype="thread-per-client" + elif [ $type = "thread-nb" ]; + then + prettytype="thread-per-client-nb" + else + prettytype=$type + fi + + echo -n "$prettytype " >> ${test}.data; val=$(cat ${basepath}/${base}/${type}/client-${type//-/}-${base}-${nodes}-* 2>/dev/null | grep "max=" | perl -ne 'if (/min=(\S+) max=(\S+) median=(\S+) first=(\S+) third=(\S+) mean=(\S+) stddev=(\S+)/) { $min=$1; $max=$2; $median=$3; $first=$4; $third=$5; $mean=$6; $stddv=$7; $iter[$i] = { min => $min, max => $max, med => $median, fst => $first, trd => $third }; $i += 1;} BEGIN { $i = 0; @iter = (); } END { my @srt = sort { $b->{max} <=> $a->{max} } @iter; print "$srt[2]->{fst} $srt[2]->{min} $srt[2]->{max} $srt[2]->{trd}\n"; }' ) if [ -z "${val}" ]; then @@ -95,8 +104,18 @@ then for nodes in 64; do procs=$((nodes*16)) - #echo -n "$type-$procs " >> ${test}.data; - echo -n "$type " >> ${test}.data; + + if [ $type = "thread" ]; + then + prettytype="thread-per-client" + elif [ $type = "thread-nb" ]; + then + prettytype="thread-per-client-nb" + else + prettytype=$type + fi + + echo -n "$prettytype " >> ${test}.data; val=$(cat ${basepath}/${base}/${type}/client-${type//-/}-${base}-${nodes}-* 2>/dev/null | perl -ne 'if (/min:(\S+) max:(\S+)/) { $min=$1; $max=$2; $iter[$i] = { min => $min, max => $max }; $i += 1;} BEGIN { $i = 0; @iter = (); } END { my @srt = sort { $b->{max} <=> $a->{max} } @iter; print "$srt[2]->{min} $srt[2]->{max}\n"; }') if [ -z "${val}" ]; then val="-"; hooks/post-receive -- Triton-private Repository