Add trace_performance output to functions involved in git-status.
Signed-off-by: Karsten Blees <[email protected]>
---
Applies on top of performance-tracing topic.
builtin/commit.c | 8 ++++++++
preload-index.c | 4 ++++
read-cache.c | 2 ++
wt-status.c | 11 +++++++++++
4 files changed, 25 insertions(+)
diff --git a/builtin/commit.c b/builtin/commit.c
index 94eb8a3..6a38fa2 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1322,9 +1322,11 @@ static int git_status_config(const char *k, const char
*v, void *cb)
int cmd_status(int argc, const char **argv, const char *prefix)
{
+ uint64_t start = getnanotime();
static struct wt_status s;
int fd;
unsigned char sha1[20];
+
static struct option builtin_status_options[] = {
OPT__VERBOSE(&verbose, N_("be verbose")),
OPT_SET_INT('s', "short", &status_format,
@@ -1369,13 +1371,19 @@ int cmd_status(int argc, const char **argv, const char
*prefix)
PATHSPEC_PREFER_FULL,
prefix, argv);
+ trace_performance_since(start, "cmd_status:setup");
+
read_cache_preload(&s.pathspec);
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec,
NULL, NULL);
+ start = getnanotime();
+
fd = hold_locked_index(&index_lock, 0);
if (0 <= fd)
update_index_if_able(&the_index, &index_lock);
+ trace_performance_since(start, "cmd_status:update_index");
+
s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
s.ignore_submodule_arg = ignore_submodule_arg;
wt_status_collect(&s);
diff --git a/preload-index.c b/preload-index.c
index 968ee25..189c5a4 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -33,6 +33,7 @@ struct thread_data {
static void *preload_thread(void *_data)
{
+ uint64_t start = getnanotime();
int nr;
struct thread_data *p = _data;
struct index_state *index = p->index;
@@ -64,6 +65,7 @@ static void *preload_thread(void *_data)
continue;
ce_mark_uptodate(ce);
} while (--nr > 0);
+ trace_performance_since(start, "preload_thread");
return NULL;
}
@@ -106,8 +108,10 @@ static void preload_index(struct index_state *index,
int read_index_preload(struct index_state *index,
const struct pathspec *pathspec)
{
+ uint64_t start = getnanotime();
int retval = read_index(index);
preload_index(index, pathspec);
+ trace_performance_since(start, "read_index_preload");
return retval;
}
diff --git a/read-cache.c b/read-cache.c
index 132d032..5c6b763 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1136,6 +1136,7 @@ int refresh_index(struct index_state *istate, unsigned
int flags,
const struct pathspec *pathspec,
char *seen, const char *header_msg)
{
+ uint64_t start = getnanotime();
int i;
int has_errors = 0;
int really = (flags & REFRESH_REALLY) != 0;
@@ -1222,6 +1223,7 @@ int refresh_index(struct index_state *istate, unsigned
int flags,
replace_index_entry(istate, i, new);
}
+ trace_performance_since(start, "refresh_index");
return has_errors;
}
diff --git a/wt-status.c b/wt-status.c
index 318a191..a744565 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -623,13 +623,24 @@ static void wt_status_collect_untracked(struct wt_status
*s)
void wt_status_collect(struct wt_status *s)
{
+ uint64_t start = getnanotime();
+
wt_status_collect_changes_worktree(s);
+ trace_performance_since(start, "wt_status_collect_changes_worktree");
+ start = getnanotime();
+
if (s->is_initial)
wt_status_collect_changes_initial(s);
else
wt_status_collect_changes_index(s);
+
+ trace_performance_since(start, "wt_status_collect_changes_index");
+ start = getnanotime();
+
wt_status_collect_untracked(s);
+
+ trace_performance_since(start, "wt_status_collect_untracked");
}
static void wt_status_print_unmerged(struct wt_status *s)
--
1.9.4.msysgit.0.1.gc8a51b4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
