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 8A69D431E82
\r
6 for <notmuch@notmuchmail.org>; Wed, 5 Dec 2012 19:02:13 -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 PrO1-KeYWGZR for <notmuch@notmuchmail.org>;
\r
16 Wed, 5 Dec 2012 19:02:11 -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 82A52431FAE
\r
21 for <notmuch@notmuchmail.org>; Wed, 5 Dec 2012 19:02:11 -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 1TgRiy-0002D0-UK; Wed, 05 Dec 2012 23:02:09 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TgRit-0001Yn-Ec; Wed, 05 Dec 2012 23:02:03 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v2 06/11] perf-test: add caching of xapian database
\r
34 Date: Wed, 5 Dec 2012 23:01:43 -0400
\r
35 Message-Id: <1354762908-5788-7-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
37 In-Reply-To: <1354762908-5788-1-git-send-email-david@tethera.net>
\r
38 References: <1354762908-5788-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: Thu, 06 Dec 2012 03:02:13 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 The caching and uncaching seem to be necessarily manual, as timing the
\r
58 initial notmuch new is one of our goals with this suite.
\r
60 performance-test/.gitignore | 1 +
\r
61 performance-test/Makefile.local | 2 +-
\r
62 performance-test/basic | 5 +++++
\r
63 performance-test/perf-test-lib.sh | 17 +++++++++++++++++
\r
64 4 files changed, 24 insertions(+), 1 deletion(-)
\r
66 diff --git a/performance-test/.gitignore b/performance-test/.gitignore
\r
67 index 796ed01..6421a9a 100644
\r
68 --- a/performance-test/.gitignore
\r
69 +++ b/performance-test/.gitignore
\r
74 diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
\r
75 index 63e4c3d..3834e4d 100644
\r
76 --- a/performance-test/Makefile.local
\r
77 +++ b/performance-test/Makefile.local
\r
78 @@ -29,4 +29,4 @@ $(TXZFILE):
\r
80 wget -O ${TXZFILE} ${DEFAULT_URL}
\r
82 -CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus
\r
83 +CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus $(dir)/notmuch.cache.*
\r
84 diff --git a/performance-test/basic b/performance-test/basic
\r
85 index 9d015ee..41a7ff1 100755
\r
86 --- a/performance-test/basic
\r
87 +++ b/performance-test/basic
\r
90 . ./perf-test-lib.sh
\r
98 time_run 'initial notmuch new' 'notmuch new'
\r
102 time_run 'second notmuch new' 'notmuch new'
\r
103 time_run 'dump *' 'notmuch dump > tags.out'
\r
104 time_run 'restore *' 'notmuch restore < tags.out'
\r
105 diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
\r
106 index 0c10718..0f9796d 100644
\r
107 --- a/performance-test/perf-test-lib.sh
\r
108 +++ b/performance-test/perf-test-lib.sh
\r
109 @@ -35,6 +35,8 @@ then
\r
113 +DB_CACHE_DIR=${TEST_DIRECTORY}/notmuch.cache.$corpus_size
\r
115 add_email_corpus ()
\r
118 @@ -80,8 +82,23 @@ add_email_corpus ()
\r
121 cp -lr $MAIL_CORPUS $MAIL_DIR
\r
123 + if [ -d $DB_CACHE_DIR ]; then
\r
124 + cp -r $DB_CACHE_DIR ${MAIL_DIR}/.notmuch
\r
128 +cache_database () {
\r
129 + if [ -d $MAIL_DIR/.notmuch ]; then
\r
130 + cp -r $MAIL_DIR/.notmuch $DB_CACHE_DIR
\r
132 + echo "Warning: No database found to cache"
\r
136 +uncache_database () {
\r
137 + rm -rf $DB_CACHE_DIR
\r
141 printf "[v%4s %6s] Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn/Out(512B)\n" \
\r