From: Ben Peart <peartben@gmail.com>
To: Alex Vandiver <alexmv@dropbox.com>, git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2 2/4] fsmonitor: Don't bother pretty-printing JSON from watchman
Date: Thu, 26 Oct 2017 16:05:13 -0400 [thread overview]
Message-ID: <9bd24b15-6232-1afd-abbe-02870c51c7ad@gmail.com> (raw)
In-Reply-To: <42fd8bccb78992a2894e711e057230a673891628.1508981451.git.alexmv@dropbox.com>
On 10/25/2017 9:31 PM, Alex Vandiver wrote:
> This provides modest performance savings. Benchmarking with the
> following program, with and without `--no-pretty`, we find savings of
> 23% (0.316s -> 0.242s) in the git repository, and savings of 8% (5.24s
> -> 4.86s) on a large repository with 580k files in the working copy.
>
Given this patch series is all about speed, it's good to see *any* wins
- especially those that don't impact functionality at all. The
performance win of --no-pretty is greater than I expected.
> #!/usr/bin/perl
>
> use strict;
> use warnings;
> use IPC::Open2;
>
> my $pid = open2(\*CHLD_OUT, \*CHLD_IN, "watchman -j @ARGV")
> or die "open2() failed: $!\n" .
> "Falling back to scanning...\n";
>
> my $query = qq|["query", "$ENV{PWD}", {}]|;
>
> print CHLD_IN $query;
> close CHLD_IN;
> my $response = do {local $/; <CHLD_OUT>};
>
> my $json_pkg;
> eval {
> require JSON::XSomething;
> $json_pkg = "JSON::XSomething";
> 1;
> } or do {
> require JSON::PP;
> $json_pkg = "JSON::PP";
> };
>
> my $o = $json_pkg->new->utf8->decode($response);
>
> Signed-off-by: Alex Vandiver <alexmv@dropbox.com>
> ---
> t/t7519/fsmonitor-watchman | 2 +-
> templates/hooks--fsmonitor-watchman.sample | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman
> index a3e30bf54..79f24325c 100755
> --- a/t/t7519/fsmonitor-watchman
> +++ b/t/t7519/fsmonitor-watchman
> @@ -50,7 +50,7 @@ launch_watchman();
>
> sub launch_watchman {
>
> - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j')
> + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
Since this is a test script performance isn't critical. This version of
the integration script logs the response to a file in
.git/watchman-response.json and is much more human readable without the
"--no-pretty." As such, I'd leave this one pretty.
> or die "open2() failed: $!\n" .
> "Falling back to scanning...\n";
>
> diff --git a/templates/hooks--fsmonitor-watchman.sample b/templates/hooks--fsmonitor-watchman.sample
> index 9eba8a740..9a082f278 100755
> --- a/templates/hooks--fsmonitor-watchman.sample
> +++ b/templates/hooks--fsmonitor-watchman.sample
> @@ -49,7 +49,7 @@ launch_watchman();
>
> sub launch_watchman {
>
> - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j')
> + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
No human will see this response so the faster --no-pretty option makes
sense.
> or die "open2() failed: $!\n" .
> "Falling back to scanning...\n";
>
>
next prev parent reply other threads:[~2017-10-26 20:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 1:31 [PATCH v2 0/4] fsmonitor fixes Alex Vandiver
2017-10-26 1:31 ` [PATCH v2 1/4] fsmonitor: Set the PWD to the top of the working tree Alex Vandiver
2017-10-26 1:31 ` [PATCH v2 2/4] fsmonitor: Don't bother pretty-printing JSON from watchman Alex Vandiver
2017-10-26 20:05 ` Ben Peart [this message]
2017-10-26 20:32 ` Ben Peart
2017-10-26 21:29 ` Alex Vandiver
2017-10-27 3:36 ` Ben Peart
2017-10-26 1:31 ` [PATCH v2 3/4] fsmonitor: Document GIT_TRACE_FSMONITOR Alex Vandiver
2017-10-26 1:31 ` [PATCH v2 4/4] fsmonitor: Delay updating state until after split index is merged Alex Vandiver
2017-10-26 20:29 ` Ben Peart
2017-10-26 1:33 ` [PATCH v2 1/4] fsmonitor: Set the PWD to the top of the working tree Alex Vandiver
2017-10-26 19:56 ` Ben Peart
2017-10-26 21:27 ` Alex Vandiver
2017-10-27 3:40 ` Ben Peart
2017-10-27 23:20 ` Alex Vandiver
2017-10-29 12:27 ` Johannes Schindelin
2017-10-29 12:31 ` [PATCH v2 0/4] fsmonitor fixes Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9bd24b15-6232-1afd-abbe-02870c51c7ad@gmail.com \
--to=peartben@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alexmv@dropbox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).