##// END OF EJS Templates
branchmap-v3: filter topo heads using node for performance reason...
branchmap-v3: filter topo heads using node for performance reason The branchmap currently contains heads as nodeid. If we build a set of revnum with the topological heads, we need to turn the nodeid in the branchmap to revnum to be able to check if they are topo-heads. That nodeid → revnum lookup is "expensive" and adds up to something noticeable if you do it hundreds of thousand of time. Instead we turn all the topo-heads revnums into nodes and build a set. So we can directly test membership of the nodeids stored in the branchmap. That is much faster. Ideally we would have revnum in the branchmap and could directly test revnum against a revnum set and that would be even faster. However that's an adventure for another time. Without this change, the branchmap format "v3" was significantly slower than the "v2" format. With this changes, some of that gap is recovered With rust + persistent nodemap, this overhead was smaller because the extra lookup did not had to to build the nodemap from scratch. In addition the mozilla-unified repository is able to use the "pure_top" mode of branchmap v3, so it was not really affected by this. Future changeset will work of the remaining of the performance gap. ### benchmark.name = hg.command.unbundle # bin-env-vars.hg.py-re2-module = default # benchmark.variants.issue6528 = disabled # benchmark.variants.resource-usage = default # benchmark.variants.reuse-external-delta-parent = yes # benchmark.variants.revs = any-1-extra-rev # benchmark.variants.source = unbundle # benchmark.variants.validate = default # benchmark.variants.verbosity = quiet ## data-env-vars.name = netbeans-2018-08-01-zstd-sparse-revlog # bin-env-vars.hg.flavor = default branch-v2: 0.233711 ~~~~~ branch-v3 before: 0.380994 (+63.02%, +0.15) branch-v3 after: 0.368769 (+57.79%, +0.14) # bin-env-vars.hg.flavor = rust branch-v2: 0.235230 ~~~~~ branch-v3 before: 0.385060 (+63.70%, +0.15) branch-v3 after: 0.372460 (+58.34%, +0.14) ## data-env-vars.name = netbeans-2018-08-01-ds2-pnm # bin-env-vars.hg.flavor = rust branch-v2: 0.255586 ~~~~~ branch-v3 before: 0.317524 (+24.23%, +0.06) branch-v3 after: 0.318907 (+24.78%, +0.06) ## data-env-vars.name = mozilla-central-2024-03-22-zstd-sparse-revlog # bin-env-vars.hg.flavor = default branch-v2: 0.339010 ~~~~~ branch-v3 before: 0.410007 (+20.94%, +0.07) branch-v3 after: 0.349752 (+3.17%, +0.01) # bin-env-vars.hg.flavor = rust branch-v2: 0.346525 ~~~~~ branch-v3 before: 0.410428 (+18.44%, +0.06) branch-v3 after: 0.354300 (+2.24%, +0.01) ## data-env-vars.name = mozilla-central-2024-03-22-ds2-pnm # bin-env-vars.hg.flavor = rust branch-v2: 0.380202 ~~~~~ branch-v3 before: 0.393871 (+3.60%, +0.01) branch-v3 after: 0.396293 (+4.23%, +0.02) ## data-env-vars.name = mozilla-unified-2024-03-22-zstd-sparse-revlog # bin-env-vars.hg.flavor = default branch-v2: 0.412165 ~~~~~ branch-v3 before: 0.438105 (+6.29%, +0.03) branch-v3 after: 0.424769 (+3.06%, +0.01) # bin-env-vars.hg.flavor = rust branch-v2: 0.412397 ~~~~~ branch-v3 before: 0.438405 (+6.31%, +0.03) branch-v3 after: 0.421796 (+2.28%, +0.01) ## data-env-vars.name = mozilla-unified-2024-03-22-ds2-pnm # bin-env-vars.hg.flavor = rust branch-v2: 0.429501 ~~~~~ branch-v3 before: 0.452692 (+5.40%, +0.02) branch-v3 after: 0.443849 (+3.34%, +0.01) ## data-env-vars.name = mozilla-try-2024-03-26-zstd-sparse-revlog # bin-env-vars.hg.flavor = default branch-v2: 3.403171 ~~~~~ branch-v3 before: 6.562345 (+92.83%, +3.16) branch-v3 after: 6.234055 (+83.18%, +2.83) # bin-env-vars.hg.flavor = rust branch-v2: 3.454876 ~~~~~ branch-v3 before: 6.160248 (+78.31%, +2.71) branch-v3 after: 6.307813 (+82.58%, +2.85) ## data-env-vars.name = mozilla-try-2024-03-26-ds2-pnm # bin-env-vars.hg.flavor = rust branch-v2: 3.465435 ~~~~~ branch-v3 before: 5.381648 (+55.30%, +1.92) branch-v3 after: 5.176076 (+49.36%, +1.71)

File last commit:

r52616:9367571f default
r52869:41b8892a default
Show More
base85.c
192 lines | 3.6 KiB | text/x-c | CLexer
Yuya Nishihara
base85: switch to policy importer
r32368 /*
base85 codec
Copyright 2006 Brendan Cully <brendan@kublai.com>
This software may be used and distributed according to the terms of
the GNU General Public License, incorporated herein by reference.
Largely based on git's implementation
*/
#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "util.h"
Augie Fackler
base85: allow clang-format oversight...
r36244 static const char b85chars[] =
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~";
Yuya Nishihara
base85: switch to policy importer
r32368 static char b85dec[256];
static void b85prep(void)
{
unsigned i;
memset(b85dec, 0, sizeof(b85dec));
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 for (i = 0; i < sizeof(b85chars); i++) {
Yuya Nishihara
base85: switch to policy importer
r32368 b85dec[(int)(b85chars[i])] = i + 1;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
base85: switch to policy importer
r32368 }
static PyObject *b85encode(PyObject *self, PyObject *args)
{
const unsigned char *text;
PyObject *out;
char *dst;
Py_ssize_t len, olen, i;
unsigned int acc, val, ch;
int pad = 0;
Matt Harbison
cext: correct the argument handling of `b85encode()`...
r52616 if (!PyArg_ParseTuple(args, "y#|p", &text, &len, &pad)) {
Yuya Nishihara
base85: switch to policy importer
r32368 return NULL;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
base85: switch to policy importer
r32368
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (pad) {
Yuya Nishihara
base85: switch to policy importer
r32368 olen = ((len + 3) / 4 * 5) - 3;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 } else {
Yuya Nishihara
base85: switch to policy importer
r32368 olen = len % 4;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (olen) {
Yuya Nishihara
base85: switch to policy importer
r32368 olen++;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
base85: switch to policy importer
r32368 olen += len / 4 * 5;
}
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!(out = PyBytes_FromStringAndSize(NULL, olen + 3))) {
Yuya Nishihara
base85: switch to policy importer
r32368 return NULL;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
base85: switch to policy importer
r32368
dst = PyBytes_AsString(out);
while (len) {
acc = 0;
for (i = 24; i >= 0; i -= 8) {
ch = *text++;
acc |= ch << i;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (--len == 0) {
Yuya Nishihara
base85: switch to policy importer
r32368 break;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
base85: switch to policy importer
r32368 }
for (i = 4; i >= 0; i--) {
val = acc % 85;
acc /= 85;
dst[i] = b85chars[val];
}
dst += 5;
}
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!pad) {
Yuya Nishihara
base85: switch to policy importer
r32368 _PyBytes_Resize(&out, olen);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
base85: switch to policy importer
r32368
return out;
}
static PyObject *b85decode(PyObject *self, PyObject *args)
{
Yuya Nishihara
base85: fix leak on error return from b85decode()...
r39483 PyObject *out = NULL;
Yuya Nishihara
base85: switch to policy importer
r32368 const char *text;
char *dst;
Py_ssize_t len, i, j, olen, cap;
int c;
unsigned int acc;
Gregory Szorc
cext: remove PY23()...
r49676 if (!PyArg_ParseTuple(args, "y#", &text, &len)) {
Yuya Nishihara
base85: switch to policy importer
r32368 return NULL;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
base85: switch to policy importer
r32368
olen = len / 5 * 4;
i = len % 5;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (i) {
Yuya Nishihara
base85: switch to policy importer
r32368 olen += i - 1;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (!(out = PyBytes_FromStringAndSize(NULL, olen))) {
Yuya Nishihara
base85: switch to policy importer
r32368 return NULL;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
base85: switch to policy importer
r32368
dst = PyBytes_AsString(out);
i = 0;
Gregory Szorc
cext: move braces for control statements to same line...
r34438 while (i < len) {
Yuya Nishihara
base85: switch to policy importer
r32368 acc = 0;
cap = len - i - 1;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (cap > 4) {
Yuya Nishihara
base85: switch to policy importer
r32368 cap = 4;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Gregory Szorc
cext: move braces for control statements to same line...
r34438 for (j = 0; j < cap; i++, j++) {
Yuya Nishihara
base85: switch to policy importer
r32368 c = b85dec[(int)*text++] - 1;
Yuya Nishihara
base85: fix leak on error return from b85decode()...
r39483 if (c < 0) {
PyErr_Format(
Augie Fackler
base85: allow clang-format oversight...
r36244 PyExc_ValueError,
"bad base85 character at position %d",
(int)i);
Yuya Nishihara
base85: fix leak on error return from b85decode()...
r39483 goto bail;
}
Yuya Nishihara
base85: switch to policy importer
r32368 acc = acc * 85 + c;
}
Gregory Szorc
cext: move braces for control statements to same line...
r34438 if (i++ < len) {
Yuya Nishihara
base85: switch to policy importer
r32368 c = b85dec[(int)*text++] - 1;
Yuya Nishihara
base85: fix leak on error return from b85decode()...
r39483 if (c < 0) {
PyErr_Format(
Augie Fackler
base85: allow clang-format oversight...
r36244 PyExc_ValueError,
"bad base85 character at position %d",
(int)i);
Yuya Nishihara
base85: fix leak on error return from b85decode()...
r39483 goto bail;
}
Yuya Nishihara
base85: switch to policy importer
r32368 /* overflow detection: 0xffffffff == "|NsC0",
* "|NsC" == 0x03030303 */
Yuya Nishihara
base85: fix leak on error return from b85decode()...
r39483 if (acc > 0x03030303 || (acc *= 85) > 0xffffffff - c) {
PyErr_Format(
Augie Fackler
base85: allow clang-format oversight...
r36244 PyExc_ValueError,
"bad base85 sequence at position %d",
(int)i);
Yuya Nishihara
base85: fix leak on error return from b85decode()...
r39483 goto bail;
}
Yuya Nishihara
base85: switch to policy importer
r32368 acc += c;
}
cap = olen < 4 ? olen : 4;
olen -= cap;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 for (j = 0; j < 4 - cap; j++) {
Yuya Nishihara
base85: switch to policy importer
r32368 acc *= 85;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (cap && cap < 4) {
Yuya Nishihara
base85: switch to policy importer
r32368 acc += 0xffffff >> (cap - 1) * 8;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Gregory Szorc
cext: move braces for control statements to same line...
r34438 for (j = 0; j < cap; j++) {
Yuya Nishihara
base85: switch to policy importer
r32368 acc = (acc << 8) | (acc >> 24);
*dst++ = acc;
}
}
return out;
Yuya Nishihara
base85: fix leak on error return from b85decode()...
r39483 bail:
Py_XDECREF(out);
return NULL;
Yuya Nishihara
base85: switch to policy importer
r32368 }
static char base85_doc[] = "Base85 Data Encoding";
static PyMethodDef methods[] = {
Augie Fackler
base85: allow clang-format oversight...
r36244 {"b85encode", b85encode, METH_VARARGS,
"Encode text in base85.\n\n"
"If the second parameter is true, pad the result to a multiple of "
"five characters.\n"},
{"b85decode", b85decode, METH_VARARGS, "Decode base85 text.\n"},
{NULL, NULL},
Yuya Nishihara
base85: switch to policy importer
r32368 };
static const int version = 1;
static struct PyModuleDef base85_module = {
Augie Fackler
base85: allow clang-format oversight...
r36244 PyModuleDef_HEAD_INIT, "base85", base85_doc, -1, methods,
Yuya Nishihara
base85: switch to policy importer
r32368 };
PyMODINIT_FUNC PyInit_base85(void)
{
PyObject *m;
b85prep();
m = PyModule_Create(&base85_module);
PyModule_AddIntConstant(m, "version", version);
return m;
}