[PATCH 1/4] perf-test: add corpus size to output, compact I/O stats

diff --git a/cd/9b4162def878bb6f3901576d2b78e02cf576eb b/cd/9b4162def878bb6f3901576d2b78e02cf576eb
new file mode 100644 (file)
index 0000000..eedda47
--- /dev/null
+++ b/cd/9b4162def878bb6f3901576d2b78e02cf576eb
@@ -0,0 +1,91 @@
+Return-Path: <bremner@tethera.net>\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 CD17B431FB6\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 20:19:01 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 9rdh+UOBI-z0 for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Dec 2012 20:18:57 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AC569431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 20:18:57 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.167.90.129] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TfjyA-0008DZ-0T; Tue, 04 Dec 2012 00:18:54 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Tfjy4-0001MH-9V; Tue, 04 Dec 2012 00:18:48 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4] perf-test: add corpus size to output, compact I/O stats\r
+Date: Tue,  4 Dec 2012 00:18:29 -0400\r
+Message-Id: <1354594712-5179-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354583824-10520-3-git-send-email-david@tethera.net>\r
+References: <1354583824-10520-3-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\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: Tue, 04 Dec 2012 04:19:01 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+Austin suggested a while ago that the corpus size be printed in the\r
+header. In the end it seems the corpus will be fixed per test script,\r
+so this suggestion indeed makes sense.\r
+\r
+The tabbing was wrapping on my usual 80 column terminal, so I joined\r
+the input and output columns together.\r
+---\r
+ performance-test/perf-test-lib.sh |    6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh\r
+index c9b131a..08e2ebd 100644\r
+--- a/performance-test/perf-test-lib.sh\r
++++ b/performance-test/perf-test-lib.sh\r
+@@ -92,14 +92,14 @@ uncache_database () {\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
++    printf "[v%4s %6s]        Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn/Out(512B)\n" \\r
++         ${PERFTEST_VERSION} ${corpus_size}\r
+ }\r
+ \r
+ time_run () {\r
+     printf "%-22s" "$1"\r
+     if test "$verbose" != "t"; then exec 4>test.output 3>&4; fi\r
+-    if ! eval >&3 "/usr/bin/time -f '%e\t%U\t%S\t%M\t%I\t%O' $2" ; then\r
++    if ! eval >&3 "/usr/bin/time -f '%e\t%U\t%S\t%M\t%I/%O' $2" ; then\r
+       test_failure=$(($test_failure + 1))\r
+     fi\r
+ }\r
+-- \r
+1.7.10.4\r
+\r