##// END OF EJS Templates
dirstate.changes() now distinguishes 'hg remove'd or just deleted files....
dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Interface is not yet changed. Non-regular files are considered to be removed or deleted. Removed the unneeded match(fn) call for adding to the unknown list.

File last commit:

r597:e530637e default
r861:cbe5c4d0 default
Show More
mpatch.c
331 lines | 6.7 KiB | text/x-c | CLexer
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 /*
mpatch.c - efficient binary patching for Mercurial
This implements a patch algorithm that's O(m + nlog n) where m is the
size of the output and n is the number of patches.
Given a list of binary patches, it unpacks each into a hunk list,
then combines the hunk lists with a treewise recursion to form a
single hunk list. This hunk list is then applied to the original
text.
The text (or binary) fragments are copied directly from their source
Python objects into a preallocated output string to avoid the
allocation of intermediate Python objects. Working memory is about 2x
the total number of hunks.
Copyright 2005 Matt Mackall <mpm@selenic.com>
This software may be used and distributed according to the terms
of the GNU General Public License, incorporated herein by reference.
*/
#include <Python.h>
#include <stdlib.h>
#include <string.h>
mpm@selenic.com
Make mpatch.c compilable under the other `OS'...
r410 #ifdef _WIN32
mpm@selenic.com
[PATCH] bdiff/mpatch under MSVC...
r551 #ifdef _MSC_VER
#define inline __inline
typedef unsigned long uint32_t;
#else
mpm@selenic.com
More fiddling with uint32_t includes for extensions...
r510 #include <stdint.h>
mpm@selenic.com
[PATCH] bdiff/mpatch under MSVC...
r551 #endif
mpm@selenic.com
Add 'other OS' bits to bdiff.c / style cleanups...
r411 static uint32_t ntohl(uint32_t x)
{
return ((x & 0x000000ffUL) << 24) |
((x & 0x0000ff00UL) << 8) |
((x & 0x00ff0000UL) >> 8) |
((x & 0xff000000UL) >> 24);
mpm@selenic.com
Make mpatch.c compilable under the other `OS'...
r410 }
#else
mpm@selenic.com
More fiddling with uint32_t includes for extensions...
r510 #include <sys/types.h>
mpm@selenic.com
[PATCH] use <arpa/inet.h> instead of <netinet/in.h> for ntohl/htonl...
r597 #include <arpa/inet.h>
mpm@selenic.com
Make mpatch.c compilable under the other `OS'...
r410 #endif
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72
static char mpatch_doc[] = "Efficient binary patching.";
struct frag {
int start, end, len;
char *data;
};
struct flist {
struct frag *base, *head, *tail;
};
static struct flist *lalloc(int size)
{
mpm@selenic.com
Add safety checking to mpatch
r128 struct flist *a = NULL;
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72
a = malloc(sizeof(struct flist));
mpm@selenic.com
Add safety checking to mpatch
r128 if (a) {
a->base = malloc(sizeof(struct frag) * size);
mpm@selenic.com
mpatch: properly NULL out return in lalloc...
r282 if (!a->base) {
mpm@selenic.com
Add safety checking to mpatch
r128 free(a);
mpm@selenic.com
mpatch: properly NULL out return in lalloc...
r282 a = NULL;
} else
mpm@selenic.com
Add safety checking to mpatch
r128 a->head = a->tail = a->base;
}
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 return a;
}
static void lfree(struct flist *a)
{
mpm@selenic.com
Add safety checking to mpatch
r128 if (a) {
free(a->base);
free(a);
}
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 }
static int lsize(struct flist *a)
{
return a->tail - a->head;
}
/* move hunks in source that are less cut to dest, compensating
for changes in offset. the last hunk may be split if necessary.
*/
static int gather(struct flist *dest, struct flist *src, int cut, int offset)
{
struct frag *d = dest->tail, *s = src->head;
int postend, c, l;
while (s != src->tail) {
if (s->start + offset >= cut)
mpm@selenic.com
Gotos are embarrassing.
r82 break; /* we've gone far enough */
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72
postend = offset + s->start + s->len;
if (postend <= cut) {
/* save this hunk */
offset += s->start + s->len - s->end;
*d++ = *s++;
}
else {
/* break up this hunk */
c = cut - offset;
if (s->end < c)
c = s->end;
l = cut - offset - s->start;
if (s->len < l)
l = s->len;
offset += s->start + l - c;
d->start = s->start;
d->end = c;
d->len = l;
d->data = s->data;
d++;
s->start = c;
s->len = s->len - l;
s->data = s->data + l;
mpm@selenic.com
Gotos are embarrassing.
r82 break;
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 }
}
dest->tail = d;
src->head = s;
return offset;
}
/* like gather, but with no output list */
static int discard(struct flist *src, int cut, int offset)
{
struct frag *s = src->head;
int postend, c, l;
while (s != src->tail) {
if (s->start + offset >= cut)
mpm@selenic.com
Gotos are embarrassing.
r82 break;
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72
postend = offset + s->start + s->len;
if (postend <= cut) {
offset += s->start + s->len - s->end;
s++;
}
else {
c = cut - offset;
if (s->end < c)
c = s->end;
l = cut - offset - s->start;
if (s->len < l)
l = s->len;
offset += s->start + l - c;
s->start = c;
s->len = s->len - l;
s->data = s->data + l;
mpm@selenic.com
Gotos are embarrassing.
r82 break;
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 }
}
src->head = s;
return offset;
}
/* combine hunk lists a and b, while adjusting b for offset changes in a/
this deletes a and b and returns the resultant list. */
static struct flist *combine(struct flist *a, struct flist *b)
{
mpm@selenic.com
Add safety checking to mpatch
r128 struct flist *c = NULL;
struct frag *bh, *ct;
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 int offset = 0, post;
mpm@selenic.com
Add safety checking to mpatch
r128 if (a && b)
c = lalloc((lsize(a) + lsize(b)) * 2);
if (c) {
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72
mpm@selenic.com
Add safety checking to mpatch
r128 for (bh = b->head; bh != b->tail; bh++) {
/* save old hunks */
offset = gather(c, a, bh->start, offset);
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72
mpm@selenic.com
Add safety checking to mpatch
r128 /* discard replaced hunks */
post = discard(a, bh->end, offset);
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72
mpm@selenic.com
Add safety checking to mpatch
r128 /* insert new hunk */
ct = c->tail;
ct->start = bh->start - offset;
ct->end = bh->end - post;
ct->len = bh->len;
ct->data = bh->data;
c->tail++;
offset = post;
}
/* hold on to tail from a */
memcpy(c->tail, a->head, sizeof(struct frag) * lsize(a));
c->tail += lsize(a);
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 }
lfree(a);
lfree(b);
return c;
}
/* decode a binary patch into a hunk list */
static struct flist *decode(char *bin, int len)
{
struct flist *l;
struct frag *lt;
char *end = bin + len;
mpm@selenic.com
mpatch: attempt to handle unpack alignment issues on Solaris...
r384 char decode[12]; /* for dealing with alignment issues */
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72
/* assume worst case size, we won't have many of these lists */
l = lalloc(len / 12);
lt = l->tail;
while (bin < end) {
mpm@selenic.com
mpatch: attempt to handle unpack alignment issues on Solaris...
r384 memcpy(decode, bin, 12);
lt->start = ntohl(*(uint32_t *)decode);
lt->end = ntohl(*(uint32_t *)(decode + 4));
lt->len = ntohl(*(uint32_t *)(decode + 8));
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 lt->data = bin + 12;
bin += 12 + lt->len;
lt++;
}
l->tail = lt;
return l;
}
/* calculate the size of resultant text */
static int calcsize(int len, struct flist *l)
{
int outlen = 0, last = 0;
struct frag *f = l->head;
while (f != l->tail) {
outlen += f->start - last;
last = f->end;
outlen += f->len;
f++;
}
outlen += len - last;
return outlen;
}
static void apply(char *buf, char *orig, int len, struct flist *l)
{
struct frag *f = l->head;
int last = 0;
char *p = buf;
while (f != l->tail) {
memcpy(p, orig + last, f->start - last);
p += f->start - last;
memcpy(p, f->data, f->len);
last = f->end;
p += f->len;
f++;
}
memcpy(p, orig + last, len - last);
}
/* recursively generate a patch of all bins between start and end */
static struct flist *fold(PyObject *bins, int start, int end)
{
int len;
if (start + 1 == end) {
/* trivial case, output a decoded list */
PyObject *tmp = PyList_GetItem(bins, start);
mpm@selenic.com
Add safety checking to mpatch
r128 if (!tmp)
return NULL;
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 return decode(PyString_AsString(tmp), PyString_Size(tmp));
}
/* divide and conquer, memory management is elsewhere */
len = (end - start) / 2;
return combine(fold(bins, start, start + len),
fold(bins, start + len, end));
}
static PyObject *
patches(PyObject *self, PyObject *args)
{
PyObject *text, *bins, *result;
struct flist *patch;
char *in, *out;
int len, outlen;
mpm@selenic.com
Add safety checking to mpatch
r128 if (!PyArg_ParseTuple(args, "SO:mpatch", &text, &bins))
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 return NULL;
len = PyList_Size(bins);
if (!len) {
/* nothing to do */
Py_INCREF(text);
return text;
}
patch = fold(bins, 0, len);
mpm@selenic.com
Add safety checking to mpatch
r128 if (!patch)
return PyErr_NoMemory();
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 outlen = calcsize(PyString_Size(text), patch);
result = PyString_FromStringAndSize(NULL, outlen);
mpm@selenic.com
Add safety checking to mpatch
r128 if (result) {
in = PyString_AsString(text);
out = PyString_AsString(result);
apply(out, in, PyString_Size(text), patch);
}
mpm@selenic.com
Add an O(m + nlog n) patching extension
r72 lfree(patch);
return result;
}
static PyMethodDef methods[] = {
{"patches", patches, METH_VARARGS, "apply a series of patches\n"},
{NULL, NULL}
};
PyMODINIT_FUNC
initmpatch(void)
{
Py_InitModule3("mpatch", methods, mpatch_doc);
}