##// END OF EJS Templates
streamclone: clear caches after writing changes into files for visibility...
streamclone: clear caches after writing changes into files for visibility Before this patch, streamclone-ed changes are invisible via @filecache properties to in-process procedures before closing transaction (e.g. pretxnclose python hook), if corresponded property is cached before consumev1(). Strictly speaking, caching should occur inside (store) lock for transaction. repo.invalidate() after closing transaction is too late to force @filecache properties to be reloaded from changed files at next access. For visibility of streamclone-ed changes to in-process procedures before closing transaction, this patch clears caches just after writing changes into files. BTW, regardless of changing in this patch, clearing cached properties in consumev1() causes inconsistency, if (1) transaction is started and (2) any @filecache property is changed before consumev1(). This patch also adds the comment to fix this (potential) inconsistency in the future.

File last commit:

r29749:155f0cc3 default
r29919:519a0226 default
Show More
mpatch_module.c
195 lines | 4.3 KiB | text/x-c | CLexer
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 /*
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, 2006 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.
*/
#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include <stdlib.h>
#include <string.h>
#include "util.h"
#include "bitmanipulation.h"
#include "compat.h"
#include "mpatch.h"
static char mpatch_doc[] = "Efficient binary patching.";
static PyObject *mpatch_Error;
Yuya Nishihara
mpatch: raise MemoryError instead of mpatchError if lalloc() failed...
r29749 static void setpyerr(int r)
{
switch (r) {
case MPATCH_ERR_NO_MEM:
PyErr_NoMemory();
break;
case MPATCH_ERR_CANNOT_BE_DECODED:
PyErr_SetString(mpatch_Error, "patch cannot be decoded");
break;
case MPATCH_ERR_INVALID_PATCH:
PyErr_SetString(mpatch_Error, "invalid patch");
break;
}
}
Maciej Fijalkowski
mpatch: remove dependency on Python.h in mpatch.c...
r29694 struct mpatch_flist *cpygetitem(void *bins, ssize_t pos)
{
const char *buffer;
struct mpatch_flist *res;
ssize_t blen;
int r;
PyObject *tmp = PyList_GetItem((PyObject*)bins, pos);
if (!tmp)
return NULL;
if (PyObject_AsCharBuffer(tmp, &buffer, (Py_ssize_t*)&blen))
return NULL;
if ((r = mpatch_decode(buffer, blen, &res)) < 0) {
if (!PyErr_Occurred())
Yuya Nishihara
mpatch: raise MemoryError instead of mpatchError if lalloc() failed...
r29749 setpyerr(r);
Yuya Nishihara
mpatch: remove superfluous whitespaces
r29740 return NULL;
Maciej Fijalkowski
mpatch: remove dependency on Python.h in mpatch.c...
r29694 }
return res;
}
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 static PyObject *
patches(PyObject *self, PyObject *args)
{
PyObject *text, *bins, *result;
struct mpatch_flist *patch;
const char *in;
Yuya Nishihara
mpatch: silence warning about maybe-uninitialized variable...
r29742 int r = 0;
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 char *out;
Py_ssize_t len, outlen, inlen;
if (!PyArg_ParseTuple(args, "OO:mpatch", &text, &bins))
return NULL;
len = PyList_Size(bins);
if (!len) {
/* nothing to do */
Py_INCREF(text);
return text;
}
if (PyObject_AsCharBuffer(text, &in, &inlen))
return NULL;
Maciej Fijalkowski
mpatch: remove dependency on Python.h in mpatch.c...
r29694 patch = mpatch_fold(bins, cpygetitem, 0, len);
if (!patch) { /* error already set or memory error */
if (!PyErr_Occurred())
PyErr_NoMemory();
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 return NULL;
Maciej Fijalkowski
mpatch: remove dependency on Python.h in mpatch.c...
r29694 }
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693
outlen = mpatch_calcsize(inlen, patch);
if (outlen < 0) {
Maciej Fijalkowski
mpatch: remove dependency on Python.h in mpatch.c...
r29694 r = (int)outlen;
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 result = NULL;
goto cleanup;
}
result = PyBytes_FromStringAndSize(NULL, outlen);
if (!result) {
result = NULL;
goto cleanup;
}
out = PyBytes_AsString(result);
Maciej Fijalkowski
mpatch: remove dependency on Python.h in mpatch.c...
r29694 if ((r = mpatch_apply(out, in, inlen, patch)) < 0) {
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 Py_DECREF(result);
result = NULL;
}
cleanup:
mpatch_lfree(patch);
Maciej Fijalkowski
mpatch: remove dependency on Python.h in mpatch.c...
r29694 if (!result && !PyErr_Occurred())
Yuya Nishihara
mpatch: raise MemoryError instead of mpatchError if lalloc() failed...
r29749 setpyerr(r);
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 return result;
}
/* calculate size of a patched file directly */
static PyObject *
patchedsize(PyObject *self, PyObject *args)
{
long orig, start, end, len, outlen = 0, last = 0, pos = 0;
Py_ssize_t patchlen;
char *bin;
if (!PyArg_ParseTuple(args, "ls#", &orig, &bin, &patchlen))
return NULL;
while (pos >= 0 && pos < patchlen) {
start = getbe32(bin + pos);
end = getbe32(bin + pos + 4);
len = getbe32(bin + pos + 8);
if (start > end)
break; /* sanity check */
pos += 12 + len;
outlen += start - last;
last = end;
outlen += len;
}
if (pos != patchlen) {
if (!PyErr_Occurred())
PyErr_SetString(mpatch_Error, "patch cannot be decoded");
return NULL;
}
outlen += orig - last;
return Py_BuildValue("l", outlen);
}
static PyMethodDef methods[] = {
{"patches", patches, METH_VARARGS, "apply a series of patches\n"},
{"patchedsize", patchedsize, METH_VARARGS, "calculed patched size\n"},
{NULL, NULL}
};
#ifdef IS_PY3K
static struct PyModuleDef mpatch_module = {
PyModuleDef_HEAD_INIT,
"mpatch",
mpatch_doc,
-1,
methods
};
PyMODINIT_FUNC PyInit_mpatch(void)
{
PyObject *m;
m = PyModule_Create(&mpatch_module);
if (m == NULL)
return NULL;
mpatch_Error = PyErr_NewException("mercurial.mpatch.mpatchError",
NULL, NULL);
Py_INCREF(mpatch_Error);
PyModule_AddObject(m, "mpatchError", mpatch_Error);
return m;
}
#else
PyMODINIT_FUNC
initmpatch(void)
{
Py_InitModule3("mpatch", methods, mpatch_doc);
mpatch_Error = PyErr_NewException("mercurial.mpatch.mpatchError",
NULL, NULL);
}
#endif