Commit d2075bf3e6019b7903ce19414f09348839e36fbc
2020-12-25T21:38:17
make use of reflist object id maps in tog log and diff views This is a partial fix for performance issues when browsing the FreeBSD Git repo, which can easily contain more than 4000 references. ok naddy
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
diff --git a/tog/tog.c b/tog/tog.c
index d3d4a63..a28a005 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -263,6 +263,7 @@ struct tog_diff_view_state {
int force_text_diff;
struct got_repository *repo;
struct got_reflist_head refs;
+ struct got_reflist_object_id_map *idmap;
struct tog_colors colors;
size_t nlines;
off_t *line_offsets;
@@ -304,6 +305,7 @@ struct tog_log_view_state {
int log_branches;
struct got_repository *repo;
struct got_reflist_head refs;
+ struct got_reflist_object_id_map *idmap;
struct got_object_id *start_id;
sig_atomic_t quit;
pthread_t thread;
@@ -1572,13 +1574,18 @@ draw_commits(struct tog_view *view)
if (s->selected_entry &&
!(view->searching && view->search_next_done == 0)) {
+ struct got_reflist_head *refs;
err = got_object_id_str(&id_str, s->selected_entry->id);
if (err)
return err;
- err = build_refs_str(&refs_str, &s->refs,
- s->selected_entry->id, s->repo);
- if (err)
- goto done;
+ refs = got_reflist_object_id_map_lookup(s->idmap,
+ s->selected_entry->id);
+ if (refs) {
+ err = build_refs_str(&refs_str, refs,
+ s->selected_entry->id, s->repo);
+ if (err)
+ goto done;
+ }
}
if (s->thread_args.commits_needed == 0)
@@ -2118,6 +2125,10 @@ close_log_view(struct tog_view *view)
s->start_id = NULL;
free(s->head_ref_name);
s->head_ref_name = NULL;
+ if (s->idmap) {
+ got_reflist_object_map_free(s->idmap);
+ s->idmap = NULL;
+ }
got_ref_list_free(&s->refs);
return err;
}
@@ -2263,6 +2274,9 @@ open_log_view(struct tog_view *view, struct got_object_id *start_id,
err = got_ref_list(&s->refs, repo, NULL, got_ref_cmp_by_name, NULL);
if (err)
goto done;
+ err = got_reflist_object_id_map_create(&s->idmap, &s->refs, repo);
+ if (err)
+ goto done;
s->repo = repo;
if (head_ref_name) {
@@ -2529,11 +2543,19 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
got_repo_get_path(s->repo), NULL);
if (err)
return err;
+ if (s->idmap) {
+ got_reflist_object_map_free(s->idmap);
+ s->idmap = NULL;
+ }
got_ref_list_free(&s->refs);
err = got_ref_list(&s->refs, s->repo, NULL,
got_ref_cmp_by_name, NULL);
if (err)
return err;
+ err = got_reflist_object_id_map_create(&s->idmap, &s->refs,
+ s->repo);
+ if (err)
+ return err;
err = got_commit_graph_open(&s->thread_args.graph,
s->in_repo_path, !s->log_branches);
if (err)
@@ -3254,14 +3276,16 @@ create_diff(struct tog_diff_view_state *s)
const struct got_object_id_queue *parent_ids;
struct got_object_qid *pid;
struct got_commit_object *commit2;
+ struct got_reflist_head *refs;
err = got_object_open_as_commit(&commit2, s->repo, s->id2);
if (err)
goto done;
+ refs = got_reflist_object_id_map_lookup(s->idmap, s->id2);
/* Show commit info if we're diffing to a parent/root commit. */
if (s->id1 == NULL) {
err = write_commit_info(&s->line_offsets, &s->nlines,
- s->id2, &s->refs, s->repo, s->f);
+ s->id2, refs, s->repo, s->f);
if (err)
goto done;
} else {
@@ -3270,7 +3294,7 @@ create_diff(struct tog_diff_view_state *s)
if (got_object_id_cmp(s->id1, pid->id) == 0) {
err = write_commit_info(
&s->line_offsets, &s->nlines,
- s->id2, &s->refs, s->repo, s->f);
+ s->id2, refs, s->repo, s->f);
if (err)
goto done;
break;
@@ -3492,6 +3516,16 @@ open_diff_view(struct tog_view *view, struct got_object_id *id1,
free_colors(&s->colors);
return err;
}
+ err = got_reflist_object_id_map_create(&s->idmap, &s->refs, repo);
+ if (err) {
+ free(s->id1);
+ s->id1 = NULL;
+ free(s->id2);
+ s->id2 = NULL;
+ free_colors(&s->colors);
+ got_ref_list_free(&s->refs);
+ return err;
+ }
if (log_view && view_is_splitscreen(view))
show_log_view(log_view); /* draw vborder */
@@ -3507,6 +3541,8 @@ open_diff_view(struct tog_view *view, struct got_object_id *id1,
s->id2 = NULL;
free_colors(&s->colors);
got_ref_list_free(&s->refs);
+ got_reflist_object_map_free(s->idmap);
+ s->idmap = NULL;
return err;
}
@@ -3535,6 +3571,10 @@ close_diff_view(struct tog_view *view)
free(s->line_offsets);
s->line_offsets = NULL;
s->nlines = 0;
+ if (s->idmap) {
+ got_reflist_object_map_free(s->idmap);
+ s->idmap = NULL;
+ }
got_ref_list_free(&s->refs);
return err;
}