--- /dev/null
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 87E91431FB6\r
+ for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 20:56:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 3Jclia8FikoE for <notmuch@notmuchmail.org>;\r
+ Tue, 4 Dec 2012 20:56:01 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+ [18.9.25.13])\r
+ by olra.theworths.org (Postfix) with ESMTP id E89E0431FAE\r
+ for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 20:56:00 -0800 (PST)\r
+X-AuditID: 1209190d-b7f266d00000092b-b6-50bed3e077ea\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id DF.28.02347.0E3DEB05; Tue, 4 Dec 2012 23:56:00 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qB54txAA015022; \r
+ Tue, 4 Dec 2012 23:55:59 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB54tuMV019436\r
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+ Tue, 4 Dec 2012 23:55:58 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Tg71Y-0004ff-GU; Tue, 04 Dec 2012 23:55:56 -0500\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/3] perf-test: cache unpacked corpus\r
+In-Reply-To: <1354583824-10520-2-git-send-email-david@tethera.net>\r
+References: <1354583824-10520-1-git-send-email-david@tethera.net>\r
+ <1354583824-10520-2-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+100~gcb9b0b0 (http://notmuchmail.org) Emacs/23.4.1\r
+ (i486-pc-linux-gnu)\r
+Date: Tue, 04 Dec 2012 23:55:56 -0500\r
+Message-ID: <87vcchcd2b.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IR4hRV1n1weV+AwdlPEhYbl/1ktrjR2s1o\r
+ cf3mTGYHZo9fbXOZPZ6tusXsseXQe+YA5igum5TUnMyy1CJ9uwSujM2zV7MU3JGo2Hh5L1sD\r
+ 4wrhLkZODgkBE4mrL9+zQ9hiEhfurWfrYuTiEBLYxyhxY08LI4SznlFiytKz7BDOBSaJ29ve\r
+ MkM4SxgldsxcwAjSzyagL7Fi7STWLkYODhEBPYmFW2VAwswCahKT1pwBWyEsYCkxc8V/JhCb\r
+ U8BJ4tKkL2CtQgLlEjNm/mUEaRUViJe4vFQBJMwioCpx9uFOsHJeoEv/99yDsgUlTs58wgIx\r
+ Xkvixr+XTBMYBWchSc1CklrAyLSKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI10gvN7NELzWldBMj\r
+ OHgleXcwvjuodIhRgINRiYdX0nhfgBBrYllxZe4hRkkOJiVR3rYjQCG+pPyUyozE4oz4otKc\r
+ 1OJDjBIczEoivP/sgHK8KYmVValF+TApaQ4WJXHeKyk3/YUE0hNLUrNTUwtSi2CyMhwcShK8\r
+ psAoFRIsSk1PrUjLzClBSDNxcIIM5wEa7ghSw1tckJhbnJkOkT/FqMvR+6/rCaMQS15+XqqU\r
+ OK8cSJEASFFGaR7cHFjSecUoDvSWMK8GSBUPMGHBTXoFtIQJaMkLod0gS0oSEVJSDYwcs/0d\r
+ r5xcW3szZt+k+HW9y1wXaLoKFWW/6q/+WFkQyu38dPvHXHvrK59fTAyev56XgSHKr+mpK7Pa\r
+ X+9ulYa+Xx+2TK67fmiHqO/C8OU/JsirXls77QS31j6lLLuZ7ImPZ+uuspM9vl0hyk6j7v+T\r
+ bJPAlT9PmX1bvyTjcnR/PBf3yv0PlOKVWIozEg21mIuKEwGuaL+IFQMAAA==\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 05 Dec 2012 04:56:05 -0000\r
+\r
+On Mon, 03 Dec 2012, david@tethera.net wrote:\r
+> From: David Bremner <bremner@debian.org>\r
+>\r
+> Unpacking is not really the expensive step (compared to the initial\r
+> notmuch new), but this is a pre-requisite to caching the database.\r
+> ---\r
+> performance-test/.gitignore | 1 +\r
+> performance-test/Makefile.local | 2 +-\r
+> performance-test/perf-test-lib.sh | 51 +++++++++++++++++++++----------------\r
+> 3 files changed, 31 insertions(+), 23 deletions(-)\r
+>\r
+> diff --git a/performance-test/.gitignore b/performance-test/.gitignore\r
+> index 53f2697..7e20f7c 100644\r
+> --- a/performance-test/.gitignore\r
+> +++ b/performance-test/.gitignore\r
+> @@ -1 +1,2 @@\r
+> tmp.*/\r
+> +corpus.mail.*/\r
+> diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local\r
+> index 5d2acbd..eb713d0 100644\r
+> --- a/performance-test/Makefile.local\r
+> +++ b/performance-test/Makefile.local\r
+> @@ -29,4 +29,4 @@ $(TXZFILE):\r
+> download-corpus:\r
+> wget -O ${TXZFILE} ${DEFAULT_URL}\r
+> \r
+> -CLEAN := $(CLEAN) $(dir)/tmp.*\r
+> +CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/corpus.mail.*\r
+> diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh\r
+> index bba793d..9fbf874 100644\r
+> --- a/performance-test/perf-test-lib.sh\r
+> +++ b/performance-test/perf-test-lib.sh\r
+> @@ -35,37 +35,44 @@ then\r
+> exit 1\r
+> fi\r
+> \r
+> +CORPUS_DIR=${TEST_DIRECTORY}/corpus.mail.$corpus_size\r
+> add_email_corpus ()\r
+> {\r
+> rm -rf ${MAIL_DIR}\r
+> + if [ ! -d $CORPUS_DIR ]; then\r
+> + case "$corpus_size" in\r
+> + small)\r
+> + arg="mail/enron/bailey-s"\r
+> + ;;\r
+> + medium)\r
+> + arg="mail/notmuch-archive"\r
+> + ;;\r
+> + *)\r
+> + arg=mail\r
+> + esac\r
+> \r
+> - case "$1" in\r
+> - --small)\r
+> - arg="mail/enron/bailey-s"\r
+> - ;;\r
+> - --medium)\r
+> - arg="mail/notmuch-archive"\r
+> - ;;\r
+\r
+The README still refers to these arguments, so it should be updated,\r
+too.\r
+\r
+> - *)\r
+> - arg=mail\r
+> - esac\r
+> + if command -v pixz > /dev/null; then\r
+> + XZ=pixz\r
+> + else\r
+> + XZ=xz\r
+> + fi\r
+> \r
+> - if command -v pixz > /dev/null; then\r
+> - XZ=pixz\r
+> - else\r
+> - XZ=xz\r
+> - fi\r
+> + printf "Unpacking corpus\n"\r
+> + mkdir $CORPUS_DIR\r
+> +\r
+> + tar --checkpoint=.5000 --extract --strip-components=2 \\r
+> + --directory $CORPUS_DIR \\r
+> + --use-compress-program ${XZ} \\r
+> + --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
+> + notmuch-email-corpus/"$arg"\r
+> \r
+> - printf "Unpacking corpus\n"\r
+> - tar --checkpoint=.5000 --extract --strip-components=1 \\r
+> - --directory ${TMP_DIRECTORY} \\r
+> - --use-compress-program ${XZ} \\r
+> - --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
+> - notmuch-email-corpus/"$arg"\r
+> + printf "\n"\r
+> \r
+> - printf "\n"\r
+> + fi\r
+> + cp -lr $CORPUS_DIR $MAIL_DIR\r
+> }\r
+> \r
+> +\r
+> print_header () {\r
+> printf "[v%4s] Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn(512B)\tOut(512B)\n" \\r
+> ${PERFTEST_VERSION}\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff