From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Alex Vandiver <alexmv@dropbox.com>,
git@vger.kernel.org, Ben Peart <peartben@gmail.com>
Subject: Re: [PATCH 4/4] fsmonitor: Delay updating state until after split index is merged
Date: Fri, 20 Oct 2017 23:35:34 -0400 [thread overview]
Message-ID: <20171021033534.pgjtyiwlhvheuueo@sigill.intra.peff.net> (raw)
In-Reply-To: <alpine.DEB.2.21.1.1710201503380.40514@virtualbox>
On Fri, Oct 20, 2017 at 03:16:20PM +0200, Johannes Schindelin wrote:
> > void tweak_fsmonitor(struct index_state *istate)
> > {
> > + int i;
> > +
> > + if (istate->fsmonitor_dirty) {
> > + /* Mark all entries valid */
> > + trace_printf_key(&trace_fsmonitor, "fsmonitor is enabled; cache is %d", istate->cache_nr);
>
> Sadly, a call to trace_printf_key() is not really a noop when tracing is
> disabled. The call to trace_printf_key() hands off to trace_vprintf_fl(),
> which in turn calls prepare_trace_line() which asks trace_want() whether
> we need to trace, which finally calls get_trace_fd(). This last function
> initializes a trace key if needed, and this entire call stack takes time.
It seems like we could pretty easily turn noop traces into a trivial
conditional, like:
diff --git a/trace.h b/trace.h
index 179b249c59..c46b92cbde 100644
--- a/trace.h
+++ b/trace.h
@@ -80,8 +80,11 @@ extern void trace_performance_since(uint64_t start, const char *format, ...);
#define trace_printf(...) \
trace_printf_key_fl(TRACE_CONTEXT, __LINE__, NULL, __VA_ARGS__)
-#define trace_printf_key(key, ...) \
- trace_printf_key_fl(TRACE_CONTEXT, __LINE__, key, __VA_ARGS__)
+#define trace_printf_key(key, ...) do { \
+ if (!key->initialized || key->fd) \
+ trace_printf_key_fl(TRACE_CONTEXT, __LINE__, key, __VA_ARGS__) \
+} while(0)
+
#define trace_argv_printf(argv, ...) \
trace_argv_printf_fl(TRACE_CONTEXT, __LINE__, argv, __VA_ARGS__)
(OK, that's got an OR, but if we are really pinching instructions we
could obviously store a single "I've been initialized and am disabled"
flag).
I don't have an opinion one way or the other on these particular
messages, but in general I'd like to see _more_ tracing in Git, not
less. I've often traced Git with a debugger or other tools like perf,
but there's real value in the author of code annotating high-level
logical events.
-Peff
next prev parent reply other threads:[~2017-10-21 3:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-20 1:11 [PATCH 0/4] fsmonitor fixes Alex Vandiver
2017-10-20 1:11 ` [PATCH 1/4] fsmonitor: Watch, and ask about, the top of the repo, not the CWD Alex Vandiver
2017-10-20 1:11 ` [PATCH 2/4] fsmonitor: Don't bother pretty-printing JSON from watchman Alex Vandiver
2017-10-20 13:00 ` Johannes Schindelin
2017-10-20 13:17 ` Ben Peart
2017-10-26 0:44 ` Alex Vandiver
2017-10-27 15:13 ` Johannes Schindelin
2017-10-20 1:11 ` [PATCH 3/4] fsmonitor: Document GIT_TRACE_FSMONITOR Alex Vandiver
2017-10-20 13:19 ` Ben Peart
2017-10-20 1:11 ` [PATCH 4/4] fsmonitor: Delay updating state until after split index is merged Alex Vandiver
2017-10-20 13:16 ` Johannes Schindelin
2017-10-20 21:47 ` Ben Peart
2017-10-21 2:06 ` Junio C Hamano
2017-10-21 3:35 ` Jeff King [this message]
2017-10-23 9:57 ` Johannes Schindelin
2017-10-23 12:36 ` Ben Peart
2017-10-26 1:20 ` Alex Vandiver
2017-10-20 12:58 ` [PATCH 1/4] fsmonitor: Watch, and ask about, the top of the repo, not the CWD Johannes Schindelin
2017-10-26 0:20 ` Alex Vandiver
2017-10-27 15:11 ` Johannes Schindelin
2017-10-20 13:17 ` [PATCH 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=20171021033534.pgjtyiwlhvheuueo@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=alexmv@dropbox.com \
--cc=git@vger.kernel.org \
--cc=peartben@gmail.com \
/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).