diff options
author | David Bremner <bremner@debian.org> | 2012-12-16 08:33:17 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-12-25 08:49:24 -0400 |
commit | 098ef4af4d0a52a6b4daed5324a7c77f6c9108da (patch) | |
tree | 64bda0a95d08df65c86f2448d6d988e53bb9e3d6 /performance-test/perf-test-lib.sh | |
parent | 047cd7a595f760a23415b9e38d7136325f28b114 (diff) |
perf-test: initial version of memory test infrastructure.
The idea is run some code under valgrind --leak-check=full and report
a summary, leaving the user to peruse the log file if they want.
We go to some lengths to preserve the log files from accidental
overwriting; the full corpus takes about 3 hours to run under valgrind
on my machine.
The naming of the log directories may be slightly controversial; in
the unlikely event of two runs in less than a second, the log will be
overwritten. A previous version with mktemp+timestamp was dismissed as
overkill; just mktemp alone does not sort nicely.
One new test is included, to check notmuch new for memory leaks.
Diffstat (limited to 'performance-test/perf-test-lib.sh')
-rw-r--r-- | performance-test/perf-test-lib.sh | 75 |
1 files changed, 58 insertions, 17 deletions
diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh index 3a7ef2b3..10d05e07 100644 --- a/performance-test/perf-test-lib.sh +++ b/performance-test/perf-test-lib.sh @@ -89,24 +89,59 @@ add_email_corpus () cp -lr $TAG_CORPUS $TMP_DIRECTORY/corpus.tags cp -lr $MAIL_CORPUS $MAIL_DIR - } -time_start () { - - add_email_corpus - - print_header - +notmuch_new_with_cache () +{ if [ -d $DB_CACHE_DIR ]; then cp -r $DB_CACHE_DIR ${MAIL_DIR}/.notmuch else - time_run 'Initial notmuch new' "notmuch new" + "$1" 'Initial notmuch new' "notmuch new" cache_database fi } -cache_database () { +time_start () +{ + add_email_corpus + + print_header + + notmuch_new_with_cache time_run +} + +memory_start () +{ + add_email_corpus + + local timestamp=$(date +%Y%m%dT%H%M%S) + log_dir="${TEST_DIRECTORY}/log.$(basename $0)-$corpus_size-${timestamp}" + mkdir -p ${log_dir} + + notmuch_new_with_cache memory_run +} + +memory_run () +{ + test_count=$(($test_count+1)) + + log_file=$log_dir/$test_count.log + + printf "[ %d ]\t%s\n" $test_count "$1" + + valgrind --leak-check=full --log-file="$log_file" $2 + + awk '/LEAK SUMMARY/,/suppressed/ { sub(/^==[0-9]*==/," "); print }' "$log_file" + echo +} + +memory_done () +{ + time_done +} + +cache_database () +{ if [ -d $MAIL_DIR/.notmuch ]; then cp -r $MAIL_DIR/.notmuch $DB_CACHE_DIR else @@ -114,17 +149,20 @@ cache_database () { fi } -uncache_database () { +uncache_database () +{ rm -rf $DB_CACHE_DIR } -print_header () { - printf "[v%4s %6s] Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn/Out(512B)\n" \ - ${PERFTEST_VERSION} ${corpus_size} +print_header () +{ + printf "\t\t\tWall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn/Out(512B)\n" } -time_run () { +time_run () +{ printf " %-22s" "$1" + test_count=$(($test_count+1)) if test "$verbose" != "t"; then exec 4>test.output 3>&4; fi if ! eval >&3 "/usr/bin/time -f '%e\t%U\t%S\t%M\t%I/%O' $2" ; then test_failure=$(($test_failure + 1)) @@ -133,7 +171,8 @@ time_run () { return 0 } -time_done () { +time_done () +{ if [ "$test_failure" = "0" ]; then rm -rf "$remove_tmp" exit 0 @@ -144,6 +183,8 @@ time_done () { cd -P "$test" || error "Cannot setup test environment" test_failure=0 +test_count=0 -echo -echo $(basename "$0"): "Testing ${test_description:-notmuch performance}" +printf "\n%-55s [%s %s]\n" \ + "$(basename "$0"): Testing ${test_description:-notmuch performance}" \ + "${PERFTEST_VERSION}" "${corpus_size}" |