From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 1/9] trace.c: add GIT_TRACE_PACK_STATS for pack usage statistics
Date: Mon, 28 Jul 2014 19:03:07 +0700 [thread overview]
Message-ID: <1406548995-28549-2-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1406548995-28549-1-git-send-email-pclouds@gmail.com>
trace_stats() is intended for GIT_TRACE_*_STATS variable group and
GIT_TRACE_PACK_STATS is more like an example how new vars can be added.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/git.txt | 3 +++
cache.h | 2 ++
git.c | 1 +
sha1_file.c | 24 ++++++++++++++++++++++++
trace.c | 13 +++++++++++++
trace.h | 1 +
6 files changed, 44 insertions(+)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index a0f1ede..a124612 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -946,6 +946,9 @@ Unsetting the variable, or setting it to empty, "0" or
time of each Git command.
See 'GIT_TRACE' for available trace output options.
+'GIT_TRACE_PACK_STATS'::
+ Print various statistics.
+
'GIT_TRACE_SETUP'::
Enables trace messages printing the .git, working tree and current
working directory after Git has completed its setup phase.
diff --git a/cache.h b/cache.h
index fcb511d..1c84227 100644
--- a/cache.h
+++ b/cache.h
@@ -1502,4 +1502,6 @@ void stat_validity_update(struct stat_validity *sv, int fd);
int versioncmp(const char *s1, const char *s2);
+void report_pack_stats(struct trace_key *key);
+
#endif /* CACHE_H */
diff --git a/git.c b/git.c
index 9c49519..6a6a8a8 100644
--- a/git.c
+++ b/git.c
@@ -614,6 +614,7 @@ int main(int argc, char **av)
git_setup_gettext();
trace_command_performance(argv);
+ trace_stats();
/*
* "git-xxxx" is the same as "git xxxx", but we obviously:
diff --git a/sha1_file.c b/sha1_file.c
index 3f70b1d..21a487b 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -467,6 +467,7 @@ static unsigned int peak_pack_open_windows;
static unsigned int pack_open_windows;
static unsigned int pack_open_fds;
static unsigned int pack_max_fds;
+static unsigned int pack_access_nr;
static size_t peak_pack_mapped;
static size_t pack_mapped;
struct packed_git *packed_git;
@@ -492,6 +493,28 @@ void pack_report(void)
sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped));
}
+void report_pack_stats(struct trace_key *key)
+{
+ trace_printf_key(key, "\n"
+ "pack_report: getpagesize() = %10" SZ_FMT "\n"
+ "pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n"
+ "pack_report: core.packedGitLimit = %10" SZ_FMT "\n"
+ "pack_report: pack_used_ctr = %10u\n"
+ "pack_report: pack_mmap_calls = %10u\n"
+ "pack_report: pack_open_windows = %10u / %10u\n"
+ "pack_report: pack_mapped = "
+ "%10" SZ_FMT " / %10" SZ_FMT "\n"
+ "pack_report: pack accesss = %10u\n",
+ sz_fmt(getpagesize()),
+ sz_fmt(packed_git_window_size),
+ sz_fmt(packed_git_limit),
+ pack_used_ctr,
+ pack_mmap_calls,
+ pack_open_windows, peak_pack_open_windows,
+ sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped),
+ pack_access_nr);
+}
+
/*
* Open and mmap the index file at path, perform a couple of
* consistency checks, then record its information to p. Return 0 on
@@ -2086,6 +2109,7 @@ static void write_pack_access_log(struct packed_git *p, off_t obj_offset)
static struct trace_key pack_access = TRACE_KEY_INIT(PACK_ACCESS);
trace_printf_key(&pack_access, "%s %"PRIuMAX"\n",
p->pack_name, (uintmax_t)obj_offset);
+ pack_access_nr++;
}
int do_check_packed_object_crc;
diff --git a/trace.c b/trace.c
index e583dc6..c52da0f 100644
--- a/trace.c
+++ b/trace.c
@@ -426,3 +426,16 @@ void trace_command_performance(const char **argv)
sq_quote_argv(&command_line, argv, 0);
command_start_time = getnanotime();
}
+
+static struct trace_key trace_pack_stats = TRACE_KEY_INIT(PACK_STATS);
+
+static void print_stats_atexit(void)
+{
+ report_pack_stats(&trace_pack_stats);
+}
+
+void trace_stats(void)
+{
+ if (trace_want(&trace_pack_stats))
+ atexit(print_stats_atexit);
+}
diff --git a/trace.h b/trace.h
index ae6a332..9c06e82 100644
--- a/trace.h
+++ b/trace.h
@@ -18,6 +18,7 @@ extern int trace_want(struct trace_key *key);
extern void trace_disable(struct trace_key *key);
extern uint64_t getnanotime(void);
extern void trace_command_performance(const char **argv);
+extern void trace_stats(void);
#ifndef HAVE_VARIADIC_MACROS
--
2.1.0.rc0.66.gb9187ad
next prev parent reply other threads:[~2014-07-28 12:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 12:03 [PATCH v3 0/9] Speed up cache loading time Nguyễn Thái Ngọc Duy
2014-07-28 12:03 ` Nguyễn Thái Ngọc Duy [this message]
2014-07-28 12:03 ` [PATCH v3 2/9] read-cache.c: fix constness of verify_hdr() Nguyễn Thái Ngọc Duy
2014-07-28 12:03 ` [PATCH v3 3/9] read-cache: allow to keep mmap'd memory after reading Nguyễn Thái Ngọc Duy
2014-07-28 12:03 ` [PATCH v3 4/9] index-helper: new daemon for caching index and related stuff Nguyễn Thái Ngọc Duy
2014-07-30 8:08 ` Eric Sunshine
2014-07-30 10:39 ` Duy Nguyen
2014-07-31 2:41 ` David Turner
2014-07-28 12:03 ` [PATCH v3 5/9] trace.c: add GIT_TRACE_INDEX_STATS for index statistics Nguyễn Thái Ngọc Duy
2014-07-28 12:03 ` [PATCH v3 6/9] index-helper: add --strict Nguyễn Thái Ngọc Duy
2014-07-28 12:03 ` [PATCH v3 7/9] daemonize(): set a flag before exiting the main process Nguyễn Thái Ngọc Duy
2014-07-28 12:03 ` [PATCH v3 8/9] index-helper: add --detach Nguyễn Thái Ngọc Duy
2014-07-28 12:03 ` [PATCH v3 9/9] index-helper: add Windows support Nguyễn Thái Ngọc Duy
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406548995-28549-2-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.