1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id B2412431FD6
\r
6 for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 17:17:40 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id j70a4mTR2m02 for <notmuch@notmuchmail.org>;
\r
16 Mon, 3 Dec 2012 17:17:36 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id D10A2431FBC
\r
21 for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 17:17:35 -0800 (PST)
\r
22 Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.167.90.129] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1Tfh8g-00081S-OF; Mon, 03 Dec 2012 21:17:34 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1Tfh8b-0002ka-9g; Mon, 03 Dec 2012 21:17:29 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 2/3] perf-test: cache unpacked corpus
\r
34 Date: Mon, 3 Dec 2012 21:17:03 -0400
\r
35 Message-Id: <1354583824-10520-2-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
37 In-Reply-To: <1354583824-10520-1-git-send-email-david@tethera.net>
\r
38 References: <1354583824-10520-1-git-send-email-david@tethera.net>
\r
40 Cc: David Bremner <bremner@debian.org>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Tue, 04 Dec 2012 01:17:41 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 Unpacking is not really the expensive step (compared to the initial
\r
58 notmuch new), but this is a pre-requisite to caching the database.
\r
60 performance-test/.gitignore | 1 +
\r
61 performance-test/Makefile.local | 2 +-
\r
62 performance-test/perf-test-lib.sh | 51 +++++++++++++++++++++----------------
\r
63 3 files changed, 31 insertions(+), 23 deletions(-)
\r
65 diff --git a/performance-test/.gitignore b/performance-test/.gitignore
\r
66 index 53f2697..7e20f7c 100644
\r
67 --- a/performance-test/.gitignore
\r
68 +++ b/performance-test/.gitignore
\r
72 diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
\r
73 index 5d2acbd..eb713d0 100644
\r
74 --- a/performance-test/Makefile.local
\r
75 +++ b/performance-test/Makefile.local
\r
76 @@ -29,4 +29,4 @@ $(TXZFILE):
\r
78 wget -O ${TXZFILE} ${DEFAULT_URL}
\r
80 -CLEAN := $(CLEAN) $(dir)/tmp.*
\r
81 +CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus.mail.*
\r
82 diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
\r
83 index bba793d..9fbf874 100644
\r
84 --- a/performance-test/perf-test-lib.sh
\r
85 +++ b/performance-test/perf-test-lib.sh
\r
86 @@ -35,37 +35,44 @@ then
\r
90 +CORPUS_DIR=${TEST_DIRECTORY}/corpus.mail.$corpus_size
\r
94 + if [ ! -d $CORPUS_DIR ]; then
\r
95 + case "$corpus_size" in
\r
97 + arg="mail/enron/bailey-s"
\r
100 + arg="mail/notmuch-archive"
\r
108 - arg="mail/enron/bailey-s"
\r
111 - arg="mail/notmuch-archive"
\r
116 + if command -v pixz > /dev/null; then
\r
122 - if command -v pixz > /dev/null; then
\r
127 + printf "Unpacking corpus\n"
\r
128 + mkdir $CORPUS_DIR
\r
130 + tar --checkpoint=.5000 --extract --strip-components=2 \
\r
131 + --directory $CORPUS_DIR \
\r
132 + --use-compress-program ${XZ} \
\r
133 + --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \
\r
134 + notmuch-email-corpus/"$arg"
\r
136 - printf "Unpacking corpus\n"
\r
137 - tar --checkpoint=.5000 --extract --strip-components=1 \
\r
138 - --directory ${TMP_DIRECTORY} \
\r
139 - --use-compress-program ${XZ} \
\r
140 - --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \
\r
141 - notmuch-email-corpus/"$arg"
\r
146 + cp -lr $CORPUS_DIR $MAIL_DIR
\r
151 printf "[v%4s] Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn(512B)\tOut(512B)\n" \
\r
152 ${PERFTEST_VERSION}
\r