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

Jump to bottom

bpo-1635741: testbuffer heap types #22131

Closed
wants to merge 2 commits into from
Closed

bpo-1635741: testbuffer heap types #22131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6e659c
convert testbuffer staticarray to heap type
koubaa Sep 7, 2020
be64950
convert ndarray to heap type
koubaa Sep 7, 2020
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
226 changes: 105 additions & 121 deletions Modules/_testbuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,23 @@ static PyObject *simple_format = NULL;
#define SIMPLE_FORMAT(fmt) (fmt == NULL || strcmp(fmt, "B") == 0)
#define FIX_FORMAT(fmt) (fmt == NULL ? "B" : fmt)

typedef struct {
PyTypeObject *ndarray_type;
PyTypeObject *staticarray_type;
} _testbuffer_state;

static inline _testbuffer_state*
_testbuffer_get_state(PyObject *module)
{
void *state = PyModule_GetState(module);
assert(state != NULL);
return (_testbuffer_state *)state;
}

/**************************************************************************/
/* NDArray Object */
/**************************************************************************/

static PyTypeObject NDArray_Type;
#define NDArray_Check(v) Py_IS_TYPE(v, &NDArray_Type)

#define CHECK_LIST_OR_TUPLE(v) \
if (!PyList_Check(v) && !PyTuple_Check(v)) { \
PyErr_SetString(PyExc_TypeError, \
Expand Down Expand Up @@ -236,7 +245,10 @@ ndarray_dealloc(NDArrayObject *self)
ndbuf_pop(self);
}
}

PyTypeObject *tp = Py_TYPE(self);
PyObject_Del(self);
Py_DECREF(tp);
}

static int
Expand Down Expand Up @@ -1956,21 +1968,6 @@ slice_indices(PyObject *self, PyObject *args)
return NULL;
}


static PyMappingMethods ndarray_as_mapping = {
NULL, /* mp_length */
(binaryfunc)ndarray_subscript, /* mp_subscript */
(objobjargproc)ndarray_ass_subscript /* mp_ass_subscript */
};

static PySequenceMethods ndarray_as_sequence = {
0, /* sq_length */
0, /* sq_concat */
0, /* sq_repeat */
(ssizeargfunc)ndarray_item, /* sq_item */
};


/**************************************************************************/
/* getters */
/**************************************************************************/
Expand Down Expand Up @@ -2231,6 +2228,11 @@ static char *infobuf = NULL;
static PyObject *
ndarray_memoryview_from_buffer(PyObject *self, PyObject *dummy)
{
_testbuffer_state *state = PyType_GetModuleState(Py_TYPE(self));
if (state == NULL) {
return NULL;
}

const NDArrayObject *nd = (NDArrayObject *)self;
const Py_buffer *view = &nd->head->base;
const ndbuf_t *ndbuf;
Expand All @@ -2243,7 +2245,7 @@ ndarray_memoryview_from_buffer(PyObject *self, PyObject *dummy)

if (!ND_IS_CONSUMER(nd))
ndbuf = nd->head; /* self is ndarray/original exporter */
else if (NDArray_Check(view->obj) && !ND_IS_CONSUMER(view->obj))
else if (Py_IS_TYPE(view->obj, state->ndarray_type) && !ND_IS_CONSUMER(view->obj))
/* self is ndarray and consumer from ndarray/original exporter */
ndbuf = ((NDArrayObject *)view->obj)->head;
else {
Expand Down Expand Up @@ -2564,7 +2566,7 @@ cmp_contig(PyObject *self, PyObject *args)
}

static PyObject *
is_contiguous(PyObject *self, PyObject *args)
is_contiguous(PyObject *module, PyObject *args)
{
PyObject *obj;
PyObject *order;
Expand All @@ -2581,7 +2583,12 @@ is_contiguous(PyObject *self, PyObject *args)
return NULL;
}

if (NDArray_Check(obj)) {
_testbuffer_state *state = _testbuffer_get_state(module);
if (state == NULL) {
return NULL;
}

if (Py_IS_TYPE(obj, state->ndarray_type)) {
/* Skip the buffer protocol to check simple etc. buffers directly. */
base = &((NDArrayObject *)obj)->head->base;
ret = PyBuffer_IsContiguous(base, ord) ? Py_True : Py_False;
Expand Down Expand Up @@ -2640,53 +2647,33 @@ static PyMethodDef ndarray_methods [] =
{NULL}
};

static PyTypeObject NDArray_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"ndarray", /* Name of this type */
sizeof(NDArrayObject), /* Basic object size */
0, /* Item size for varobject */
(destructor)ndarray_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
&ndarray_as_sequence, /* tp_as_sequence */
&ndarray_as_mapping, /* tp_as_mapping */
(hashfunc)ndarray_hash, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
&ndarray_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
ndarray_methods, /* tp_methods */
0, /* tp_members */
ndarray_getset, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
ndarray_init, /* tp_init */
0, /* tp_alloc */
ndarray_new, /* tp_new */
static PyType_Slot _testbuffer_ndarray_type_slots[] = {
{Py_tp_dealloc, ndarray_dealloc},
{Py_tp_hash, ndarray_hash},
{Py_tp_getattro, PyObject_GenericGetAttr},
{Py_tp_methods, ndarray_methods},
{Py_tp_getset, ndarray_getset},
{Py_tp_init, ndarray_init},
{Py_tp_new, ndarray_new},
{Py_sq_item, ndarray_item},
{Py_mp_subscript, ndarray_subscript},
{Py_mp_ass_subscript, ndarray_ass_subscript},
{Py_bf_getbuffer, ndarray_getbuf},
{Py_bf_releasebuffer, ndarray_releasebuf},
{0,0}
};

static PyType_Spec ndarray_type_spec = {
.name = "ndarray",
.basicsize = sizeof(NDArrayObject),
.flags = Py_TPFLAGS_DEFAULT,
.slots = _testbuffer_ndarray_type_slots
};

/**************************************************************************/
/* StaticArray Object */
/**************************************************************************/

static PyTypeObject StaticArray_Type;

typedef struct {
PyObject_HEAD
int legacy_mode; /* if true, use the view.obj==NULL hack */
Expand All @@ -2712,7 +2699,7 @@ static Py_buffer static_buffer = {
static PyObject *
staticarray_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
return (PyObject *)PyObject_New(StaticArrayObject, &StaticArray_Type);
return (PyObject *)PyObject_New(StaticArrayObject, type);
}

static int
Expand All @@ -2734,7 +2721,9 @@ staticarray_init(PyObject *self, PyObject *args, PyObject *kwds)
static void
staticarray_dealloc(StaticArrayObject *self)
{
PyTypeObject *tp = Py_TYPE(self);
PyObject_Del(self);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tp->tp_free(self) in here?

Py_DECREF(tp);
}

/* Return a buffer for a PyBUF_FULL_RO request. Flags are not checked,
Expand All @@ -2755,52 +2744,20 @@ staticarray_getbuf(StaticArrayObject *self, Py_buffer *view, int flags)
return 0;
}

static PyBufferProcs staticarray_as_buffer = {
(getbufferproc)staticarray_getbuf, /* bf_getbuffer */
NULL, /* bf_releasebuffer */
};

static PyTypeObject StaticArray_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"staticarray", /* Name of this type */
sizeof(StaticArrayObject), /* Basic object size */
0, /* Item size for varobject */
(destructor)staticarray_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 */
&staticarray_as_buffer, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* 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 */
staticarray_init, /* tp_init */
0, /* tp_alloc */
staticarray_new, /* tp_new */
static PyType_Slot _testbuffer_staticarray_type_slots[] = {
{Py_tp_dealloc, staticarray_dealloc},
{Py_tp_init, staticarray_init},
{Py_tp_new, staticarray_new},
{Py_bf_getbuffer, staticarray_getbuf},
{0,0}
};

static PyType_Spec staticarray_type_spec = {
.name = "staticarray",
.basicsize = sizeof(StaticArrayObject),
.flags = Py_TPFLAGS_DEFAULT,
.slots = _testbuffer_staticarray_type_slots
};

static struct PyMethodDef _testbuffer_functions[] = {
{"slice_indices", slice_indices, METH_VARARGS, NULL},
Expand All @@ -2813,16 +2770,38 @@ static struct PyMethodDef _testbuffer_functions[] = {
{NULL, NULL}
};

static int
_testbuffer_traverse(PyObject *module, visitproc visit, void *arg)
{
_testbuffer_state *state = _testbuffer_get_state(module);
Py_VISIT(state->ndarray_type);
Py_VISIT(state->staticarray_type);
return 0;
}

static int
_testbuffer_clear(PyObject *module)
{
_testbuffer_state *state = _testbuffer_get_state(module);
Py_CLEAR(state->ndarray_type);
Py_CLEAR(state->staticarray_type);
return 0;
}

static void
_testbuffer_free(void *module)
{
_testbuffer_clear((PyObject *)module);
}

static struct PyModuleDef _testbuffermodule = {
PyModuleDef_HEAD_INIT,
"_testbuffer",
NULL,
-1,
_testbuffer_functions,
NULL,
NULL,
NULL,
NULL
.m_name = "_testbuffer",
.m_size = sizeof(_testbuffer_state),
.m_methods = _testbuffer_functions,
.m_traverse = _testbuffer_traverse,
.m_clear = _testbuffer_clear,
.m_free = _testbuffer_free
};


Expand All @@ -2835,13 +2814,18 @@ PyInit__testbuffer(void)
if (m == NULL)
return NULL;

Py_SET_TYPE(&NDArray_Type, &PyType_Type);
Py_INCREF(&NDArray_Type);
PyModule_AddObject(m, "ndarray", (PyObject *)&NDArray_Type);
_testbuffer_state *state = _testbuffer_get_state(m);
state->ndarray_type = (PyTypeObject *)PyType_FromModuleAndSpec(
m, &ndarray_type_spec, NULL);
if (PyModule_AddType(m, state->ndarray_type) < 0) {
return NULL;
}

Py_SET_TYPE(&StaticArray_Type, &PyType_Type);
Py_INCREF(&StaticArray_Type);
PyModule_AddObject(m, "staticarray", (PyObject *)&StaticArray_Type);
state->staticarray_type = (PyTypeObject *)PyType_FromModuleAndSpec(
m, &staticarray_type_spec, NULL);
if (PyModule_AddType(m, state->staticarray_type) < 0) {
return NULL;
}

structmodule = PyImport_ImportModule("struct");
if (structmodule == NULL)
Expand Down