Re: [PATCH 1/3] test: add functions to count how much times notmuch was called

diff --git a/25/8c85424978bffc9f1271621bc3bdd3d0e3ee38 b/25/8c85424978bffc9f1271621bc3bdd3d0e3ee38
new file mode 100644 (file)
index 0000000..b003750
--- /dev/null
+++ b/25/8c85424978bffc9f1271621bc3bdd3d0e3ee38
@@ -0,0 +1,175 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\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 9A732429E21\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Nov 2011 13:27:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 AVNz-szc1JT5 for <notmuch@notmuchmail.org>;\r
+       Mon, 28 Nov 2011 13:27:05 -0800 (PST)\r
+Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AB29B431FB6\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Nov 2011 13:27:04 -0800 (PST)\r
+Received: by bkaq10 with SMTP id q10so9895992bka.26\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Nov 2011 13:27:03 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type;\r
+       bh=2yaUzdeNCA540rFFVgy0gE9WE1AjXXJRbSCoEDjx8Rc=;\r
+       b=o+2vGCcqej1lI7Yi5UXS/oV+BC8wVxzmoDv/1x401rifJ5hD8QzEbcFzzDtRjEkbs+\r
+       gpAWM20XZCunZ3zz4jnbXnKGGyfnSRR0i1p4YDMlVzNWI602kg5P1yEHrbB7TtMLWTYU\r
+       iU2sLihJBB2xBPwGzXE4GyRF1J+T8kBpo47no=\r
+Received: by 10.204.141.2 with SMTP id k2mr44756041bku.81.1322515623220;\r
+       Mon, 28 Nov 2011 13:27:03 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id c4sm32384414bkk.13.2011.11.28.13.27.02\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 28 Nov 2011 13:27:02 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/3] test: add functions to count how much times notmuch\r
+       was called\r
+In-Reply-To: <yf6aa7gj7w5.fsf@taco2.nixu.fi>\r
+References: <1322271878-32614-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <1322450895-32523-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <1322450895-32523-2-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <yf6aa7gj7w5.fsf@taco2.nixu.fi>\r
+User-Agent: Notmuch/0.10+44~g067c44f (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 29 Nov 2011 01:26:39 +0400\r
+Message-ID: <87hb1ovsz4.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Mon, 28 Nov 2011 21:27:05 -0000\r
+\r
+Hi Tomi.\r
+\r
+On Mon, 28 Nov 2011 22:42:50 +0200, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> On Mon, 28 Nov 2011 07:28:13 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote:\r
+> \r
+> [...]\r
+> > +\r
+> > +    These allow to count how many times notmuch binary is called.\r
+> > +    notmuch_counter_reset() function generates a script that counts\r
+> > +    how many times it is called and resets the counter to zero.  The\r
+> > +    function sets $notmuch_counter_command variable to the path to the\r
+> > +    generated script that should be called instead of notmuch to do\r
+> > +    the counting.  The notmuch_counter_value() function prints the\r
+> > +    current counter value.\r
+> > diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+> > index 076f929..880bed9 100644\r
+> > --- a/test/test-lib.sh\r
+> > +++ b/test/test-lib.sh\r
+> > @@ -868,6 +868,38 @@ test_emacs () {\r
+> >    emacsclient --socket-name="$EMACS_SERVER" --eval "(progn $@)"\r
+> >  }\r
+> >  \r
+> > +# Creates a script that counts how much time it is executed and calls\r
+> > +# notmuch.  $notmuch_counter_command is set to the path to the\r
+> > +# generated script.  Use notmuch_counter_value() function to get the\r
+> > +# current counter value.\r
+> > +notmuch_counter_reset () {\r
+> > +  notmuch_counter_command="$TMP_DIRECTORY/notmuch_counter"\r
+> > +  if [ ! -x "$notmuch_counter_command" ]; then\r
+> > +          notmuch_counter_state_path="$TMP_DIRECTORY/notmuch_counter.state"\r
+> > +          cat >"$notmuch_counter_command" <<EOF || return\r
+> > +#!/bin/sh\r
+> > +\r
+> > +count=\$(cat "$notmuch_counter_state_path")\r
+> > +echo -n \$(expr \$count + 1) > "$notmuch_counter_state_path"\r
+> > +\r
+> > +exec notmuch "\$@"\r
+> > +EOF\r
+> > +          chmod +x "$notmuch_counter_command" || return\r
+> > +  fi\r
+> > +\r
+> > +  echo -n 0 > "$notmuch_counter_state_path"\r
+> > +}\r
+> > +\r
+> > +# Returns the current notmuch counter value.\r
+> > +notmuch_counter_value () {\r
+> > +  if [ -r "$notmuch_counter_state_path" ]; then\r
+> > +          count=$(cat "$notmuch_counter_state_path")\r
+> > +  else\r
+> > +          count=0\r
+> > +  fi\r
+> > +  echo -n $count\r
+> > +}\r
+> > +\r
+> \r
+> Good work! It would be nice if the state file contained newline after\r
+> count number.\r
+\r
+I wonder why it is actually nice :)  I do not have strong preference\r
+here.  So a newline is added in v3.  Also a newline is added to\r
+notmuch_counter_value() output for consistency.\r
+\r
+> Also some optimizations could be done:\r
+> \r
+\r
+(Would be nice if you send a diff, or a human-friendly description of\r
+the changes.)\r
+\r
+>              cat >"$notmuch_counter_command" <<EOF || return\r
+> #!/bin/sh\r
+> \r
+> read count < "$notmuch_counter_state_path"\r
+\r
+Nice.  Fixed in the new patch version.\r
+\r
+> echo \$((count + 1)) > "$notmuch_counter_state_path"\r
+> \r
+\r
+I do not think this is really an optimization.  And I find expr more\r
+clear than using $(()).  I always have troubles remembering "random\r
+special char syntax" (yeah, not a Perl fan :)), prefer human friendly\r
+words.\r
+\r
+> exec notmuch "\$@"\r
+> EOF\r
+>              chmod +x "$notmuch_counter_command" || return\r
+>      fi\r
+> \r
+>      echo 0 > "$notmuch_counter_state_path"\r
+> }\r
+> \r
+> # Returns the current notmuch counter value.\r
+> notmuch_counter_value () {\r
+>      if [ -r "$notmuch_counter_state_path" ]; then\r
+>              read count < "$notmuch_counter_state_path"\r
+\r
+Also changes in v3.\r
+\r
+Regards,\r
+  Dmitry\r
+\r
+>      else\r
+>              count=0\r
+>      fi\r
+>      echo -n $count\r
+> }\r
+> \r
+> \r
+> Tomi\r