mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
6b7d25d97b
Indexing based on adler32 has a match precision based on the block size (currently 16). Lowering the block size would produce smaller deltas but the indexing memory and computing cost increases significantly. For optimal delta result the indexing block size should be 3 with an increment of 1 (instead of 16 and 16). With such low params the adler32 becomes a clear overhead increasing the time for git-repack by a factor of 3. And with such small blocks the adler 32 is not very useful as the whole of the block bits can be used directly. This patch replaces the adler32 with an open coded index value based on 3 characters directly. This gives sufficient bits for hashing and allows for optimal delta with reasonable CPU cycles. The resulting packs are 6% smaller on average. The increase in CPU time is about 25%. But this cost is now hidden by the delta reuse patch while the saving on data transfers is always there. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
213 lines
5 KiB
C
213 lines
5 KiB
C
/*
|
|
* diff-delta.c: generate a delta between two buffers
|
|
*
|
|
* Many parts of this file have been lifted from LibXDiff version 0.10.
|
|
* http://www.xmailserver.org/xdiff-lib.html
|
|
*
|
|
* LibXDiff was written by Davide Libenzi <davidel@xmailserver.org>
|
|
* Copyright (C) 2003 Davide Libenzi
|
|
*
|
|
* Many mods for GIT usage by Nicolas Pitre <nico@cam.org>, (C) 2005.
|
|
*
|
|
* This file is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* Use of this within git automatically means that the LGPL
|
|
* licensing gets turned into GPLv2 within this project.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "delta.h"
|
|
|
|
|
|
struct index {
|
|
const unsigned char *ptr;
|
|
struct index *next;
|
|
};
|
|
|
|
static struct index ** delta_index(const unsigned char *buf,
|
|
unsigned long bufsize,
|
|
unsigned int *hash_shift)
|
|
{
|
|
unsigned long hsize;
|
|
unsigned int hshift, i;
|
|
const unsigned char *data;
|
|
struct index *entry, **hash;
|
|
void *mem;
|
|
|
|
/* determine index hash size */
|
|
hsize = bufsize / 4;
|
|
for (i = 8; (1 << i) < hsize && i < 16; i++);
|
|
hsize = 1 << i;
|
|
hshift = i - 8;
|
|
*hash_shift = hshift;
|
|
|
|
/* allocate lookup index */
|
|
mem = malloc(hsize * sizeof(*hash) + bufsize * sizeof(*entry));
|
|
if (!mem)
|
|
return NULL;
|
|
hash = mem;
|
|
entry = mem + hsize * sizeof(*hash);
|
|
memset(hash, 0, hsize * sizeof(*hash));
|
|
|
|
/* then populate it */
|
|
data = buf + bufsize - 2;
|
|
while (data > buf) {
|
|
entry->ptr = --data;
|
|
i = data[0] ^ data[1] ^ (data[2] << hshift);
|
|
entry->next = hash[i];
|
|
hash[i] = entry++;
|
|
}
|
|
|
|
return hash;
|
|
}
|
|
|
|
/* provide the size of the copy opcode given the block offset and size */
|
|
#define COPYOP_SIZE(o, s) \
|
|
(!!(o & 0xff) + !!(o & 0xff00) + !!(o & 0xff0000) + !!(o & 0xff000000) + \
|
|
!!(s & 0xff) + !!(s & 0xff00) + 1)
|
|
|
|
/* the maximum size for any opcode */
|
|
#define MAX_OP_SIZE COPYOP_SIZE(0xffffffff, 0xffffffff)
|
|
|
|
void *diff_delta(void *from_buf, unsigned long from_size,
|
|
void *to_buf, unsigned long to_size,
|
|
unsigned long *delta_size,
|
|
unsigned long max_size)
|
|
{
|
|
unsigned int i, outpos, outsize, inscnt, hash_shift;
|
|
const unsigned char *ref_data, *ref_top, *data, *top;
|
|
unsigned char *out;
|
|
struct index *entry, **hash;
|
|
|
|
if (!from_size || !to_size)
|
|
return NULL;
|
|
hash = delta_index(from_buf, from_size, &hash_shift);
|
|
if (!hash)
|
|
return NULL;
|
|
|
|
outpos = 0;
|
|
outsize = 8192;
|
|
if (max_size && outsize >= max_size)
|
|
outsize = max_size + MAX_OP_SIZE + 1;
|
|
out = malloc(outsize);
|
|
if (!out) {
|
|
free(hash);
|
|
return NULL;
|
|
}
|
|
|
|
ref_data = from_buf;
|
|
ref_top = from_buf + from_size;
|
|
data = to_buf;
|
|
top = to_buf + to_size;
|
|
|
|
/* store reference buffer size */
|
|
out[outpos++] = from_size;
|
|
from_size >>= 7;
|
|
while (from_size) {
|
|
out[outpos - 1] |= 0x80;
|
|
out[outpos++] = from_size;
|
|
from_size >>= 7;
|
|
}
|
|
|
|
/* store target buffer size */
|
|
out[outpos++] = to_size;
|
|
to_size >>= 7;
|
|
while (to_size) {
|
|
out[outpos - 1] |= 0x80;
|
|
out[outpos++] = to_size;
|
|
to_size >>= 7;
|
|
}
|
|
|
|
inscnt = 0;
|
|
|
|
while (data < top) {
|
|
unsigned int moff = 0, msize = 0;
|
|
if (data + 2 < top) {
|
|
i = data[0] ^ data[1] ^ (data[2] << hash_shift);
|
|
for (entry = hash[i]; entry; entry = entry->next) {
|
|
const unsigned char *ref = entry->ptr;
|
|
const unsigned char *src = data;
|
|
unsigned int ref_size = ref_top - ref;
|
|
if (ref_size > top - src)
|
|
ref_size = top - src;
|
|
if (ref_size > 0x10000)
|
|
ref_size = 0x10000;
|
|
if (ref_size <= msize)
|
|
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;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!msize || msize < COPYOP_SIZE(moff, msize)) {
|
|
if (!inscnt)
|
|
outpos++;
|
|
out[outpos++] = *data++;
|
|
inscnt++;
|
|
if (inscnt == 0x7f) {
|
|
out[outpos - inscnt - 1] = inscnt;
|
|
inscnt = 0;
|
|
}
|
|
} else {
|
|
unsigned char *op;
|
|
|
|
if (inscnt) {
|
|
out[outpos - inscnt - 1] = inscnt;
|
|
inscnt = 0;
|
|
}
|
|
|
|
data += msize;
|
|
op = out + outpos++;
|
|
i = 0x80;
|
|
|
|
if (moff & 0xff) { out[outpos++] = moff; i |= 0x01; }
|
|
moff >>= 8;
|
|
if (moff & 0xff) { out[outpos++] = moff; i |= 0x02; }
|
|
moff >>= 8;
|
|
if (moff & 0xff) { out[outpos++] = moff; i |= 0x04; }
|
|
moff >>= 8;
|
|
if (moff & 0xff) { out[outpos++] = moff; i |= 0x08; }
|
|
|
|
if (msize & 0xff) { out[outpos++] = msize; i |= 0x10; }
|
|
msize >>= 8;
|
|
if (msize & 0xff) { out[outpos++] = msize; i |= 0x20; }
|
|
|
|
*op = i;
|
|
}
|
|
|
|
if (outpos >= outsize - MAX_OP_SIZE) {
|
|
void *tmp = out;
|
|
outsize = outsize * 3 / 2;
|
|
if (max_size && outsize >= max_size)
|
|
outsize = max_size + MAX_OP_SIZE + 1;
|
|
if (max_size && outpos > max_size)
|
|
out = NULL;
|
|
else
|
|
out = realloc(out, outsize);
|
|
if (!out) {
|
|
free(tmp);
|
|
free(hash);
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (inscnt)
|
|
out[outpos - inscnt - 1] = inscnt;
|
|
|
|
free(hash);
|
|
*delta_size = outpos;
|
|
return out;
|
|
}
|