mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Patch #416953: Cache ASCII characters to speed up ASCII decoding.

Browse source
This commit is contained in:
Martin v. Löwis 2001-04-18 12:49:15 +00:00
parent f3848322ff
commit da3dc5b892
1 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Objects/unicodeobject.c
View file

@ -90,6 +90,8 @@ static PyUnicodeObject *unicode_empty;
static PyUnicodeObject *unicode_freelist; static PyUnicodeObject *unicode_freelist;
static int unicode_freelist_size; static int unicode_freelist_size;
static PyUnicodeObject *unicode_ascii[128];
/* Default encoding to use and assume when NULL is passed as encoding /* Default encoding to use and assume when NULL is passed as encoding
parameter; it is initialized by _PyUnicode_Init(). parameter; it is initialized by _PyUnicode_Init().
@ -251,6 +253,19 @@ PyObject *PyUnicode_FromUnicode(const Py_UNICODE *u,
{ {
PyUnicodeObject *unicode; PyUnicodeObject *unicode;
if (size == 1 && *u < 128) {
unicode = unicode_ascii[*u];
if (!unicode) {
unicode = _PyUnicode_New(1);
unicode->str[0] = *u;
if (!unicode)
return NULL;
unicode_ascii[*u] = unicode;
}
Py_INCREF(unicode);
return (PyObject*)unicode;
}
unicode = _PyUnicode_New(size); unicode = _PyUnicode_New(size);
if (!unicode) if (!unicode)
return NULL; return NULL;
@ -1655,6 +1670,11 @@ PyObject *PyUnicode_DecodeASCII(const char *s,
{ {
PyUnicodeObject *v; PyUnicodeObject *v;
Py_UNICODE *p; Py_UNICODE *p;
if (size == 1 && *(unsigned char*)s < 128) {
Py_UNICODE r = *(unsigned char*)s;
return PyUnicode_FromUnicode(&r, 1);
}
/* ASCII is equivalent to the first 128 ordinals in Unicode. */ /* ASCII is equivalent to the first 128 ordinals in Unicode. */
v = _PyUnicode_New(size); v = _PyUnicode_New(size);
@ -5189,6 +5209,8 @@ PyTypeObject PyUnicode_Type = {
void _PyUnicode_Init(void) void _PyUnicode_Init(void)
{ {
int i;
/* Doublecheck the configuration... */ /* Doublecheck the configuration... */
if (sizeof(Py_UNICODE) != 2) if (sizeof(Py_UNICODE) != 2)
Py_FatalError("Unicode configuration error: " Py_FatalError("Unicode configuration error: "
@ -5199,6 +5221,9 @@ void _PyUnicode_Init(void)
unicode_freelist_size = 0; unicode_freelist_size = 0;
unicode_empty = _PyUnicode_New(0); unicode_empty = _PyUnicode_New(0);
strcpy(unicode_default_encoding, "ascii"); strcpy(unicode_default_encoding, "ascii");
for (i = 0; i < 128; i++)
unicode_ascii[i] = NULL;
} }
/* Finalize the Unicode implementation */ /* Finalize the Unicode implementation */
@ -5207,10 +5232,18 @@ void
_PyUnicode_Fini(void) _PyUnicode_Fini(void)
{ {
PyUnicodeObject *u; PyUnicodeObject *u;
int i;
Py_XDECREF(unicode_empty); Py_XDECREF(unicode_empty);
unicode_empty = NULL; unicode_empty = NULL;
for (i = 0; i < 128; i++) {
if (unicode_ascii[i]) {
Py_DECREF(unicode_ascii[i]);
unicode_ascii[i] = NULL;
}
}
for (u = unicode_freelist; u != NULL;) { for (u = unicode_freelist; u != NULL;) {
PyUnicodeObject *v = u; PyUnicodeObject *v = u;
u = *(PyUnicodeObject **)u; u = *(PyUnicodeObject **)u;