Skip to content

gh-92123: Convert _elementtree types to heap types #99221

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

Merged
erlend-aasland merged 22 commits into from
Jan 20, 2023
Merged

gh-92123: Convert _elementtree types to heap types #99221

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
76641a3
Prepare init function
Nov 20, 2020
5cbbe16
Convert element type to heap type
Nov 20, 2020
116fa39
Convert element iter type to heap type
Nov 20, 2020
a792fcf
Convert tree builder type to heap type
Nov 20, 2020
341a92d
Convert xml parser type to heap type
Nov 20, 2020
f35c604
Update clinic
Nov 20, 2020
b6573b1
Add NEWS
Nov 20, 2020
404b398
Use PyModule_AddObjectRef
Nov 20, 2020
6e53e92
Create module before creating types
Nov 20, 2020
525cfaf
Fetch type before GC
Nov 21, 2020
2448e93
Add initialisation guard
Nov 21, 2020
959a225
Address Heime's review: Don't define globals twice
Nov 23, 2020
9210a36
Visit type in type traverse functions
Jan 11, 2021
a6c6fea
Fix NEWS formatting
Jan 11, 2021
e039922
Sync with main
erlend-aasland Nov 7, 2022
b02b18e
Sync with main
erlend-aasland Jan 12, 2023
744be65
Merge branch 'main' into isolate-elementtree
erlend-aasland Jan 18, 2023
c8a3c67
Address review: make types immutable
erlend-aasland Jan 18, 2023
2175f66
Disallow instantiation for the iter type
erlend-aasland Jan 19, 2023
04aaa3d
Merge branch 'main' into isolate-elementtree
erlend-aasland Jan 19, 2023
730e5d2
Address review: fix error handling in module init
erlend-aasland Jan 19, 2023
2ccabd0
Merge branch 'main' into isolate-elementtree
erlend-aasland Jan 20, 2023
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
Prev Previous commit
Next Next commit
Convert element iter type to heap type
  • Loading branch information
Erlend E. Aasland committed Jan 11, 2021
commit 116fa39aa2b04cf142ae883045de9d33437956f7
63 changes: 19 additions & 44 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static void _clear_joined_ptr(PyObject **p)

/* Types defined by this extension */
static PyTypeObject *Element_Type;
static PyTypeObject ElementIter_Type;
static PyTypeObject *ElementIter_Type;
static PyTypeObject TreeBuilder_Type;
static PyTypeObject XMLParser_Type;

Expand Down Expand Up @@ -2095,6 +2095,8 @@ elementiter_dealloc(ElementIterObject *it)
Py_XDECREF(it->root_element);

PyObject_GC_Del(it);
PyTypeObject *tp = Py_TYPE(it);
Py_DECREF(tp);
}

static int
Expand Down Expand Up @@ -2238,59 +2240,33 @@ elementiter_next(ElementIterObject *it)
return NULL;
}

static PyType_Slot elementiter_slots[] = {
{Py_tp_dealloc, elementiter_dealloc},
{Py_tp_traverse, elementiter_traverse},
{Py_tp_iter, PyObject_SelfIter},
{Py_tp_iternext, elementiter_next},
{0, NULL},
};

static PyTypeObject ElementIter_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
static PyType_Spec elementiter_spec = {
/* Using the module's name since the pure-Python implementation does not
have such a type. */
"_elementtree._element_iterator", /* tp_name */
sizeof(ElementIterObject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)elementiter_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
0, /* tp_doc */
(traverseproc)elementiter_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */
(iternextfunc)elementiter_next, /* tp_iternext */
0, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
.name = "_elementtree._element_iterator",
.basicsize = sizeof(ElementIterObject),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
.slots = elementiter_slots,
};

static PyTypeObject *ElementIter_Type = NULL;

#define INIT_PARENT_STACK_SIZE 8

static PyObject *
create_elementiter(ElementObject *self, PyObject *tag, int gettext)
{
ElementIterObject *it;

it = PyObject_GC_New(ElementIterObject, &ElementIter_Type);
it = PyObject_GC_New(ElementIterObject, ElementIter_Type);
if (!it)
return NULL;

Expand Down Expand Up @@ -4382,8 +4358,7 @@ PyInit__elementtree(void)
}

/* Initialize object types */
if (PyType_Ready(&ElementIter_Type) < 0)
goto error;
CREATE_TYPE(m, ElementIter_Type, &elementiter_spec);
if (PyType_Ready(&TreeBuilder_Type) < 0)
goto error;
CREATE_TYPE(m, Element_Type, &element_spec);
Expand Down