2006-03-01 00:01:36 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "diffcore.h"
|
2006-03-04 11:21:55 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Idea here is very simple.
|
|
|
|
*
|
2007-06-29 06:11:40 +00:00
|
|
|
* Almost all data we are interested in are text, but sometimes we have
|
|
|
|
* to deal with binary data. So we cut them into chunks delimited by
|
|
|
|
* LF byte, or 64-byte sequence, whichever comes first, and hash them.
|
2006-03-04 11:21:55 +00:00
|
|
|
*
|
2007-06-29 06:11:40 +00:00
|
|
|
* For those chunks, if the source buffer has more instances of it
|
|
|
|
* than the destination buffer, that means the difference are the
|
|
|
|
* number of bytes not copied from source to destination. If the
|
|
|
|
* counts are the same, everything was copied from source to
|
|
|
|
* destination. If the destination has more, everything was copied,
|
|
|
|
* and destination added more.
|
2006-03-04 11:21:55 +00:00
|
|
|
*
|
|
|
|
* We are doing an approximation so we do not really have to waste
|
|
|
|
* memory by actually storing the sequence. We just hash them into
|
|
|
|
* somewhere around 2^16 hashbuckets and count the occurrences.
|
|
|
|
*/
|
|
|
|
|
2006-03-12 11:22:10 +00:00
|
|
|
/* Wild guess at the initial hash size */
|
2006-03-13 00:39:51 +00:00
|
|
|
#define INITIAL_HASH_SIZE 9
|
2006-03-13 04:32:06 +00:00
|
|
|
|
2006-03-13 00:39:51 +00:00
|
|
|
/* We leave more room in smaller hash but do not let it
|
|
|
|
* grow to have unused hole too much.
|
|
|
|
*/
|
|
|
|
#define INITIAL_FREE(sz_log2) ((1<<(sz_log2))*(sz_log2-3)/(sz_log2))
|
2006-03-04 11:21:55 +00:00
|
|
|
|
2006-03-13 04:32:06 +00:00
|
|
|
/* A prime rather carefully chosen between 2^16..2^17, so that
|
|
|
|
* HASHBASE < INITIAL_FREE(17). We want to keep the maximum hashtable
|
|
|
|
* size under the current 2<<17 maximum, which can hold this many
|
|
|
|
* different values before overflowing to hashtable of size 2<<18.
|
|
|
|
*/
|
|
|
|
#define HASHBASE 107927
|
|
|
|
|
2006-03-12 11:22:10 +00:00
|
|
|
struct spanhash {
|
2006-03-15 08:37:57 +00:00
|
|
|
unsigned int hashval;
|
|
|
|
unsigned int cnt;
|
2006-03-12 11:22:10 +00:00
|
|
|
};
|
|
|
|
struct spanhash_top {
|
|
|
|
int alloc_log2;
|
|
|
|
int free;
|
|
|
|
struct spanhash data[FLEX_ARRAY];
|
|
|
|
};
|
|
|
|
|
2006-03-13 00:39:51 +00:00
|
|
|
static struct spanhash *spanhash_find(struct spanhash_top *top,
|
2006-03-15 08:37:57 +00:00
|
|
|
unsigned int hashval)
|
2006-03-12 11:22:10 +00:00
|
|
|
{
|
|
|
|
int sz = 1 << top->alloc_log2;
|
|
|
|
int bucket = hashval & (sz - 1);
|
|
|
|
while (1) {
|
|
|
|
struct spanhash *h = &(top->data[bucket++]);
|
|
|
|
if (!h->cnt)
|
|
|
|
return NULL;
|
|
|
|
if (h->hashval == hashval)
|
|
|
|
return h;
|
|
|
|
if (sz <= bucket)
|
|
|
|
bucket = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct spanhash_top *spanhash_rehash(struct spanhash_top *orig)
|
|
|
|
{
|
|
|
|
struct spanhash_top *new;
|
|
|
|
int i;
|
|
|
|
int osz = 1 << orig->alloc_log2;
|
|
|
|
int sz = osz << 1;
|
|
|
|
|
|
|
|
new = xmalloc(sizeof(*orig) + sizeof(struct spanhash) * sz);
|
|
|
|
new->alloc_log2 = orig->alloc_log2 + 1;
|
2006-03-13 00:39:51 +00:00
|
|
|
new->free = INITIAL_FREE(new->alloc_log2);
|
2006-03-12 11:22:10 +00:00
|
|
|
memset(new->data, 0, sizeof(struct spanhash) * sz);
|
|
|
|
for (i = 0; i < osz; i++) {
|
|
|
|
struct spanhash *o = &(orig->data[i]);
|
|
|
|
int bucket;
|
|
|
|
if (!o->cnt)
|
|
|
|
continue;
|
|
|
|
bucket = o->hashval & (sz - 1);
|
|
|
|
while (1) {
|
|
|
|
struct spanhash *h = &(new->data[bucket++]);
|
|
|
|
if (!h->cnt) {
|
|
|
|
h->hashval = o->hashval;
|
|
|
|
h->cnt = o->cnt;
|
|
|
|
new->free--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (sz <= bucket)
|
|
|
|
bucket = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free(orig);
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct spanhash_top *add_spanhash(struct spanhash_top *top,
|
2006-03-15 08:37:57 +00:00
|
|
|
unsigned int hashval, int cnt)
|
2006-03-12 11:22:10 +00:00
|
|
|
{
|
|
|
|
int bucket, lim;
|
|
|
|
struct spanhash *h;
|
|
|
|
|
|
|
|
lim = (1 << top->alloc_log2);
|
|
|
|
bucket = hashval & (lim - 1);
|
|
|
|
while (1) {
|
|
|
|
h = &(top->data[bucket++]);
|
|
|
|
if (!h->cnt) {
|
|
|
|
h->hashval = hashval;
|
2006-03-15 08:37:57 +00:00
|
|
|
h->cnt = cnt;
|
2006-03-12 11:22:10 +00:00
|
|
|
top->free--;
|
|
|
|
if (top->free < 0)
|
|
|
|
return spanhash_rehash(top);
|
|
|
|
return top;
|
|
|
|
}
|
|
|
|
if (h->hashval == hashval) {
|
2006-03-15 08:37:57 +00:00
|
|
|
h->cnt += cnt;
|
2006-03-12 11:22:10 +00:00
|
|
|
return top;
|
|
|
|
}
|
|
|
|
if (lim <= bucket)
|
|
|
|
bucket = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-29 06:14:13 +00:00
|
|
|
static struct spanhash_top *hash_chars(struct diff_filespec *one)
|
2006-03-01 00:01:36 +00:00
|
|
|
{
|
2006-03-15 08:37:57 +00:00
|
|
|
int i, n;
|
2006-03-15 08:37:57 +00:00
|
|
|
unsigned int accum1, accum2, hashval;
|
2006-03-12 11:22:10 +00:00
|
|
|
struct spanhash_top *hash;
|
2007-06-29 06:14:13 +00:00
|
|
|
unsigned char *buf = one->data;
|
|
|
|
unsigned int sz = one->size;
|
|
|
|
int is_text = !one->is_binary;
|
2006-03-12 11:22:10 +00:00
|
|
|
|
|
|
|
i = INITIAL_HASH_SIZE;
|
|
|
|
hash = xmalloc(sizeof(*hash) + sizeof(struct spanhash) * (1<<i));
|
|
|
|
hash->alloc_log2 = i;
|
2006-03-13 00:39:51 +00:00
|
|
|
hash->free = INITIAL_FREE(i);
|
2006-03-12 11:22:10 +00:00
|
|
|
memset(hash->data, 0, sizeof(struct spanhash) * (1<<i));
|
2006-03-01 00:01:36 +00:00
|
|
|
|
2006-03-15 08:37:57 +00:00
|
|
|
n = 0;
|
|
|
|
accum1 = accum2 = 0;
|
2006-03-04 11:21:55 +00:00
|
|
|
while (sz) {
|
2006-03-15 08:37:57 +00:00
|
|
|
unsigned int c = *buf++;
|
|
|
|
unsigned int old_1 = accum1;
|
2006-03-04 11:21:55 +00:00
|
|
|
sz--;
|
2007-06-29 06:14:13 +00:00
|
|
|
|
|
|
|
/* Ignore CR in CRLF sequence if text */
|
|
|
|
if (is_text && c == '\r' && sz && *buf == '\n')
|
|
|
|
continue;
|
|
|
|
|
2006-03-15 08:37:57 +00:00
|
|
|
accum1 = (accum1 << 7) ^ (accum2 >> 25);
|
|
|
|
accum2 = (accum2 << 7) ^ (old_1 >> 25);
|
2006-03-15 08:37:57 +00:00
|
|
|
accum1 += c;
|
|
|
|
if (++n < 64 && c != '\n')
|
|
|
|
continue;
|
|
|
|
hashval = (accum1 + accum2 * 0x61) % HASHBASE;
|
|
|
|
hash = add_spanhash(hash, hashval, n);
|
|
|
|
n = 0;
|
|
|
|
accum1 = accum2 = 0;
|
2006-03-01 00:01:36 +00:00
|
|
|
}
|
2006-03-12 11:22:10 +00:00
|
|
|
return hash;
|
2006-03-01 00:01:36 +00:00
|
|
|
}
|
|
|
|
|
2007-06-29 05:54:37 +00:00
|
|
|
int diffcore_count_changes(struct diff_filespec *src,
|
|
|
|
struct diff_filespec *dst,
|
2006-03-12 11:22:10 +00:00
|
|
|
void **src_count_p,
|
|
|
|
void **dst_count_p,
|
2006-03-01 00:01:36 +00:00
|
|
|
unsigned long delta_limit,
|
|
|
|
unsigned long *src_copied,
|
|
|
|
unsigned long *literal_added)
|
|
|
|
{
|
2006-03-12 11:22:10 +00:00
|
|
|
int i, ssz;
|
|
|
|
struct spanhash_top *src_count, *dst_count;
|
2006-03-04 11:21:55 +00:00
|
|
|
unsigned long sc, la;
|
|
|
|
|
2006-03-12 11:22:10 +00:00
|
|
|
src_count = dst_count = NULL;
|
|
|
|
if (src_count_p)
|
|
|
|
src_count = *src_count_p;
|
|
|
|
if (!src_count) {
|
2007-06-29 06:14:13 +00:00
|
|
|
src_count = hash_chars(src);
|
2006-03-12 11:22:10 +00:00
|
|
|
if (src_count_p)
|
|
|
|
*src_count_p = src_count;
|
|
|
|
}
|
|
|
|
if (dst_count_p)
|
|
|
|
dst_count = *dst_count_p;
|
|
|
|
if (!dst_count) {
|
2007-06-29 06:14:13 +00:00
|
|
|
dst_count = hash_chars(dst);
|
2006-03-12 11:22:10 +00:00
|
|
|
if (dst_count_p)
|
|
|
|
*dst_count_p = dst_count;
|
|
|
|
}
|
2006-03-04 11:21:55 +00:00
|
|
|
sc = la = 0;
|
2006-03-12 11:22:10 +00:00
|
|
|
|
|
|
|
ssz = 1 << src_count->alloc_log2;
|
|
|
|
for (i = 0; i < ssz; i++) {
|
|
|
|
struct spanhash *s = &(src_count->data[i]);
|
|
|
|
struct spanhash *d;
|
|
|
|
unsigned dst_cnt, src_cnt;
|
|
|
|
if (!s->cnt)
|
|
|
|
continue;
|
|
|
|
src_cnt = s->cnt;
|
|
|
|
d = spanhash_find(dst_count, s->hashval);
|
|
|
|
dst_cnt = d ? d->cnt : 0;
|
|
|
|
if (src_cnt < dst_cnt) {
|
|
|
|
la += dst_cnt - src_cnt;
|
|
|
|
sc += src_cnt;
|
2006-03-04 11:21:55 +00:00
|
|
|
}
|
2006-03-12 11:22:10 +00:00
|
|
|
else
|
|
|
|
sc += dst_cnt;
|
2006-03-04 11:21:55 +00:00
|
|
|
}
|
2006-03-12 11:22:10 +00:00
|
|
|
|
|
|
|
if (!src_count_p)
|
|
|
|
free(src_count);
|
|
|
|
if (!dst_count_p)
|
|
|
|
free(dst_count);
|
2006-03-04 11:21:55 +00:00
|
|
|
*src_copied = sc;
|
|
|
|
*literal_added = la;
|
|
|
|
return 0;
|
2006-03-01 00:01:36 +00:00
|
|
|
}
|