undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'np/delta' into next

Browse Source 
* np/delta:
  Revert "diff-delta: produce optimal pack data"
  Tweak break/merge score to adjust to the new delta generation code.
  count-delta: fix counting of copied source.
This commit is contained in:
Junio C Hamano 2006-02-24 01:30:04 -08:00
commit 5ca5396c9e
3 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
count-delta.c
View File

@ -26,7 +26,7 @@ static void touch_range(struct span **span,
again: again:
if (ofs < e->end) { if (ofs < e->end) {
while (e->end < end) { while (e->end < end) {
if (e->next) { if (e->next && e->next->ofs <= end) {
e->end = e->next->ofs; e->end = e->next->ofs;
e = e->next; e = e->next;
} }

77
diff-delta.c
View File

@ -20,11 +20,21 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <zlib.h>
#include "delta.h" #include "delta.h"
/* block size: min = 16, max = 64k, power of 2 */
#define BLK_SIZE 16
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define GR_PRIME 0x9e370001
#define HASH(v, shift) (((unsigned int)(v) * GR_PRIME) >> (shift))
struct index { struct index {
const unsigned char *ptr; const unsigned char *ptr;
unsigned int val;
struct index *next; struct index *next;
}; };
@ -32,21 +42,21 @@ static struct index ** delta_index(const unsigned char *buf,
unsigned long bufsize, unsigned long bufsize,
unsigned int *hash_shift) unsigned int *hash_shift)
{ {
unsigned long hsize; unsigned int hsize, hshift, entries, blksize, i;
unsigned int hshift, i;
const unsigned char *data; const unsigned char *data;
struct index *entry, **hash; struct index *entry, **hash;
void *mem; void *mem;
/* determine index hash size */ /* determine index hash size */
hsize = bufsize / 4; entries = (bufsize + BLK_SIZE - 1) / BLK_SIZE;
for (i = 8; (1 << i) < hsize && i < 16; i++); hsize = entries / 4;
for (i = 4; (1 << i) < hsize && i < 16; i++);
hsize = 1 << i; hsize = 1 << i;
hshift = i - 8; hshift = 32 - i;
*hash_shift = hshift; *hash_shift = hshift;
/* allocate lookup index */ /* allocate lookup index */
mem = malloc(hsize * sizeof(*hash) + bufsize * sizeof(*entry)); mem = malloc(hsize * sizeof(*hash) + entries * sizeof(*entry));
if (!mem) if (!mem)
return NULL; return NULL;
hash = mem; hash = mem;
@ -54,12 +64,17 @@ static struct index ** delta_index(const unsigned char *buf,
memset(hash, 0, hsize * sizeof(*hash)); memset(hash, 0, hsize * sizeof(*hash));
/* then populate it */ /* then populate it */
data = buf + bufsize - 2; data = buf + entries * BLK_SIZE - BLK_SIZE;
while (data > buf) { blksize = bufsize - (data - buf);
entry->ptr = --data; while (data >= buf) {
i = data[0] ^ data[1] ^ (data[2] << hshift); unsigned int val = adler32(0, data, blksize);
i = HASH(val, hshift);
entry->ptr = data;
entry->val = val;
entry->next = hash[i]; entry->next = hash[i];
hash[i] = entry++; hash[i] = entry++;
blksize = BLK_SIZE;
data -= BLK_SIZE;
} }
return hash; return hash;
@ -126,27 +141,29 @@ void *diff_delta(void *from_buf, unsigned long from_size,
while (data < top) { while (data < top) {
unsigned int moff = 0, msize = 0; unsigned int moff = 0, msize = 0;
if (data + 2 < top) { unsigned int blksize = MIN(top - data, BLK_SIZE);
i = data[0] ^ data[1] ^ (data[2] << hash_shift); unsigned int val = adler32(0, data, blksize);
for (entry = hash[i]; entry; entry = entry->next) { i = HASH(val, hash_shift);
const unsigned char *ref = entry->ptr; for (entry = hash[i]; entry; entry = entry->next) {
const unsigned char *src = data; const unsigned char *ref = entry->ptr;
unsigned int ref_size = ref_top - ref; const unsigned char *src = data;
if (ref_size > top - src) unsigned int ref_size = ref_top - ref;
ref_size = top - src; if (entry->val != val)
if (ref_size > 0x10000) continue;
ref_size = 0x10000; if (ref_size > top - src)
if (ref_size <= msize) ref_size = top - src;
while (ref_size && *src++ == *ref) {
ref++;
ref_size--;
}
ref_size = ref - entry->ptr;
if (ref_size > msize) {
/* this is our best match so far */
moff = entry->ptr - ref_data;
msize = ref_size;
if (msize >= 0x10000) {
msize = 0x10000;
break; break;
while (ref_size && *src++ == *ref) {
ref++;
ref_size--;
}
ref_size = ref - entry->ptr;
if (msize < ref - entry->ptr) {
/* this is our best match so far */
msize = ref - entry->ptr;
moff = entry->ptr - ref_data;
} }
} }
} }

2
diffcore.h
View File

@ -18,7 +18,7 @@
#define MAX_SCORE 60000.0 #define MAX_SCORE 60000.0
#define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */ #define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
#define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%)*/ #define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%)*/
#define DEFAULT_MERGE_SCORE 48000 /* maximum for break-merge to happen (80%)*/ #define DEFAULT_MERGE_SCORE 45000 /* maximum for break-merge to happen (75%)*/
#define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */ #define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */