From: gennady.kupava@gmail.com
To: git <git@vger.kernel.org>
Cc: Gennady Kupava <gkupava@bloomberg.net>
Subject: [PATCH 2/2] Reduce performance cost of the trace if trace category is disabled
Date: Sun, 19 Nov 2017 00:42:47 +0000 [thread overview]
Message-ID: <20171119004247.22792-2-gennady.kupava@gmail.com> (raw)
In-Reply-To: <20171119004247.22792-1-gennady.kupava@gmail.com>
From: Gennady Kupava <gkupava@bloomberg.net>
- Do the check if the trace key is enabled sooner in call chain.
- Move just enough code from trace.c into trace.h header so all code
necessary to determine that trace is disabled could be inlined to
calling functions.
Signed-off-by: Gennady Kupava <gkupava@bloomberg.net>
---
trace.c | 3 +--
trace.h | 58 ++++++++++++++++++++++++++++++++++++++++------------------
2 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/trace.c b/trace.c
index d47ea28e8..b7530b51a 100644
--- a/trace.c
+++ b/trace.c
@@ -25,6 +25,7 @@
#include "quote.h"
struct trace_key trace_default_key = { "GIT_TRACE", 0, 0, 0 };
+struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE);
/* Get a trace file descriptor from "key" env variable. */
static int get_trace_fd(struct trace_key *key)
@@ -172,8 +173,6 @@ void trace_strbuf_fl(const char *file, int line, struct trace_key *key,
print_trace_line(key, &buf);
}
-static struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE);
-
static void trace_performance_vprintf_fl(const char *file, int line,
uint64_t nanos, const char *format,
va_list ap)
diff --git a/trace.h b/trace.h
index 24b32f8f4..cd9e280ba 100644
--- a/trace.h
+++ b/trace.h
@@ -14,6 +14,7 @@ struct trace_key {
extern struct trace_key trace_default_key;
#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 }
+extern struct trace_key trace_perf_key;
extern void trace_repo_setup(const char *prefix);
extern int trace_want(struct trace_key *key);
@@ -79,24 +80,42 @@ extern void trace_performance_since(uint64_t start, const char *format, ...);
* comma, but this is non-standard.
*/
-#define trace_printf(...) \
- trace_printf_key_fl(TRACE_CONTEXT, __LINE__, &trace_default_key, __VA_ARGS__)
-
-#define trace_printf_key(key, ...) \
- trace_printf_key_fl(TRACE_CONTEXT, __LINE__, key, __VA_ARGS__)
-
-#define trace_argv_printf(argv, ...) \
- trace_argv_printf_fl(TRACE_CONTEXT, __LINE__, argv, __VA_ARGS__)
-
-#define trace_strbuf(key, data) \
- trace_strbuf_fl(TRACE_CONTEXT, __LINE__, key, data)
-
-#define trace_performance(nanos, ...) \
- trace_performance_fl(TRACE_CONTEXT, __LINE__, nanos, __VA_ARGS__)
-
-#define trace_performance_since(start, ...) \
- trace_performance_fl(TRACE_CONTEXT, __LINE__, getnanotime() - (start), \
- __VA_ARGS__)
+#define trace_printf_key(key, ...) \
+ do { \
+ if (trace_pass_fl(key)) \
+ trace_printf_key_fl(TRACE_CONTEXT, __LINE__, key, \
+ __VA_ARGS__); \
+ } while(0)
+
+#define trace_printf(...) trace_printf_key(&trace_default_key, __VA_ARGS__);
+
+#define trace_argv_printf(argv, ...) \
+ do { \
+ if (trace_pass_fl(&trace_default_key)) \
+ trace_argv_printf_fl(TRACE_CONTEXT, __LINE__, \
+ argv, __VA_ARGS__); \
+ } while(0)
+
+#define trace_strbuf(key, data) \
+ do { \
+ if (trace_pass_fl(key)) \
+ trace_strbuf_fl(TRACE_CONTEXT, __LINE__, key, data);\
+ } while(0)
+
+#define trace_performance(nanos, ...) \
+ do { \
+ if (trace_pass_fl(key)) \
+ trace_performance_fl(TRACE_CONTEXT, __LINE__, nanos,\
+ __VA_ARGS__); \
+ } while(0)
+
+#define trace_performance_since(start, ...) \
+ do { \
+ if (trace_pass_fl(&trace_perf_key)) \
+ trace_performance_fl(TRACE_CONTEXT, __LINE__, \
+ getnanotime() - (start), \
+ __VA_ARGS__); \
+ } while(0)
/* backend functions, use non-*fl macros instead */
__attribute__((format (printf, 4, 5)))
@@ -110,6 +129,9 @@ extern void trace_strbuf_fl(const char *file, int line, struct trace_key *key,
__attribute__((format (printf, 4, 5)))
extern void trace_performance_fl(const char *file, int line,
uint64_t nanos, const char *fmt, ...);
+inline int trace_pass_fl(struct trace_key *key) {
+ return key->fd || !key->initialized;
+}
#endif /* HAVE_VARIADIC_MACROS */
--
2.14.1
next prev parent reply other threads:[~2017-11-19 0:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-11 19:28 [PATCH] Reduce performance penalty for turned off traces gennady.kupava
2017-11-12 14:17 ` Jeff King
2017-11-12 23:24 ` Gennady Kupava
2017-11-17 22:12 ` Jeff King
2017-11-15 19:14 ` Stefan Beller
2017-11-17 22:16 ` Jeff King
2017-11-19 0:42 ` [PATCH 1/2] Simplify tracing code by removing trace key normalization concept gennady.kupava
2017-11-19 0:42 ` gennady.kupava [this message]
2017-11-19 8:27 ` [PATCH 2/2] Reduce performance cost of the trace if trace category is disabled Johannes Sixt
2017-11-19 13:18 ` Gennady Kupava
2017-11-19 2:19 ` [PATCH 1/2] Simplify tracing code by removing trace key normalization concept Junio C Hamano
2017-11-19 13:16 ` Gennady Kupava
2017-11-20 0:24 ` Junio C Hamano
2017-11-20 4:59 ` Junio C Hamano
2017-11-26 20:11 ` [PATCH 1/2] trace: remove trace key normalization gennady.kupava
2017-11-26 20:11 ` [PATCH 2/2] trace: improve performance while category is disabled gennady.kupava
2017-11-27 1:21 ` Junio C Hamano
2017-11-27 1:32 ` Junio C Hamano
2017-11-27 3:25 ` Junio C Hamano
2017-11-27 10:12 ` Gennady Kupava
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=20171119004247.22792-2-gennady.kupava@gmail.com \
--to=gennady.kupava@gmail.com \
--cc=git@vger.kernel.org \
--cc=gkupava@bloomberg.net \
/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).