Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-30789: Use a single memory block for co_extra. #2555

Merged
merged 3 commits into from
Jul 4, 2017
Merged

bpo-30789: Use a single memory block for co_extra. #2555

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4760100
bpo-30789: Use a single memory block for co_extra.
serhiy-storchaka Jul 4, 2017
a1fbb6b
Merge branch 'master' into co_extra-single-block
serhiy-storchaka Jul 4, 2017
892bfc4
Address review comments.
serhiy-storchaka Jul 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 15 additions & 39 deletions Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/* Holder for co_extra information */
typedef struct {
Py_ssize_t ce_size;
void **ce_extras;
void *ce_extras[1];
} _PyCodeObjectExtra;

/* all_name_chars(s): true iff all chars in s are valid NAME_CHARS */
Expand Down Expand Up @@ -427,7 +427,6 @@ code_dealloc(PyCodeObject *co)
}
}

PyMem_Free(co_extra->ce_extras);
PyMem_Free(co_extra);
}

Expand Down Expand Up @@ -455,12 +454,13 @@ code_sizeof(PyCodeObject *co, void *unused)
Py_ssize_t res = _PyObject_SIZE(Py_TYPE(co));
_PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra*) co->co_extra;

if (co->co_cell2arg != NULL && co->co_cellvars != NULL)
if (co->co_cell2arg != NULL && co->co_cellvars != NULL) {
res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(Py_ssize_t);

if (co_extra != NULL)
res += co_extra->ce_size * sizeof(co_extra->ce_extras[0]);

}
if (co_extra != NULL) {
res += sizeof(_PyCodeObjectExtra) +
(co_extra->ce_size-1) * sizeof(co_extra->ce_extras[0]);
}
return PyLong_FromSsize_t(res);
}

Expand Down Expand Up @@ -863,48 +863,24 @@ _PyCode_SetExtra(PyObject *code, Py_ssize_t index, void *extra)
PyCodeObject *o = (PyCodeObject*) code;
_PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra *) o->co_extra;

if (co_extra == NULL) {
co_extra = PyMem_Malloc(sizeof(_PyCodeObjectExtra));
if (co_extra == NULL || co_extra->ce_size <= index) {
Py_ssize_t i = (co_extra == NULL ? 0 : co_extra->ce_size);
co_extra = PyMem_Realloc(
co_extra,
sizeof(_PyCodeObjectExtra) +
(interp->co_extra_user_count-1) * sizeof(void*));
if (co_extra == NULL) {
return -1;
}

co_extra->ce_extras = PyMem_Malloc(
interp->co_extra_user_count * sizeof(void*));
if (co_extra->ce_extras == NULL) {
PyMem_Free(co_extra);
return -1;
}

co_extra->ce_size = interp->co_extra_user_count;

for (Py_ssize_t i = 0; i < co_extra->ce_size; i++) {
for (; i < interp->co_extra_user_count; i++) {
co_extra->ce_extras[i] = NULL;
}

o->co_extra = co_extra;
}
else if (co_extra->ce_size <= index) {
void** ce_extras = PyMem_Realloc(
co_extra->ce_extras, interp->co_extra_user_count * sizeof(void*));

if (ce_extras == NULL) {
return -1;
}

for (Py_ssize_t i = co_extra->ce_size;
i < interp->co_extra_user_count;
i++) {
ce_extras[i] = NULL;
}

co_extra->ce_extras = ce_extras;
co_extra->ce_size = interp->co_extra_user_count;
o->co_extra = co_extra;
}

if (co_extra->ce_extras[index] != NULL) {
freefunc free = interp->co_extra_freefuncs[index];

if (free != NULL) {
free(co_extra->ce_extras[index]);
}
Expand Down