kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

trace.c: export trace_setup_key 

This is so that we can print traces based on this key outside trace.c.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2018-03-30 14:34:59 -04:00 committed by Junio C Hamano
parent 48988c4d0c
commit cb50761959
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
trace.c
View File

@ -26,6 +26,7 @@


struct trace_key trace_default_key = { "GIT_TRACE", 0, 0, 0 }; struct trace_key trace_default_key = { "GIT_TRACE", 0, 0, 0 };
struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE); struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE);
struct trace_key trace_setup_key = TRACE_KEY_INIT(SETUP);


/* Get a trace file descriptor from "key" env variable. */ /* Get a trace file descriptor from "key" env variable. */
static int get_trace_fd(struct trace_key *key) static int get_trace_fd(struct trace_key *key)
@ -300,11 +301,10 @@ static const char *quote_crnl(const char *path)
/* FIXME: move prefix to startup_info struct and get rid of this arg */ /* FIXME: move prefix to startup_info struct and get rid of this arg */
void trace_repo_setup(const char *prefix) void trace_repo_setup(const char *prefix)
{ {
static struct trace_key key = TRACE_KEY_INIT(SETUP);
const char *git_work_tree; const char *git_work_tree;
char *cwd; char *cwd;


if (!trace_want(&key)) if (!trace_want(&trace_setup_key))
return; return;


cwd = xgetcwd(); cwd = xgetcwd();
@ -315,11 +315,11 @@ void trace_repo_setup(const char *prefix)
if (!prefix) if (!prefix)
prefix = "(null)"; prefix = "(null)";


trace_printf_key(&key, "setup: git_dir: %s\n", quote_crnl(get_git_dir())); trace_printf_key(&trace_setup_key, "setup: git_dir: %s\n", quote_crnl(get_git_dir()));
trace_printf_key(&key, "setup: git_common_dir: %s\n", quote_crnl(get_git_common_dir())); trace_printf_key(&trace_setup_key, "setup: git_common_dir: %s\n", quote_crnl(get_git_common_dir()));
trace_printf_key(&key, "setup: worktree: %s\n", quote_crnl(git_work_tree)); trace_printf_key(&trace_setup_key, "setup: worktree: %s\n", quote_crnl(git_work_tree));
trace_printf_key(&key, "setup: cwd: %s\n", quote_crnl(cwd)); trace_printf_key(&trace_setup_key, "setup: cwd: %s\n", quote_crnl(cwd));
trace_printf_key(&key, "setup: prefix: %s\n", quote_crnl(prefix)); trace_printf_key(&trace_setup_key, "setup: prefix: %s\n", quote_crnl(prefix));


free(cwd); free(cwd);
} }

1
trace.h
View File

@ -15,6 +15,7 @@ extern struct trace_key trace_default_key;


#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 } #define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 }
extern struct trace_key trace_perf_key; extern struct trace_key trace_perf_key;
extern struct trace_key trace_setup_key;


extern void trace_repo_setup(const char *prefix); extern void trace_repo_setup(const char *prefix);
extern int trace_want(struct trace_key *key); extern int trace_want(struct trace_key *key);