From: Gennady Kupava <gkupava@xxxxxxxxxxxxx>
Signed-off-by: Gennady Kupava <gkupava@xxxxxxxxxxxxx>
---
One of the tasks siggested in scope of 'Git sprint weekend'.
Couple of chioces made here:
1. Use constant instead of NULL to indicate default trace level, this just
makes everything simpler.
2. Move just enough from implementation to header, to be able to do check
before calling actual functions.
3. Most controversail: do not support optimization for older compilers not
supporting variadic templates in macroses. Problem is that theoretically
someone may write some complicated trace while would work in 'modern' compiler and be too slow in more 'classic' compilers, however expectation is that risk of that is quite low and 'classic' compilers will go away eventually.
Passes test suite locally on Linux/amd64.
trace.c | 29 ++++++----------------------
trace.h | 68 +++++++++++++++++++++++++++++++++++++++++++++++------------------
2 files changed, 55 insertions(+), 42 deletions(-)
diff --git a/trace.c b/trace.c
index 7508aea02..180ee3b00 100644
--- a/trace.c
+++ b/trace.c
@@ -25,26 +25,14 @@
#include "cache.h"
#include "quote.h"
-/*
- * "Normalize" a key argument by converting NULL to our trace_default,
- * and otherwise passing through the value. All caller-facing functions
- * should normalize their inputs in this way, though most get it
- * for free by calling get_trace_fd() (directly or indirectly).
- */
-static void normalize_trace_key(struct trace_key **key)
-{
- static struct trace_key trace_default = { "GIT_TRACE" };
- if (!*key)
- *key = &trace_default;
-}
+struct trace_key trace_default_key = { TRACE_KEY_PREFIX, 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)
{
const char *trace;
- normalize_trace_key(&key);
-
/* don't open twice */
if (key->initialized)
return key->fd;
@@ -82,8 +70,6 @@ static int get_trace_fd(struct trace_key *key)
void trace_disable(struct trace_key *key)
{
- normalize_trace_key(&key);
-
if (key->need_close)
close(key->fd);
key->fd = 0;
@@ -129,7 +115,6 @@ static int prepare_trace_line(const char *file, int line,
static void trace_write(struct trace_key *key, const void *buf, unsigned len)
{
if (write_in_full(get_trace_fd(key), buf, len) < 0) {
- normalize_trace_key(&key);
warning("unable to write trace for %s: %s",
key->key, strerror(errno));
trace_disable(key);
@@ -168,13 +153,13 @@ static void trace_argv_vprintf_fl(const char *file, int line,
{
struct strbuf buf = STRBUF_INIT;
- if (!prepare_trace_line(file, line, NULL, &buf))
+ if (!prepare_trace_line(file, line, &trace_default_key, &buf))
return;
strbuf_vaddf(&buf, format, ap);
sq_quote_argv(&buf, argv, 0);
- print_trace_line(NULL, &buf);
+ print_trace_line(&trace_default_key, &buf);
}
void trace_strbuf_fl(const char *file, int line, struct trace_key *key,
@@ -189,8 +174,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)
@@ -216,7 +199,7 @@ void trace_printf(const char *format, ...)
{
va_list ap;
va_start(ap, format);
- trace_vprintf_fl(NULL, 0, NULL, format, ap);
+ trace_vprintf_fl(NULL, 0, &trace_default_key, format, ap);
va_end(ap);
}
@@ -341,7 +324,7 @@ void trace_repo_setup(const char *prefix)
int trace_want(struct trace_key *key)
{
- return !!get_trace_fd(key);
+ return !!get_trace_fd(key);
}
#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_MONOTONIC)
diff --git a/trace.h b/trace.h
index 179b249c5..64326573a 100644
--- a/trace.h
+++ b/trace.h
@@ -4,6 +4,8 @@
#include "git-compat-util.h"
#include "strbuf.h"
+#define TRACE_KEY_PREFIX "GIT_TRACE"
+
struct trace_key {
const char * const key;
int fd;
@@ -11,7 +13,10 @@ struct trace_key {
unsigned int need_close : 1;
};
-#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 }
+#define TRACE_KEY_INIT(name) { TRACE_KEY_PREFIX "_" #name, 0, 0, 0 }
+
+extern struct trace_key trace_default_key;
+extern struct trace_key trace_perf_key;
extern void trace_repo_setup(const char *prefix);
extern int trace_want(struct trace_key *key);
@@ -77,24 +82,49 @@ 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__, NULL, __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_pass(key) ((key)->fd || !(key)->initialized)
+
+#define trace_printf(...) \
+ do { \
+ if (trace_pass(&trace_default_key)) \
+ trace_printf_key_fl(TRACE_CONTEXT, __LINE__, \
+ &trace_default_key,__VA_ARGS__);\
+ } while(0)
+
+#define trace_printf_key(key, ...) \
+ do { \
+ if (trace_pass(key)) \
+ trace_printf_key_fl(TRACE_CONTEXT, __LINE__, key, \
+ __VA_ARGS__); \
+ } while(0)
+
+#define trace_argv_printf(argv, ...) \
+ do { \
+ if (trace_pass(&trace_default_key)) \
+ trace_argv_printf_fl(TRACE_CONTEXT, __LINE__, \
+ argv, __VA_ARGS__); \
+ } while(0)
+
+#define trace_strbuf(key, data) \
+ do { \
+ if (trace_pass(key)) \
+ trace_strbuf_fl(TRACE_CONTEXT, __LINE__, key, data);\
+ } while(0)
+
+#define trace_performance(nanos, ...) \
+ do { \
+ if (trace_pass(key)) \
+ trace_performance_fl(TRACE_CONTEXT, __LINE__, nanos,\
+ __VA_ARGS__); \
+ } while(0)
+
+#define trace_performance_since(start, ...) \
+ do { \
+ if (trace_pass(&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)))
--
2.14.1
