blob: e670f8512558c38d9a9d6e754cfc609b042b1195 [file] [log] [blame]
Junio C Hamano65416752006-02-28 16:01:36 -08001#include "cache.h"
2#include "diff.h"
3#include "diffcore.h"
Junio C Hamano65416752006-02-28 16:01:36 -08004
Junio C Hamanoba23bbc2006-03-04 03:21:55 -08005/*
6 * Idea here is very simple.
7 *
Junio C Hamanoaf3abef2007-06-28 23:11:40 -07008 * Almost all data we are interested in are text, but sometimes we have
9 * to deal with binary data. So we cut them into chunks delimited by
10 * LF byte, or 64-byte sequence, whichever comes first, and hash them.
Junio C Hamanoba23bbc2006-03-04 03:21:55 -080011 *
Junio C Hamanoaf3abef2007-06-28 23:11:40 -070012 * For those chunks, if the source buffer has more instances of it
13 * than the destination buffer, that means the difference are the
14 * number of bytes not copied from source to destination. If the
15 * counts are the same, everything was copied from source to
16 * destination. If the destination has more, everything was copied,
17 * and destination added more.
Junio C Hamanoba23bbc2006-03-04 03:21:55 -080018 *
19 * We are doing an approximation so we do not really have to waste
20 * memory by actually storing the sequence. We just hash them into
21 * somewhere around 2^16 hashbuckets and count the occurrences.
Junio C Hamanoba23bbc2006-03-04 03:21:55 -080022 */
23
Junio C Hamanoc06c7962006-03-12 03:22:10 -080024/* Wild guess at the initial hash size */
Junio C Hamano28211042006-03-12 16:39:51 -080025#define INITIAL_HASH_SIZE 9
Junio C Hamanofc66d212006-03-12 20:32:06 -080026
Junio C Hamano28211042006-03-12 16:39:51 -080027/* We leave more room in smaller hash but do not let it
28 * grow to have unused hole too much.
29 */
30#define INITIAL_FREE(sz_log2) ((1<<(sz_log2))*(sz_log2-3)/(sz_log2))
Junio C Hamanoba23bbc2006-03-04 03:21:55 -080031
Junio C Hamanofc66d212006-03-12 20:32:06 -080032/* A prime rather carefully chosen between 2^16..2^17, so that
33 * HASHBASE < INITIAL_FREE(17). We want to keep the maximum hashtable
34 * size under the current 2<<17 maximum, which can hold this many
35 * different values before overflowing to hashtable of size 2<<18.
36 */
37#define HASHBASE 107927
38
Junio C Hamanoc06c7962006-03-12 03:22:10 -080039struct spanhash {
Linus Torvaldse31c9f22006-03-15 00:37:57 -080040 unsigned int hashval;
41 unsigned int cnt;
Junio C Hamanoc06c7962006-03-12 03:22:10 -080042};
43struct spanhash_top {
44 int alloc_log2;
45 int free;
46 struct spanhash data[FLEX_ARRAY];
47};
48
Junio C Hamanoc06c7962006-03-12 03:22:10 -080049static struct spanhash_top *spanhash_rehash(struct spanhash_top *orig)
50{
51 struct spanhash_top *new;
52 int i;
53 int osz = 1 << orig->alloc_log2;
54 int sz = osz << 1;
55
56 new = xmalloc(sizeof(*orig) + sizeof(struct spanhash) * sz);
57 new->alloc_log2 = orig->alloc_log2 + 1;
Junio C Hamano28211042006-03-12 16:39:51 -080058 new->free = INITIAL_FREE(new->alloc_log2);
Junio C Hamanoc06c7962006-03-12 03:22:10 -080059 memset(new->data, 0, sizeof(struct spanhash) * sz);
60 for (i = 0; i < osz; i++) {
61 struct spanhash *o = &(orig->data[i]);
62 int bucket;
63 if (!o->cnt)
64 continue;
65 bucket = o->hashval & (sz - 1);
66 while (1) {
67 struct spanhash *h = &(new->data[bucket++]);
68 if (!h->cnt) {
69 h->hashval = o->hashval;
70 h->cnt = o->cnt;
71 new->free--;
72 break;
73 }
74 if (sz <= bucket)
75 bucket = 0;
76 }
77 }
78 free(orig);
79 return new;
80}
81
82static struct spanhash_top *add_spanhash(struct spanhash_top *top,
Linus Torvaldse31c9f22006-03-15 00:37:57 -080083 unsigned int hashval, int cnt)
Junio C Hamanoc06c7962006-03-12 03:22:10 -080084{
85 int bucket, lim;
86 struct spanhash *h;
87
88 lim = (1 << top->alloc_log2);
89 bucket = hashval & (lim - 1);
90 while (1) {
91 h = &(top->data[bucket++]);
92 if (!h->cnt) {
93 h->hashval = hashval;
Linus Torvalds3c7ceba2006-03-15 00:37:57 -080094 h->cnt = cnt;
Junio C Hamanoc06c7962006-03-12 03:22:10 -080095 top->free--;
96 if (top->free < 0)
97 return spanhash_rehash(top);
98 return top;
99 }
100 if (h->hashval == hashval) {
Linus Torvalds3c7ceba2006-03-15 00:37:57 -0800101 h->cnt += cnt;
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800102 return top;
103 }
104 if (lim <= bucket)
105 bucket = 0;
106 }
107}
108
Linus Torvaldseb4d0e32007-10-02 19:28:19 -0700109static int spanhash_cmp(const void *a_, const void *b_)
110{
111 const struct spanhash *a = a_;
112 const struct spanhash *b = b_;
113
114 /* A count of zero compares at the end.. */
115 if (!a->cnt)
116 return !b->cnt ? 0 : 1;
117 if (!b->cnt)
118 return -1;
119 return a->hashval < b->hashval ? -1 :
120 a->hashval > b->hashval ? 1 : 0;
121}
122
Junio C Hamanob9905fe2007-06-28 23:14:13 -0700123static struct spanhash_top *hash_chars(struct diff_filespec *one)
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800124{
Linus Torvalds3c7ceba2006-03-15 00:37:57 -0800125 int i, n;
Linus Torvaldse31c9f22006-03-15 00:37:57 -0800126 unsigned int accum1, accum2, hashval;
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800127 struct spanhash_top *hash;
Junio C Hamanob9905fe2007-06-28 23:14:13 -0700128 unsigned char *buf = one->data;
129 unsigned int sz = one->size;
Junio C Hamano29a3eef2007-07-06 00:18:54 -0700130 int is_text = !diff_filespec_is_binary(one);
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800131
132 i = INITIAL_HASH_SIZE;
133 hash = xmalloc(sizeof(*hash) + sizeof(struct spanhash) * (1<<i));
134 hash->alloc_log2 = i;
Junio C Hamano28211042006-03-12 16:39:51 -0800135 hash->free = INITIAL_FREE(i);
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800136 memset(hash->data, 0, sizeof(struct spanhash) * (1<<i));
Junio C Hamano65416752006-02-28 16:01:36 -0800137
Linus Torvalds3c7ceba2006-03-15 00:37:57 -0800138 n = 0;
139 accum1 = accum2 = 0;
Junio C Hamanoba23bbc2006-03-04 03:21:55 -0800140 while (sz) {
Linus Torvaldse31c9f22006-03-15 00:37:57 -0800141 unsigned int c = *buf++;
142 unsigned int old_1 = accum1;
Junio C Hamanoba23bbc2006-03-04 03:21:55 -0800143 sz--;
Junio C Hamanob9905fe2007-06-28 23:14:13 -0700144
145 /* Ignore CR in CRLF sequence if text */
146 if (is_text && c == '\r' && sz && *buf == '\n')
147 continue;
148
Linus Torvaldse31c9f22006-03-15 00:37:57 -0800149 accum1 = (accum1 << 7) ^ (accum2 >> 25);
150 accum2 = (accum2 << 7) ^ (old_1 >> 25);
Linus Torvalds3c7ceba2006-03-15 00:37:57 -0800151 accum1 += c;
152 if (++n < 64 && c != '\n')
153 continue;
154 hashval = (accum1 + accum2 * 0x61) % HASHBASE;
155 hash = add_spanhash(hash, hashval, n);
156 n = 0;
157 accum1 = accum2 = 0;
Junio C Hamanoba23bbc2006-03-04 03:21:55 -0800158 }
Linus Torvaldseb4d0e32007-10-02 19:28:19 -0700159 qsort(hash->data,
160 1ul << hash->alloc_log2,
161 sizeof(hash->data[0]),
162 spanhash_cmp);
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800163 return hash;
Junio C Hamano65416752006-02-28 16:01:36 -0800164}
165
Junio C Hamanod8c3d032007-06-28 22:54:37 -0700166int diffcore_count_changes(struct diff_filespec *src,
167 struct diff_filespec *dst,
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800168 void **src_count_p,
169 void **dst_count_p,
Junio C Hamano65416752006-02-28 16:01:36 -0800170 unsigned long delta_limit,
171 unsigned long *src_copied,
172 unsigned long *literal_added)
173{
Linus Torvaldseb4d0e32007-10-02 19:28:19 -0700174 struct spanhash *s, *d;
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800175 struct spanhash_top *src_count, *dst_count;
Junio C Hamanoba23bbc2006-03-04 03:21:55 -0800176 unsigned long sc, la;
177
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800178 src_count = dst_count = NULL;
179 if (src_count_p)
180 src_count = *src_count_p;
181 if (!src_count) {
Junio C Hamanob9905fe2007-06-28 23:14:13 -0700182 src_count = hash_chars(src);
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800183 if (src_count_p)
184 *src_count_p = src_count;
Junio C Hamanoba23bbc2006-03-04 03:21:55 -0800185 }
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800186 if (dst_count_p)
187 dst_count = *dst_count_p;
188 if (!dst_count) {
Junio C Hamanob9905fe2007-06-28 23:14:13 -0700189 dst_count = hash_chars(dst);
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800190 if (dst_count_p)
191 *dst_count_p = dst_count;
192 }
193 sc = la = 0;
194
Linus Torvaldseb4d0e32007-10-02 19:28:19 -0700195 s = src_count->data;
196 d = dst_count->data;
197 for (;;) {
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800198 unsigned dst_cnt, src_cnt;
199 if (!s->cnt)
Linus Torvaldseb4d0e32007-10-02 19:28:19 -0700200 break; /* we checked all in src */
201 while (d->cnt) {
202 if (d->hashval >= s->hashval)
203 break;
204 d++;
205 }
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800206 src_cnt = s->cnt;
Linus Torvaldseb4d0e32007-10-02 19:28:19 -0700207 dst_cnt = d->hashval == s->hashval ? d->cnt : 0;
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800208 if (src_cnt < dst_cnt) {
209 la += dst_cnt - src_cnt;
210 sc += src_cnt;
211 }
212 else
213 sc += dst_cnt;
Linus Torvaldseb4d0e32007-10-02 19:28:19 -0700214 s++;
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800215 }
216
217 if (!src_count_p)
218 free(src_count);
219 if (!dst_count_p)
220 free(dst_count);
Junio C Hamanoba23bbc2006-03-04 03:21:55 -0800221 *src_copied = sc;
222 *literal_added = la;
Junio C Hamanoba23bbc2006-03-04 03:21:55 -0800223 return 0;
Junio C Hamano65416752006-02-28 16:01:36 -0800224}