aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-22 10:59:18 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-22 10:59:19 -0700
commit9f2de9c121c60cba9e55db5263a7bceffcd8fe2d (patch)
treeda422744914ae63ec7da372e6558c897e1792a04 /cache.h
parent9ab08822556c49a7856dadd0e9a42f9ec2aaf850 (diff)
parentc7d3f8cb48d754371343c5a48cf392135bb4d77b (diff)
downloadgit-9f2de9c121c60cba9e55db5263a7bceffcd8fe2d.tar.gz
git-9f2de9c121c60cba9e55db5263a7bceffcd8fe2d.tar.xz
Merge branch 'kb/perf-trace'
* kb/perf-trace: api-trace.txt: add trace API documentation progress: simplify performance measurement by using getnanotime() wt-status: simplify performance measurement by using getnanotime() git: add performance tracing for git's main() function to debug scripts trace: add trace_performance facility to debug performance issues trace: add high resolution timer function to debug performance issues trace: add 'file:line' to all trace output trace: move code around, in preparation to file:line output trace: add current timestamp to all trace output trace: disable additional trace output for unit tests trace: add infrastructure to augment trace output with additional info sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace API Documentation/git.txt: improve documentation of 'GIT_TRACE*' variables trace: improve trace performance trace: remove redundant printf format attribute trace: consistently name the format parameter trace: move trace declarations from cache.h to new trace.h
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/cache.h b/cache.h
index 6e9a0a6d0..8ae30d5a8 100644
--- a/cache.h
+++ b/cache.h
@@ -7,6 +7,7 @@
#include "advice.h"
#include "gettext.h"
#include "convert.h"
+#include "trace.h"
#include SHA1_HEADER
#ifndef git_SHA_CTX
@@ -1402,17 +1403,7 @@ extern void *alloc_tag_node(void);
extern void *alloc_object_node(void);
extern void alloc_report(void);
-/* trace.c */
-__attribute__((format (printf, 1, 2)))
-extern void trace_printf(const char *format, ...);
-__attribute__((format (printf, 2, 3)))
-extern void trace_argv_printf(const char **argv, const char *format, ...);
-extern void trace_repo_setup(const char *prefix);
-extern int trace_want(const char *key);
-__attribute__((format (printf, 2, 3)))
-extern void trace_printf_key(const char *key, const char *fmt, ...);
-extern void trace_strbuf(const char *key, const struct strbuf *buf);
-
+/* pkt-line.c */
void packet_trace_identity(const char *prog);
/* add */