[PATCH v3 5/9] trace.c: add GIT_TRACE_INDEX_STATS for index statistics
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/git.txt | 1 +
cache.h | 1 +
read-cache.c | 16 ++++++++++++++++
trace.c | 5 ++++-
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index a124612..7077386 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -947,6 +947,7 @@ Unsetting the variable, or setting it to empty, "0" or
See 'GIT_TRACE' for available trace output options.
'GIT_TRACE_PACK_STATS'::
+'GIT_TRACE_INDEX_STATS'::
Print various statistics.
'GIT_TRACE_SETUP'::
diff --git a/cache.h b/cache.h
index 29a0c53..4266771 100644
--- a/cache.h
+++ b/cache.h
@@ -1508,5 +1508,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);
+void report_index_stats(struct trace_key *key);
#endif /* CACHE_H */
diff --git a/read-cache.c b/read-cache.c
index ff28142..4bd2abe 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -48,6 +48,10 @@ struct index_state the_index;
static const char *alternate_index_output;
int dont_poke_index_helper;
+static unsigned int nr_read_index;
+static unsigned int nr_read_shm_index;
+static unsigned int nr_write_index;
+
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
istate->cache[nr] = ce;
@@ -1523,6 +1527,7 @@ static int try_shm(struct index_state *istate)
istate->mmap = new_mmap;
istate->mmap_size = new_length;
poke_daemon(&st, 0);
+ nr_read_shm_index++;
return 0;
}
@@ -1619,6 +1624,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
}
if (!istate->keep_mmap)
munmap(mmap, mmap_size);
+ nr_read_index++;
return istate->cache_nr;
unmap:
@@ -2087,6 +2093,7 @@ static int do_write_index(struct index_state *istate, int newfd,
return -1;
istate->timestamp.sec = (unsigned int)st.st_mtime;
istate->timestamp.nsec = ST_MTIME_NSEC(st);
+ nr_write_index++;
return 0;
}
@@ -2346,3 +2353,12 @@ void stat_validity_update(struct stat_validity *sv, int fd)
fill_stat_data(sv->sd, &st);
}
}
+
+void report_index_stats(struct trace_key *key)
+{
+ trace_printf_key(key, "\n"
+ "index stats: file reads = %10u\n"
+ "index stats: cache reads = %10u\n"
+ "index stats: file writes = %10u\n",
+ nr_read_index, nr_read_shm_index, nr_write_index);
+}
diff --git a/trace.c b/trace.c
index c52da0f..eb3a11a 100644
--- a/trace.c
+++ b/trace.c
@@ -428,14 +428,17 @@ void trace_command_performance(const char **argv)
}
static struct trace_key trace_pack_stats = TRACE_KEY_INIT(PACK_STATS);
+static struct trace_key trace_index_stats = TRACE_KEY_INIT(INDEX_STATS);
static void print_stats_atexit(void)
{
report_pack_stats(&trace_pack_stats);
+ report_index_stats(&trace_index_stats);
}
void trace_stats(void)
{
- if (trace_want(&trace_pack_stats))
+ if (trace_want(&trace_pack_stats) ||
+ trace_want(&trace_index_stats))
atexit(print_stats_atexit);
}
--
2.1.0.rc0.66.gb9187ad
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>