mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #29383: reduce temporary interned unicode

Browse source 
add_methods(), add_members(), and add_getset() used PyDict_SetItemString()
to register descriptor to the type's dict.
So descr_new() and PyDict_SetItemString() creates interned unicode from same
C string.

This patch takes interned unicode from descriptor, and use PyDict_SetItem()
instead of PyDict_SetItemString().

python_startup_no_site:
  default: Median +- std dev: 12.7 ms +- 0.1 ms
  patched: Median +- std dev: 12.5 ms +- 0.1 ms
This commit is contained in:
INADA Naoki 2017-01-28 16:35:44 +09:00
parent 49688cdaa2
commit 35a96a25ee
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/typeobject.c
View file

@ -4539,6 +4539,7 @@ add_methods(PyTypeObject *type, PyMethodDef *meth)
for (; meth->ml_name != NULL; meth++) { for (; meth->ml_name != NULL; meth++) {
PyObject *descr; PyObject *descr;
int err; int err;
int isdescr = 1;
if (PyDict_GetItemString(dict, meth->ml_name) && if (PyDict_GetItemString(dict, meth->ml_name) &&
!(meth->ml_flags & METH_COEXIST)) !(meth->ml_flags & METH_COEXIST))
continue; continue;
@ -4555,6 +4556,7 @@ add_methods(PyTypeObject *type, PyMethodDef *meth)
if (cfunc == NULL) if (cfunc == NULL)
return -1; return -1;
descr = PyStaticMethod_New(cfunc); descr = PyStaticMethod_New(cfunc);
isdescr = 0; // PyStaticMethod is not PyDescrObject
Py_DECREF(cfunc); Py_DECREF(cfunc);
} }
else { else {
@ -4562,7 +4564,12 @@ add_methods(PyTypeObject *type, PyMethodDef *meth)
} }
if (descr == NULL) if (descr == NULL)
return -1; return -1;
err = PyDict_SetItemString(dict, meth->ml_name, descr); if (isdescr) {
err = PyDict_SetItem(dict, PyDescr_NAME(descr), descr);
}
else {
err = PyDict_SetItemString(dict, meth->ml_name, descr);
}
Py_DECREF(descr); Py_DECREF(descr);
if (err < 0) if (err < 0)
return -1; return -1;
@ -4582,7 +4589,7 @@ add_members(PyTypeObject *type, PyMemberDef *memb)
descr = PyDescr_NewMember(type, memb); descr = PyDescr_NewMember(type, memb);
if (descr == NULL) if (descr == NULL)
return -1; return -1;
if (PyDict_SetItemString(dict, memb->name, descr) < 0) { if (PyDict_SetItem(dict, PyDescr_NAME(descr), descr) < 0) {
Py_DECREF(descr); Py_DECREF(descr);
return -1; return -1;
} }
@ -4604,7 +4611,7 @@ add_getset(PyTypeObject *type, PyGetSetDef *gsp)
if (descr == NULL) if (descr == NULL)
return -1; return -1;
if (PyDict_SetItemString(dict, gsp->name, descr) < 0) { if (PyDict_SetItem(dict, PyDescr_NAME(descr), descr) < 0) {
Py_DECREF(descr); Py_DECREF(descr);
return -1; return -1;
} }