FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-148675: Optimize arraydescr structure: use char[3] by vstinner · Pull Request #149455 · python/cpython · GitHub

/ cpython Public
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
14 changes: 7 additions & 7 deletions Modules/arraymodule.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static struct PyModuleDef arraymodule;
* functions aren't visible yet.
*/
struct arraydescr {
const char *typecode;
char typecode[3]; // big enough to store "Zd\0"
int itemsize;
PyObject * (*getitem)(struct arrayobject *, Py_ssize_t);
int (*setitem)(struct arrayobject *, Py_ssize_t, PyObject *);
Expand Down Expand Up @@ -784,7 +784,7 @@ static const struct arraydescr descriptors[] = {
{"d", sizeof(double), d_getitem, d_setitem, NULL, 0, 0},
{"Zf", 2*sizeof(float), cf_getitem, cf_setitem, NULL, 0, 0},
{"Zd", 2*sizeof(double), cd_getitem, cd_setitem, NULL, 0, 0},
{NULL, 0, 0, 0, 0, 0, 0} /* Sentinel */
{"", 0, 0, 0, 0, 0, 0} /* Sentinel */
};

/****************************************************************************
Expand Down Expand Up @@ -2298,12 +2298,12 @@ array__array_reconstructor_impl(PyObject *module, PyTypeObject *arraytype,
arraytype->tp_name, state->ArrayType->tp_name);
return NULL;
}
for (descr = descriptors; descr->typecode != NULL; descr++) {
for (descr = descriptors; descr->typecode[0] != 0; descr++) {
if (strcmp(descr->typecode, typecode) == 0) {
break;
}
}
if (descr->typecode == NULL) {
if (descr->typecode[0] == 0) {
PyErr_SetString(PyExc_ValueError,
"second argument must be a valid type code");
return NULL;
Expand Down Expand Up @@ -2500,7 +2500,7 @@ array__array_reconstructor_impl(PyObject *module, PyTypeObject *arraytype,
*
* XXX: Is it possible to write a unit test for this?
*/
for (descr = descriptors; descr->typecode != NULL; descr++) {
for (descr = descriptors; descr->typecode[0] != 0; descr++) {
if (descr->is_integer_type &&
(size_t)descr->itemsize == mf_descr.size &&
descr->is_signed == mf_descr.is_signed)
Expand Down Expand Up @@ -3047,7 +3047,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
*/
initial = NULL;
}
for (descr = descriptors; descr->typecode != NULL; descr++) {
for (descr = descriptors; descr->typecode[0] != 0; descr++) {
if (strcmp(descr->typecode, s) == 0) {
PyObject *a;
Py_ssize_t len;
Expand Down Expand Up @@ -3531,7 +3531,7 @@ array_modexec(PyObject *m)
if (typecodes == NULL) {
return -1;
}
for (descr = descriptors; descr->typecode != NULL; descr++) {
for (descr = descriptors; descr->typecode[0] != 0; descr++) {
PyObject *typecode = PyUnicode_DecodeASCII(descr->typecode, strlen(descr->typecode), NULL);
if (typecode == NULL) {
Py_DECREF(typecodes);
Expand Down
Loading

Back | FazBrowse Home | New Git URL