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