[PATCH 4/5] Teach traverse_commit_list callsites about new parameter, nr_threads
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:53:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/pack-objects.c | 2 +- builtin/rev-list.c | 4 ++-- list-objects.c | 2 +- list-objects.h | 2 +- upload-pack.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 2f242c4..0702cd1 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c@@ -2292,7 +2292,7 @@ static void get_object_list(int ac, const char **av) if (prepare_revision_walk(&revs)) die("revision walk setup failed"); mark_edges_uninteresting(revs.commits, &revs, show_edge); - traverse_commit_list(&revs, show_commit, show_object, NULL); + traverse_commit_list(&revs, show_commit, show_object, NULL, 0); if (keep_unreachable) add_objects_in_unpacked_packs(&revs);
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 4c4d404..e720561 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c@@ -290,7 +290,7 @@ static int show_bisect_vars(struct rev_list_info *info, int reaches, int all) strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1)); if (flags & BISECT_SHOW_ALL) { - traverse_commit_list(revs, show_commit, show_object, info); + traverse_commit_list(revs, show_commit, show_object, info, 0); printf("------\n"); }
@@ -395,7 +395,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) return show_bisect_vars(&info, reaches, all); } - traverse_commit_list(&revs, show_commit, show_object, &info); + traverse_commit_list(&revs, show_commit, show_object, &info, 0); if (revs.count) { if (revs.left_right && revs.cherry_mark)
diff --git a/list-objects.c b/list-objects.c
index 2605b63..4f365e8 100644
--- a/list-objects.c
+++ b/list-objects.c@@ -170,7 +170,7 @@ static void add_pending_tree(struct rev_info *revs, struct tree *tree) void traverse_commit_list(struct rev_info *revs, show_commit_fn show_commit, show_object_fn show_object, - void *data) + void *data, int nr_threads_) { int i; struct commit *commit;
diff --git a/list-objects.h b/list-objects.h
index 3db7bb6..aa604ba 100644
--- a/list-objects.h
+++ b/list-objects.h@@ -3,7 +3,7 @@ typedef void (*show_commit_fn)(struct commit *, void *); typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *); -void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *); +void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *, int); typedef void (*show_edge_fn)(struct commit *); void mark_edges_uninteresting(struct commit_list *, struct rev_info *, show_edge_fn);
diff --git a/upload-pack.c b/upload-pack.c
index bb08e2e..698f966 100644
--- a/upload-pack.c
+++ b/upload-pack.c@@ -128,7 +128,7 @@ static int do_rev_list(int in, int out, void *user_data) for (i = 0; i < extra_edge_obj.nr; i++) fprintf(pack_pipe, "-%s\n", sha1_to_hex( extra_edge_obj.objects[i].item->sha1)); - traverse_commit_list(&revs, show_commit, show_object, NULL); + traverse_commit_list(&revs, show_commit, show_object, NULL, 0); fflush(pack_pipe); fclose(pack_pipe); return 0;
--
1.7.8.36.g69ee2