From: Stephan Beyer <s-beyer@gmx.net>
To: git@vger.kernel.org
Cc: Stephan Beyer <s-beyer@gmx.net>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 11/16] bisect: make total number of commits global
Date: Fri, 26 Feb 2016 03:04:37 +0100 [thread overview]
Message-ID: <1456452282-10325-12-git-send-email-s-beyer@gmx.net> (raw)
In-Reply-To: <1456452282-10325-1-git-send-email-s-beyer@gmx.net>
The total number of commits in a bisect process is a property of
the bisect process. Making this property global helps to make the code
clearer.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
---
bisect.c | 74 ++++++++++++++++++++++++++++++++++------------------------------
1 file changed, 39 insertions(+), 35 deletions(-)
diff --git a/bisect.c b/bisect.c
index a09a410..3a3a728 100644
--- a/bisect.c
+++ b/bisect.c
@@ -23,6 +23,8 @@ static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
static const char *term_bad;
static const char *term_good;
+static int total;
+
static unsigned marker;
struct node_data {
@@ -38,7 +40,7 @@ static inline struct node_data *node_data(struct commit *elem)
return (struct node_data *)elem->util;
}
-static inline int get_distance(struct commit *commit, int total)
+static inline int get_distance(struct commit *commit)
{
int distance = node_data(commit)->weight;
if (total - distance < distance)
@@ -54,7 +56,7 @@ static inline int get_distance(struct commit *commit, int total)
* Return 0 if the distance is halfway.
* Return 1 if the distance is rising.
*/
-static inline int distance_direction(struct commit *commit, int total)
+static inline int distance_direction(struct commit *commit)
{
int doubled_diff = 2 * node_data(commit)->weight - total;
if (doubled_diff < -1)
@@ -107,25 +109,25 @@ static int count_interesting_parents(struct commit *commit)
return count;
}
-static inline int halfway(struct commit *commit, int nr)
+static inline int halfway(struct commit *commit)
{
/*
* Don't short-cut something we are not going to return!
*/
if (commit->object.flags & TREESAME)
return 0;
- return !distance_direction(commit, nr);
+ return !distance_direction(commit);
}
#if !DEBUG_BISECT
-#define show_list(a,b,c,d) do { ; } while (0)
+#define show_list(a,b,c) do { ; } while (0)
#else
-static void show_list(const char *debug, int counted, int nr,
+static void show_list(const char *debug, int counted,
struct commit_list *list)
{
struct commit_list *p;
- fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr);
+ fprintf(stderr, "%s (%d/%d)\n", debug, counted, total);
for (p = list; p; p = p->next) {
struct commit_list *pp;
@@ -157,7 +159,7 @@ static void show_list(const char *debug, int counted, int nr,
}
#endif /* DEBUG_BISECT */
-static struct commit_list *best_bisection(struct commit_list *list, int nr)
+static struct commit_list *best_bisection(struct commit_list *list)
{
struct commit_list *p, *best;
int best_distance = -1;
@@ -169,7 +171,7 @@ static struct commit_list *best_bisection(struct commit_list *list, int nr)
if (flags & TREESAME)
continue;
- distance = get_distance(p->item, nr);
+ distance = get_distance(p->item);
if (distance > best_distance) {
best = p;
best_distance = distance;
@@ -195,10 +197,10 @@ static int compare_commit_dist(const void *a_, const void *b_)
return oidcmp(&a->commit->object.oid, &b->commit->object.oid);
}
-static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr)
+static struct commit_list *best_bisection_sorted(struct commit_list *list)
{
struct commit_list *p;
- struct commit_dist *array = xcalloc(nr, sizeof(*array));
+ struct commit_dist *array = xcalloc(total, sizeof(*array));
int cnt, i;
for (p = list, cnt = 0; p; p = p->next) {
@@ -207,7 +209,7 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n
if (flags & TREESAME)
continue;
- distance = get_distance(p->item, nr);
+ distance = get_distance(p->item);
array[cnt].commit = p->item;
array[cnt].distance = distance;
cnt++;
@@ -243,7 +245,7 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n
* or positive distance.
*/
static struct commit_list *do_find_bisection(struct commit_list *list,
- int nr, struct node_data *weights,
+ struct node_data *weights,
int find_all)
{
int n, counted;
@@ -262,7 +264,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
node_data(commit)->weight = 1;
counted++;
show_list("bisection 2 count one",
- counted, nr, list);
+ counted, list);
}
/*
* otherwise, it is known not to reach any
@@ -278,7 +280,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
}
}
- show_list("bisection 2 initialize", counted, nr, list);
+ show_list("bisection 2 initialize", counted, list);
/*
* If you have only one parent in the resulting set
@@ -300,15 +302,15 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
node_data(p->item)->weight = count_distance(p->item);
/* Does it happen to be at exactly half-way? */
- if (!find_all && halfway(p->item, nr))
+ if (!find_all && halfway(p->item))
return p;
counted++;
}
}
- show_list("bisection 2 count_distance", counted, nr, list);
+ show_list("bisection 2 count_distance", counted, list);
- while (counted < nr) {
+ while (counted < total) {
for (p = list; p; p = p->next) {
struct commit_list *q;
unsigned flags = p->item->object.flags;
@@ -334,40 +336,41 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
node_data(p->item)->weight++;
counted++;
show_list("bisection 2 count one",
- counted, nr, list);
+ counted, list);
}
/* Does it happen to be at exactly half-way? */
- if (!find_all && halfway(p->item, nr))
+ if (!find_all && halfway(p->item))
return p;
}
}
- show_list("bisection 2 counted all", counted, nr, list);
+ show_list("bisection 2 counted all", counted, list);
if (!find_all)
- return best_bisection(list, nr);
+ return best_bisection(list);
else
- return best_bisection_sorted(list, nr);
+ return best_bisection_sorted(list);
}
struct commit_list *find_bisection(struct commit_list *list,
int *reaches, int *all,
int find_all)
{
- int nr, on_list;
+ int on_list;
struct commit_list *p, *best, *next, *last;
struct node_data *weights;
+ total = 0;
marker = 0;
- show_list("bisection 2 entry", 0, 0, list);
+ show_list("bisection 2 entry", 0, list);
/*
* Count the number of total and tree-changing items on the
* list, while reversing the list.
*/
- for (nr = on_list = 0, last = NULL, p = list;
+ for (on_list = 0, last = NULL, p = list;
p;
p = next) {
unsigned flags = p->item->object.flags;
@@ -378,23 +381,24 @@ struct commit_list *find_bisection(struct commit_list *list,
p->next = last;
last = p;
if (!(flags & TREESAME))
- nr++;
+ total++;
on_list++;
}
list = last;
- show_list("bisection 2 sorted", 0, nr, list);
+ show_list("bisection 2 sorted", 0, list);
- *all = nr;
+ *all = total;
weights = (struct node_data *)xcalloc(on_list, sizeof(*weights));
/* Do the real work of finding bisection commit. */
- best = do_find_bisection(list, nr, weights, find_all);
+ best = do_find_bisection(list, weights, find_all);
if (best) {
if (!find_all)
best->next = NULL;
*reaches = node_data(best->item)->weight;
}
free(weights);
+
return best;
}
@@ -931,7 +935,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
{
struct rev_info revs;
struct commit_list *tried;
- int reaches = 0, all = 0, nr, steps;
+ int reaches = 0, nr, steps;
const unsigned char *bisect_rev;
read_bisect_terms(&term_bad, &term_good);
@@ -945,7 +949,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
bisect_common(&revs);
- revs.commits = find_bisection(revs.commits, &reaches, &all,
+ revs.commits = find_bisection(revs.commits, &reaches, &total,
!!skipped_revs.nr);
revs.commits = managed_skipped(revs.commits, &tried);
@@ -963,7 +967,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
exit(1);
}
- if (!all) {
+ if (!total) {
fprintf(stderr, "No testable commit found.\n"
"Maybe you started with bad path parameters?\n");
exit(4);
@@ -980,8 +984,8 @@ int bisect_next_all(const char *prefix, int no_checkout)
exit(10);
}
- nr = all - reaches - 1;
- steps = estimate_bisect_steps(all);
+ nr = total - reaches - 1;
+ steps = estimate_bisect_steps(total);
printf("Bisecting: %d revision%s left to test after this "
"(roughly %d step%s)\n", nr, (nr == 1 ? "" : "s"),
steps, (steps == 1 ? "" : "s"));
--
2.7.1.354.gd492730.dirty
next prev parent reply other threads:[~2016-02-26 2:06 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 2:04 [PATCH 00/16] git bisect improvements Stephan Beyer
2016-02-26 2:04 ` [PATCH 01/16] bisect: write about `bisect next` in documentation Stephan Beyer
2016-02-26 8:02 ` Jacob Keller
2016-02-26 18:47 ` Junio C Hamano
2016-02-27 13:45 ` Stephan Beyer
2016-02-27 18:03 ` Junio C Hamano
2016-02-27 19:38 ` Stephan Beyer
2016-02-28 18:28 ` Junio C Hamano
2016-02-26 2:04 ` [PATCH 02/16] bisect: add test for the bisect algorithm Stephan Beyer
2016-02-26 6:53 ` Christian Couder
2016-02-26 21:38 ` Stephan Beyer
2016-02-27 11:40 ` Christian Couder
2016-02-27 12:42 ` Matthieu Moy
2016-02-26 2:04 ` [PATCH 03/16] bisect: make bisect compile if DEBUG_BISECT is set Stephan Beyer
2016-02-26 2:04 ` [PATCH 04/16] bisect: make algorithm behavior independent of DEBUG_BISECT Stephan Beyer
2016-02-26 2:04 ` [PATCH 05/16] bisect: get rid of recursion in count_distance() Stephan Beyer
2016-02-26 2:04 ` [PATCH 06/16] bisect: use struct node_data array instead of int array Stephan Beyer
2016-02-26 2:04 ` [PATCH 07/16] bisect: replace clear_distance() by unique markers Stephan Beyer
2016-02-26 2:04 ` [PATCH 08/16] bisect: use commit instead of commit list as arguments when appropriate Stephan Beyer
2016-02-26 3:10 ` Junio C Hamano
2016-02-26 2:04 ` [PATCH 09/16] bisect: extract get_distance() function from code duplication Stephan Beyer
2016-02-26 2:04 ` [PATCH 10/16] bisect: introduce distance_direction() Stephan Beyer
2016-02-26 2:04 ` Stephan Beyer [this message]
2016-02-26 2:04 ` [PATCH 12/16] bisect: rename count_distance() to compute_weight() Stephan Beyer
2016-02-26 2:04 ` [PATCH 13/16] bisect: prepare for different algorithms based on find_all Stephan Beyer
2016-02-26 2:04 ` [PATCH 14/16] bisect: use a modified breadth-first search to find relevant weights Stephan Beyer
2016-02-26 3:09 ` Junio C Hamano
2016-02-26 20:55 ` Stephan Beyer
2016-02-26 2:04 ` [PATCH 15/16] bisect: compute best bisection in compute_relevant_weights() Stephan Beyer
2016-02-26 2:04 ` [PATCH 16/16] bisect: get back halfway shortcut Stephan Beyer
2016-03-20 18:50 ` [PATCH 00/16] git bisect improvements Pranit Bauva
2016-03-21 22:22 ` Stephan Beyer
2016-03-22 7:35 ` Christian Couder
2016-03-22 11:35 ` Pranit Bauva
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=1456452282-10325-12-git-send-email-s-beyer@gmx.net \
--to=s-beyer@gmx.net \
--cc=chriscool@tuxfamily.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).