cpython-lru_cache-weakref: Objects/memoryobject.c annotate

annotate Objects/memoryobject.c @ 78088:eaafae4e275e

Null merge

author	Antoine Pitrou <solipsis@pitrou.net>
date	Fri, 13 Jul 2012 21:14:03 +0200
parents	bc0281f85409
children	8fbbc7c8748e

rev	line source
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	1 /* Memoryview object implementation */
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	3 #include "Python.h"
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	4 #include <stddef.h>
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	5
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	6
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	7 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	8 /* ManagedBuffer Object */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	9 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	10
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	11 /*
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	12 ManagedBuffer Object:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	13 ---------------------
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	14
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	15 The purpose of this object is to facilitate the handling of chained
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	16 memoryviews that have the same underlying exporting object. PEP-3118
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	17 allows the underlying object to change while a view is exported. This
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	18 could lead to unexpected results when constructing a new memoryview
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	19 from an existing memoryview.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	20
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	21 Rather than repeatedly redirecting buffer requests to the original base
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	22 object, all chained memoryviews use a single buffer snapshot. This
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	23 snapshot is generated by the constructor _PyManagedBuffer_FromObject().
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	24
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	25 Ownership rules:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	26 ----------------
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	27
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	28 The master buffer inside a managed buffer is filled in by the original
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	29 base object. shape, strides, suboffsets and format are read-only for
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	30 all consumers.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	31
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	32 A memoryview's buffer is a private copy of the exporter's buffer. shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	33 strides and suboffsets belong to the memoryview and are thus writable.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	34
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	35 If a memoryview itself exports several buffers via memory_getbuf(), all
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	36 buffer copies share shape, strides and suboffsets. In this case, the
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	37 arrays are NOT writable.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	38
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	39 Reference count assumptions:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	40 ----------------------------
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	41
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	42 The 'obj' member of a Py_buffer must either be NULL or refer to the
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	43 exporting base object. In the Python codebase, all getbufferprocs
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	44 return a new reference to view.obj (example: bytes_buffer_getbuffer()).
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	45
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	46 PyBuffer_Release() decrements view.obj (if non-NULL), so the
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	47 releasebufferprocs must NOT decrement view.obj.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	48 */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	49
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	50
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	51 #define XSTRINGIZE(v) #v
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	52 #define STRINGIZE(v) XSTRINGIZE(v)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	53
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	54 #define CHECK_MBUF_RELEASED(mbuf) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	55 if (((_PyManagedBufferObject *)mbuf)->flags&_Py_MANAGED_BUFFER_RELEASED) { \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	56 PyErr_SetString(PyExc_ValueError, \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	57 "operation forbidden on released memoryview object"); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	58 return NULL; \
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	59 }
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	60
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	61
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	62 Py_LOCAL_INLINE(_PyManagedBufferObject *)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	63 mbuf_alloc(void)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	64 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	65 _PyManagedBufferObject *mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	66
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	67 mbuf = (_PyManagedBufferObject *)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	68 PyObject_GC_New(_PyManagedBufferObject, &_PyManagedBuffer_Type);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	69 if (mbuf == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	70 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	71 mbuf->flags = 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	72 mbuf->exports = 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	73 mbuf->master.obj = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	74 _PyObject_GC_TRACK(mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	75
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	76 return mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	77 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	78
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	79 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	80 _PyManagedBuffer_FromObject(PyObject *base)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	81 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	82 _PyManagedBufferObject *mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	83
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	84 mbuf = mbuf_alloc();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	85 if (mbuf == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	86 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	87
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	88 if (PyObject_GetBuffer(base, &mbuf->master, PyBUF_FULL_RO) < 0) {
75440 9f7d06a9eabe Issue #14181: Preserve backwards compatibility for getbufferprocs that a) do Stefan Krah <skrah@bytereef.org> parents: 75409 diff changeset	89 mbuf->master.obj = NULL;
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	90 Py_DECREF(mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	91 return NULL;
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	92 }
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	93
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	94 return (PyObject *)mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	95 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	96
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	97 static void
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	98 mbuf_release(_PyManagedBufferObject *self)
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	99 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	100 if (self->flags&_Py_MANAGED_BUFFER_RELEASED)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	101 return;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	102
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	103 /* NOTE: at this point self->exports can still be > 0 if this function
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	104 is called from mbuf_clear() to break up a reference cycle. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	105 self->flags \|= _Py_MANAGED_BUFFER_RELEASED;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	106
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	107 /* PyBuffer_Release() decrements master->obj and sets it to NULL. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	108 _PyObject_GC_UNTRACK(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	109 PyBuffer_Release(&self->master);
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	110 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	111
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	112 static void
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	113 mbuf_dealloc(_PyManagedBufferObject *self)
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	114 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	115 assert(self->exports == 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	116 mbuf_release(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	117 if (self->flags&_Py_MANAGED_BUFFER_FREE_FORMAT)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	118 PyMem_Free(self->master.format);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	119 PyObject_GC_Del(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	120 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	121
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	122 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	123 mbuf_traverse(_PyManagedBufferObject self, visitproc visit, void arg)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	124 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	125 Py_VISIT(self->master.obj);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	126 return 0;
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	127 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	128
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	129 static int
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	130 mbuf_clear(_PyManagedBufferObject *self)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	131 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	132 assert(self->exports >= 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	133 mbuf_release(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	134 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	135 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	136
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	137 PyTypeObject _PyManagedBuffer_Type = {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	138 PyVarObject_HEAD_INIT(&PyType_Type, 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	139 "managedbuffer",
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	140 sizeof(_PyManagedBufferObject),
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	141 0,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	142 (destructor)mbuf_dealloc, /* tp_dealloc */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	143 0, /* tp_print */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	144 0, /* tp_getattr */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	145 0, /* tp_setattr */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	146 0, /* tp_reserved */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	147 0, /* tp_repr */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	148 0, /* tp_as_number */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	149 0, /* tp_as_sequence */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	150 0, /* tp_as_mapping */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	151 0, /* tp_hash */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	152 0, /* tp_call */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	153 0, /* tp_str */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	154 PyObject_GenericGetAttr, /* tp_getattro */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	155 0, /* tp_setattro */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	156 0, /* tp_as_buffer */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	157 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	158 0, /* tp_doc */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	159 (traverseproc)mbuf_traverse, /* tp_traverse */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	160 (inquiry)mbuf_clear /* tp_clear */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	161 };
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	162
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	163
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	164 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	165 /* MemoryView Object */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	166 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	167
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	168 /* In the process of breaking reference cycles mbuf_release() can be
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	169 called before memory_release(). */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	170 #define BASE_INACCESSIBLE(mv) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	171 (((PyMemoryViewObject *)mv)->flags&_Py_MEMORYVIEW_RELEASED \|\| \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	172 ((PyMemoryViewObject *)mv)->mbuf->flags&_Py_MANAGED_BUFFER_RELEASED)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	173
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	174 #define CHECK_RELEASED(mv) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	175 if (BASE_INACCESSIBLE(mv)) { \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	176 PyErr_SetString(PyExc_ValueError, \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	177 "operation forbidden on released memoryview object"); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	178 return NULL; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	179 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	180
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	181 #define CHECK_RELEASED_INT(mv) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	182 if (BASE_INACCESSIBLE(mv)) { \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	183 PyErr_SetString(PyExc_ValueError, \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	184 "operation forbidden on released memoryview object"); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	185 return -1; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	186 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	187
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	188 #define CHECK_LIST_OR_TUPLE(v) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	189 if (!PyList_Check(v) && !PyTuple_Check(v)) { \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	190 PyErr_SetString(PyExc_TypeError, \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	191 #v " must be a list or a tuple"); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	192 return NULL; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	193 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	194
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	195 #define VIEW_ADDR(mv) (&((PyMemoryViewObject *)mv)->view)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	196
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	197 /* Check for the presence of suboffsets in the first dimension. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	198 #define HAVE_PTR(suboffsets) (suboffsets && suboffsets[0] >= 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	199 /* Adjust ptr if suboffsets are present. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	200 #define ADJUST_PTR(ptr, suboffsets) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	201 (HAVE_PTR(suboffsets) ? ((char*)ptr) + suboffsets[0] : ptr)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	202
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	203 /* Memoryview buffer properties */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	204 #define MV_C_CONTIGUOUS(flags) (flags&(_Py_MEMORYVIEW_SCALAR\|_Py_MEMORYVIEW_C))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	205 #define MV_F_CONTIGUOUS(flags) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	206 (flags&(_Py_MEMORYVIEW_SCALAR\|_Py_MEMORYVIEW_FORTRAN))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	207 #define MV_ANY_CONTIGUOUS(flags) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	208 (flags&(_Py_MEMORYVIEW_SCALAR\|_Py_MEMORYVIEW_C\|_Py_MEMORYVIEW_FORTRAN))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	209
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	210 /* Fast contiguity test. Caller must ensure suboffsets==NULL and ndim==1. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	211 #define MV_CONTIGUOUS_NDIM1(view) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	212 ((view)->shape[0] == 1 \|\| (view)->strides[0] == (view)->itemsize)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	213
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	214 /* getbuffer() requests */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	215 #define REQ_INDIRECT(flags) ((flags&PyBUF_INDIRECT) == PyBUF_INDIRECT)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	216 #define REQ_C_CONTIGUOUS(flags) ((flags&PyBUF_C_CONTIGUOUS) == PyBUF_C_CONTIGUOUS)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	217 #define REQ_F_CONTIGUOUS(flags) ((flags&PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	218 #define REQ_ANY_CONTIGUOUS(flags) ((flags&PyBUF_ANY_CONTIGUOUS) == PyBUF_ANY_CONTIGUOUS)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	219 #define REQ_STRIDES(flags) ((flags&PyBUF_STRIDES) == PyBUF_STRIDES)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	220 #define REQ_SHAPE(flags) ((flags&PyBUF_ND) == PyBUF_ND)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	221 #define REQ_WRITABLE(flags) (flags&PyBUF_WRITABLE)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	222 #define REQ_FORMAT(flags) (flags&PyBUF_FORMAT)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	223
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	224
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	225 PyDoc_STRVAR(memory_doc,
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	226 "memoryview(object)\n\
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	227 \n\
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	228 Create a new memoryview object which references the given object.");
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	229
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	230
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	231 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	232 /* Copy memoryview buffers */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	233 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	234
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	235 /* The functions in this section take a source and a destination buffer
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	236 with the same logical structure: format, itemsize, ndim and shape
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	237 are identical, with ndim > 0.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	238
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	239 NOTE: All buffers are assumed to have PyBUF_FULL information, which
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	240 is the case for memoryviews! */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	241
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	242
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	243 /* Assumptions: ndim >= 1. The macro tests for a corner case that should
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	244 perhaps be explicitly forbidden in the PEP. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	245 #define HAVE_SUBOFFSETS_IN_LAST_DIM(view) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	246 (view->suboffsets && view->suboffsets[dest->ndim-1] >= 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	247
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	248 Py_LOCAL_INLINE(int)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	249 last_dim_is_contiguous(Py_buffer dest, Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	250 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	251 assert(dest->ndim > 0 && src->ndim > 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	252 return (!HAVE_SUBOFFSETS_IN_LAST_DIM(dest) &&
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	253 !HAVE_SUBOFFSETS_IN_LAST_DIM(src) &&
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	254 dest->strides[dest->ndim-1] == dest->itemsize &&
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	255 src->strides[src->ndim-1] == src->itemsize);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	256 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	257
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	258 /* Check that the logical structure of the destination and source buffers
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	259 is identical. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	260 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	261 cmp_structure(Py_buffer dest, Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	262 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	263 const char dfmt, sfmt;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	264 int i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	265
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	266 assert(dest->format && src->format);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	267 dfmt = dest->format[0] == '@' ? dest->format+1 : dest->format;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	268 sfmt = src->format[0] == '@' ? src->format+1 : src->format;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	269
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	270 if (strcmp(dfmt, sfmt) != 0 \|\|
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	271 dest->itemsize != src->itemsize \|\|
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	272 dest->ndim != src->ndim) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	273 goto value_error;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	274 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	275
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	276 for (i = 0; i < dest->ndim; i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	277 if (dest->shape[i] != src->shape[i])
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	278 goto value_error;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	279 if (dest->shape[i] == 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	280 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	281 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	282
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	283 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	284
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	285 value_error:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	286 PyErr_SetString(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	287 "ndarray assignment: lvalue and rvalue have different structures");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	288 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	289 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	290
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	291 /* Base case for recursive multi-dimensional copying. Contiguous arrays are
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	292 copied with very little overhead. Assumptions: ndim == 1, mem == NULL or
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	293 sizeof(mem) == shape[0] * itemsize. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	294 static void
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	295 copy_base(const Py_ssize_t *shape, Py_ssize_t itemsize,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	296 char dptr, const Py_ssize_t dstrides, const Py_ssize_t *dsuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	297 char sptr, const Py_ssize_t sstrides, const Py_ssize_t *ssuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	298 char *mem)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	299 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	300 if (mem == NULL) { /* contiguous */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	301 Py_ssize_t size = shape[0] * itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	302 if (dptr + size < sptr \|\| sptr + size < dptr)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	303 memcpy(dptr, sptr, size); /* no overlapping */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	304 else
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	305 memmove(dptr, sptr, size);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	306 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	307 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	308 char *p;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	309 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	310 for (i=0, p=mem; i < shape[0]; p+=itemsize, sptr+=sstrides[0], i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	311 char *xsptr = ADJUST_PTR(sptr, ssuboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	312 memcpy(p, xsptr, itemsize);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	313 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	314 for (i=0, p=mem; i < shape[0]; p+=itemsize, dptr+=dstrides[0], i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	315 char *xdptr = ADJUST_PTR(dptr, dsuboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	316 memcpy(xdptr, p, itemsize);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	317 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	318 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	319
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	320 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	321
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	322 /* Recursively copy a source buffer to a destination buffer. The two buffers
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	323 have the same ndim, shape and itemsize. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	324 static void
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	325 copy_rec(const Py_ssize_t *shape, Py_ssize_t ndim, Py_ssize_t itemsize,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	326 char dptr, const Py_ssize_t dstrides, const Py_ssize_t *dsuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	327 char sptr, const Py_ssize_t sstrides, const Py_ssize_t *ssuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	328 char *mem)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	329 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	330 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	331
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	332 assert(ndim >= 1);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	333
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	334 if (ndim == 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	335 copy_base(shape, itemsize,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	336 dptr, dstrides, dsuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	337 sptr, sstrides, ssuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	338 mem);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	339 return;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	340 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	341
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	342 for (i = 0; i < shape[0]; dptr+=dstrides[0], sptr+=sstrides[0], i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	343 char *xdptr = ADJUST_PTR(dptr, dsuboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	344 char *xsptr = ADJUST_PTR(sptr, ssuboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	345
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	346 copy_rec(shape+1, ndim-1, itemsize,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	347 xdptr, dstrides+1, dsuboffsets ? dsuboffsets+1 : NULL,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	348 xsptr, sstrides+1, ssuboffsets ? ssuboffsets+1 : NULL,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	349 mem);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	350 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	351 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	352
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	353 /* Faster copying of one-dimensional arrays. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	354 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	355 copy_single(Py_buffer dest, Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	356 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	357 char *mem = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	358
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	359 assert(dest->ndim == 1);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	360
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	361 if (cmp_structure(dest, src) < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	362 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	363
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	364 if (!last_dim_is_contiguous(dest, src)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	365 mem = PyMem_Malloc(dest->shape[0] * dest->itemsize);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	366 if (mem == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	367 PyErr_NoMemory();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	368 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	369 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	370 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	371
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	372 copy_base(dest->shape, dest->itemsize,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	373 dest->buf, dest->strides, dest->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	374 src->buf, src->strides, src->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	375 mem);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	376
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	377 if (mem)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	378 PyMem_Free(mem);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	379
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	380 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	381 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	382
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	383 /* Recursively copy src to dest. Both buffers must have the same basic
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	384 structure. Copying is atomic, the function never fails with a partial
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	385 copy. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	386 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	387 copy_buffer(Py_buffer dest, Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	388 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	389 char *mem = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	390
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	391 assert(dest->ndim > 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	392
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	393 if (cmp_structure(dest, src) < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	394 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	395
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	396 if (!last_dim_is_contiguous(dest, src)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	397 mem = PyMem_Malloc(dest->shape[dest->ndim-1] * dest->itemsize);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	398 if (mem == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	399 PyErr_NoMemory();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	400 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	401 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	402 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	403
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	404 copy_rec(dest->shape, dest->ndim, dest->itemsize,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	405 dest->buf, dest->strides, dest->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	406 src->buf, src->strides, src->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	407 mem);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	408
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	409 if (mem)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	410 PyMem_Free(mem);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	411
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	412 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	413 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	414
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	415 /* Initialize strides for a C-contiguous array. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	416 Py_LOCAL_INLINE(void)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	417 init_strides_from_shape(Py_buffer *view)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	418 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	419 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	420
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	421 assert(view->ndim > 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	422
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	423 view->strides[view->ndim-1] = view->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	424 for (i = view->ndim-2; i >= 0; i--)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	425 view->strides[i] = view->strides[i+1] * view->shape[i+1];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	426 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	427
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	428 /* Initialize strides for a Fortran-contiguous array. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	429 Py_LOCAL_INLINE(void)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	430 init_fortran_strides_from_shape(Py_buffer *view)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	431 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	432 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	433
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	434 assert(view->ndim > 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	435
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	436 view->strides[0] = view->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	437 for (i = 1; i < view->ndim; i++)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	438 view->strides[i] = view->strides[i-1] * view->shape[i-1];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	439 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	440
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	441 /* Copy src to a C-contiguous representation. Assumptions:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	442 len(mem) == src->len. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	443 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	444 buffer_to_c_contiguous(char mem, Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	445 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	446 Py_buffer dest;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	447 Py_ssize_t *strides;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	448 int ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	449
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	450 assert(src->shape != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	451 assert(src->strides != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	452
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	453 strides = PyMem_Malloc(src->ndim * (sizeof *src->strides));
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	454 if (strides == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	455 PyErr_NoMemory();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	456 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	457 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	458
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	459 /* initialize dest as a C-contiguous buffer */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	460 dest = *src;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	461 dest.buf = mem;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	462 /* shape is constant and shared */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	463 dest.strides = strides;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	464 init_strides_from_shape(&dest);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	465 dest.suboffsets = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	466
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	467 ret = copy_buffer(&dest, src);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	468
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	469 PyMem_Free(strides);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	470 return ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	471 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	472
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	473
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	474 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	475 /* Constructors */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	476 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	477
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	478 /* Initialize values that are shared with the managed buffer. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	479 Py_LOCAL_INLINE(void)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	480 init_shared_values(Py_buffer dest, const Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	481 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	482 dest->obj = src->obj;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	483 dest->buf = src->buf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	484 dest->len = src->len;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	485 dest->itemsize = src->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	486 dest->readonly = src->readonly;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	487 dest->format = src->format ? src->format : "B";
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	488 dest->internal = src->internal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	489 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	490
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	491 /* Copy shape and strides. Reconstruct missing values. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	492 static void
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	493 init_shape_strides(Py_buffer dest, const Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	494 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	495 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	496
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	497 if (src->ndim == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	498 dest->shape = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	499 dest->strides = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	500 return;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	501 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	502 if (src->ndim == 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	503 dest->shape[0] = src->shape ? src->shape[0] : src->len / src->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	504 dest->strides[0] = src->strides ? src->strides[0] : src->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	505 return;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	506 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	507
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	508 for (i = 0; i < src->ndim; i++)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	509 dest->shape[i] = src->shape[i];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	510 if (src->strides) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	511 for (i = 0; i < src->ndim; i++)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	512 dest->strides[i] = src->strides[i];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	513 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	514 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	515 init_strides_from_shape(dest);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	516 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	517 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	518
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	519 Py_LOCAL_INLINE(void)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	520 init_suboffsets(Py_buffer dest, const Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	521 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	522 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	523
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	524 if (src->suboffsets == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	525 dest->suboffsets = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	526 return;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	527 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	528 for (i = 0; i < src->ndim; i++)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	529 dest->suboffsets[i] = src->suboffsets[i];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	530 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	531
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	532 /* len = product(shape) * itemsize */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	533 Py_LOCAL_INLINE(void)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	534 init_len(Py_buffer *view)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	535 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	536 Py_ssize_t i, len;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	537
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	538 len = 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	539 for (i = 0; i < view->ndim; i++)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	540 len *= view->shape[i];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	541 len *= view->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	542
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	543 view->len = len;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	544 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	545
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	546 /* Initialize memoryview buffer properties. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	547 static void
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	548 init_flags(PyMemoryViewObject *mv)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	549 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	550 const Py_buffer *view = &mv->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	551 int flags = 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	552
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	553 switch (view->ndim) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	554 case 0:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	555 flags \|= (_Py_MEMORYVIEW_SCALAR\|_Py_MEMORYVIEW_C\|
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	556 _Py_MEMORYVIEW_FORTRAN);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	557 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	558 case 1:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	559 if (MV_CONTIGUOUS_NDIM1(view))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	560 flags \|= (_Py_MEMORYVIEW_C\|_Py_MEMORYVIEW_FORTRAN);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	561 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	562 default:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	563 if (PyBuffer_IsContiguous(view, 'C'))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	564 flags \|= _Py_MEMORYVIEW_C;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	565 if (PyBuffer_IsContiguous(view, 'F'))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	566 flags \|= _Py_MEMORYVIEW_FORTRAN;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	567 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	568 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	569
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	570 if (view->suboffsets) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	571 flags \|= _Py_MEMORYVIEW_PIL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	572 flags &= ~(_Py_MEMORYVIEW_C\|_Py_MEMORYVIEW_FORTRAN);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	573 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	574
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	575 mv->flags = flags;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	576 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	577
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	578 /* Allocate a new memoryview and perform basic initialization. New memoryviews
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	579 are exclusively created through the mbuf_add functions. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	580 Py_LOCAL_INLINE(PyMemoryViewObject *)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	581 memory_alloc(int ndim)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	582 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	583 PyMemoryViewObject *mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	584
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	585 mv = (PyMemoryViewObject *)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	586 PyObject_GC_NewVar(PyMemoryViewObject, &PyMemoryView_Type, 3*ndim);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	587 if (mv == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	588 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	589
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	590 mv->mbuf = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	591 mv->hash = -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	592 mv->flags = 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	593 mv->exports = 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	594 mv->view.ndim = ndim;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	595 mv->view.shape = mv->ob_array;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	596 mv->view.strides = mv->ob_array + ndim;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	597 mv->view.suboffsets = mv->ob_array + 2 * ndim;
77213 bc0281f85409 Issue #14930: Make memoryview objects weakrefable. Richard Oudkerk <shibturn@gmail.com> parents: 75440 diff changeset	598 mv->weakreflist = NULL;
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	599
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	600 _PyObject_GC_TRACK(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	601 return mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	602 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	603
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	604 /*
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	605 Return a new memoryview that is registered with mbuf. If src is NULL,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	606 use mbuf->master as the underlying buffer. Otherwise, use src.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	607
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	608 The new memoryview has full buffer information: shape and strides
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	609 are always present, suboffsets as needed. Arrays are copied to
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	610 the memoryview's ob_array field.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	611 */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	612 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	613 mbuf_add_view(_PyManagedBufferObject mbuf, const Py_buffer src)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	614 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	615 PyMemoryViewObject *mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	616 Py_buffer *dest;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	617
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	618 if (src == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	619 src = &mbuf->master;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	620
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	621 if (src->ndim > PyBUF_MAX_NDIM) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	622 PyErr_SetString(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	623 "memoryview: number of dimensions must not exceed "
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	624 STRINGIZE(PyBUF_MAX_NDIM));
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	625 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	626 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	627
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	628 mv = memory_alloc(src->ndim);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	629 if (mv == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	630 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	631
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	632 dest = &mv->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	633 init_shared_values(dest, src);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	634 init_shape_strides(dest, src);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	635 init_suboffsets(dest, src);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	636 init_flags(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	637
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	638 mv->mbuf = mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	639 Py_INCREF(mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	640 mbuf->exports++;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	641
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	642 return (PyObject *)mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	643 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	644
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	645 /* Register an incomplete view: shape, strides, suboffsets and flags still
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	646 need to be initialized. Use 'ndim' instead of src->ndim to determine the
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	647 size of the memoryview's ob_array.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	648
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	649 Assumption: ndim <= PyBUF_MAX_NDIM. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	650 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	651 mbuf_add_incomplete_view(_PyManagedBufferObject mbuf, const Py_buffer src,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	652 int ndim)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	653 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	654 PyMemoryViewObject *mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	655 Py_buffer *dest;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	656
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	657 if (src == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	658 src = &mbuf->master;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	659
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	660 assert(ndim <= PyBUF_MAX_NDIM);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	661
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	662 mv = memory_alloc(ndim);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	663 if (mv == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	664 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	665
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	666 dest = &mv->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	667 init_shared_values(dest, src);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	668
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	669 mv->mbuf = mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	670 Py_INCREF(mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	671 mbuf->exports++;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	672
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	673 return (PyObject *)mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	674 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	675
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	676 /* Expose a raw memory area as a view of contiguous bytes. flags can be
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	677 PyBUF_READ or PyBUF_WRITE. view->format is set to "B" (unsigned bytes).
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	678 The memoryview has complete buffer information. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	679 PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	680 PyMemoryView_FromMemory(char *mem, Py_ssize_t size, int flags)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	681 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	682 _PyManagedBufferObject *mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	683 PyObject *mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	684 int readonly;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	685
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	686 assert(mem != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	687 assert(flags == PyBUF_READ \|\| flags == PyBUF_WRITE);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	688
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	689 mbuf = mbuf_alloc();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	690 if (mbuf == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	691 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	692
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	693 readonly = (flags == PyBUF_WRITE) ? 0 : 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	694 (void)PyBuffer_FillInfo(&mbuf->master, NULL, mem, size, readonly,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	695 PyBUF_FULL_RO);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	696
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	697 mv = mbuf_add_view(mbuf, NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	698 Py_DECREF(mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	699
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	700 return mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	701 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	702
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	703 /* Create a memoryview from a given Py_buffer. For simple byte views,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	704 PyMemoryView_FromMemory() should be used instead.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	705 This function is the only entry point that can create a master buffer
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	706 without full information. Because of this fact init_shape_strides()
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	707 must be able to reconstruct missing values. */
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	708 PyObject *
48770 7511f3e672a2 #3560: cleanup C memoryview API Antoine Pitrou <solipsis@pitrou.net> parents: 48683 diff changeset	709 PyMemoryView_FromBuffer(Py_buffer *info)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	710 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	711 _PyManagedBufferObject *mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	712 PyObject *mv;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	713
68127 cbcb26a9d2bd Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with Antoine Pitrou <solipsis@pitrou.net> parents: 67675 diff changeset	714 if (info->buf == NULL) {
cbcb26a9d2bd Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with Antoine Pitrou <solipsis@pitrou.net> parents: 67675 diff changeset	715 PyErr_SetString(PyExc_ValueError,
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	716 "PyMemoryView_FromBuffer(): info->buf must not be NULL");
68127 cbcb26a9d2bd Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with Antoine Pitrou <solipsis@pitrou.net> parents: 67675 diff changeset	717 return NULL;
cbcb26a9d2bd Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with Antoine Pitrou <solipsis@pitrou.net> parents: 67675 diff changeset	718 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	719
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	720 mbuf = mbuf_alloc();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	721 if (mbuf == NULL)
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	722 return NULL;
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	723
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	724 /* info->obj is either NULL or a borrowed reference. This reference
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	725 should not be decremented in PyBuffer_Release(). */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	726 mbuf->master = *info;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	727 mbuf->master.obj = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	728
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	729 mv = mbuf_add_view(mbuf, NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	730 Py_DECREF(mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	731
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	732 return mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	733 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	734
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	735 /* Create a memoryview from an object that implements the buffer protocol.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	736 If the object is a memoryview, the new memoryview must be registered
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	737 with the same managed buffer. Otherwise, a new managed buffer is created. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	738 PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	739 PyMemoryView_FromObject(PyObject *v)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	740 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	741 _PyManagedBufferObject *mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	742
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	743 if (PyMemoryView_Check(v)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	744 PyMemoryViewObject mv = (PyMemoryViewObject )v;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	745 CHECK_RELEASED(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	746 return mbuf_add_view(mv->mbuf, &mv->view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	747 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	748 else if (PyObject_CheckBuffer(v)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	749 PyObject *ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	750 mbuf = (_PyManagedBufferObject *)_PyManagedBuffer_FromObject(v);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	751 if (mbuf == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	752 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	753 ret = mbuf_add_view(mbuf, NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	754 Py_DECREF(mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	755 return ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	756 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	757
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	758 PyErr_Format(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	759 "memoryview: %.200s object does not have the buffer interface",
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	760 Py_TYPE(v)->tp_name);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	761 return NULL;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	762 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	763
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	764 /* Copy the format string from a base object that might vanish. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	765 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	766 mbuf_copy_format(_PyManagedBufferObject mbuf, const char fmt)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	767 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	768 if (fmt != NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	769 char *cp = PyMem_Malloc(strlen(fmt)+1);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	770 if (cp == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	771 PyErr_NoMemory();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	772 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	773 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	774 mbuf->master.format = strcpy(cp, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	775 mbuf->flags \|= _Py_MANAGED_BUFFER_FREE_FORMAT;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	776 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	777
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	778 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	779 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	780
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	781 /*
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	782 Return a memoryview that is based on a contiguous copy of src.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	783 Assumptions: src has PyBUF_FULL_RO information, src->ndim > 0.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	784
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	785 Ownership rules:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	786 1) As usual, the returned memoryview has a private copy
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	787 of src->shape, src->strides and src->suboffsets.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	788 2) src->format is copied to the master buffer and released
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	789 in mbuf_dealloc(). The releasebufferproc of the bytes
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	790 object is NULL, so it does not matter that mbuf_release()
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	791 passes the altered format pointer to PyBuffer_Release().
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	792 */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	793 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	794 memory_from_contiguous_copy(Py_buffer *src, char order)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	795 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	796 _PyManagedBufferObject *mbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	797 PyMemoryViewObject *mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	798 PyObject *bytes;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	799 Py_buffer *dest;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	800 int i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	801
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	802 assert(src->ndim > 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	803 assert(src->shape != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	804
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	805 bytes = PyBytes_FromStringAndSize(NULL, src->len);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	806 if (bytes == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	807 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	808
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	809 mbuf = (_PyManagedBufferObject *)_PyManagedBuffer_FromObject(bytes);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	810 Py_DECREF(bytes);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	811 if (mbuf == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	812 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	813
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	814 if (mbuf_copy_format(mbuf, src->format) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	815 Py_DECREF(mbuf);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	816 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	817 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	818
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	819 mv = (PyMemoryViewObject *)mbuf_add_incomplete_view(mbuf, NULL, src->ndim);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	820 Py_DECREF(mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	821 if (mv == NULL)
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	822 return NULL;
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	823
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	824 dest = &mv->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	825
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	826 /* shared values are initialized correctly except for itemsize */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	827 dest->itemsize = src->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	828
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	829 /* shape and strides */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	830 for (i = 0; i < src->ndim; i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	831 dest->shape[i] = src->shape[i];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	832 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	833 if (order == 'C' \|\| order == 'A') {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	834 init_strides_from_shape(dest);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	835 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	836 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	837 init_fortran_strides_from_shape(dest);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	838 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	839 /* suboffsets */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	840 dest->suboffsets = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	841
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	842 /* flags */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	843 init_flags(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	844
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	845 if (copy_buffer(dest, src) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	846 Py_DECREF(mv);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	847 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	848 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	849
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	850 return (PyObject *)mv;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	851 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	852
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	853 /*
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	854 Return a new memoryview object based on a contiguous exporter with
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	855 buffertype={PyBUF_READ, PyBUF_WRITE} and order={'C', 'F'ortran, or 'A'ny}.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	856 The logical structure of the input and output buffers is the same
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	857 (i.e. tolist(input) == tolist(output)), but the physical layout in
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	858 memory can be explicitly chosen.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	859
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	860 As usual, if buffertype=PyBUF_WRITE, the exporter's buffer must be writable,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	861 otherwise it may be writable or read-only.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	862
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	863 If the exporter is already contiguous with the desired target order,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	864 the memoryview will be directly based on the exporter.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	865
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	866 Otherwise, if the buffertype is PyBUF_READ, the memoryview will be
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	867 based on a new bytes object. If order={'C', 'A'ny}, use 'C' order,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	868 'F'ortran order otherwise.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	869 */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	870 PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	871 PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char order)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	872 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	873 PyMemoryViewObject *mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	874 PyObject *ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	875 Py_buffer *view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	876
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	877 assert(buffertype == PyBUF_READ \|\| buffertype == PyBUF_WRITE);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	878 assert(order == 'C' \|\| order == 'F' \|\| order == 'A');
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	879
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	880 mv = (PyMemoryViewObject *)PyMemoryView_FromObject(obj);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	881 if (mv == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	882 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	883
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	884 view = &mv->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	885 if (buffertype == PyBUF_WRITE && view->readonly) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	886 PyErr_SetString(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	887 "underlying buffer is not writable");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	888 Py_DECREF(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	889 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	890 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	891
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	892 if (PyBuffer_IsContiguous(view, order))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	893 return (PyObject *)mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	894
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	895 if (buffertype == PyBUF_WRITE) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	896 PyErr_SetString(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	897 "writable contiguous buffer requested "
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	898 "for a non-contiguous object.");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	899 Py_DECREF(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	900 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	901 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	902
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	903 ret = memory_from_contiguous_copy(view, order);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	904 Py_DECREF(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	905 return ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	906 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	907
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	908
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	909 static PyObject *
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	910 memory_new(PyTypeObject subtype, PyObject args, PyObject *kwds)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	911 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	912 PyObject *obj;
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	913 static char *kwlist[] = {"object", NULL};
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	914
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	915 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:memoryview", kwlist,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	916 &obj)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	917 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	918 }
43793 2d8d6855a602 Fixed memoryview constructor. It allowed arbitrary keyword arguments. The bug was found by mykhal from #python. I've also added a small test case in the new test_memoryview.py Christian Heimes <christian@cheimes.de> parents: 43687 diff changeset	919
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	920 return PyMemoryView_FromObject(obj);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	921 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	922
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	923
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	924 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	925 /* Release/GC management */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	926 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	927
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	928 /* Inform the managed buffer that this particular memoryview will not access
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	929 the underlying buffer again. If no other memoryviews are registered with
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	930 the managed buffer, the underlying buffer is released instantly and
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	931 marked as inaccessible for both the memoryview and the managed buffer.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	932
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	933 This function fails if the memoryview itself has exported buffers. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	934 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	935 _memory_release(PyMemoryViewObject *self)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	936 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	937 if (self->flags & _Py_MEMORYVIEW_RELEASED)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	938 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	939
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	940 if (self->exports == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	941 self->flags \|= _Py_MEMORYVIEW_RELEASED;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	942 assert(self->mbuf->exports > 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	943 if (--self->mbuf->exports == 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	944 mbuf_release(self->mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	945 return 0;
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	946 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	947 if (self->exports > 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	948 PyErr_Format(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	949 "memoryview has %zd exported buffer%s", self->exports,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	950 self->exports==1 ? "" : "s");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	951 return -1;
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	952 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	953
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	954 Py_FatalError("_memory_release(): negative export count");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	955 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	956 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	957
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	958 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	959 memory_release(PyMemoryViewObject *self)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	960 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	961 if (_memory_release(self) < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	962 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	963 Py_RETURN_NONE;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	964 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	965
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	966 static void
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	967 memory_dealloc(PyMemoryViewObject *self)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	968 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	969 assert(self->exports == 0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	970 _PyObject_GC_UNTRACK(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	971 (void)_memory_release(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	972 Py_CLEAR(self->mbuf);
77213 bc0281f85409 Issue #14930: Make memoryview objects weakrefable. Richard Oudkerk <shibturn@gmail.com> parents: 75440 diff changeset	973 if (self->weakreflist != NULL)
bc0281f85409 Issue #14930: Make memoryview objects weakrefable. Richard Oudkerk <shibturn@gmail.com> parents: 75440 diff changeset	974 PyObject_ClearWeakRefs((PyObject *) self);
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	975 PyObject_GC_Del(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	976 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	977
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	978 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	979 memory_traverse(PyMemoryViewObject self, visitproc visit, void arg)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	980 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	981 Py_VISIT(self->mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	982 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	983 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	984
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	985 static int
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	986 memory_clear(PyMemoryViewObject *self)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	987 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	988 (void)_memory_release(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	989 Py_CLEAR(self->mbuf);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	990 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	991 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	992
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	993 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	994 memory_enter(PyObject self, PyObject args)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	995 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	996 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	997 Py_INCREF(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	998 return self;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	999 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1000
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1001 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1002 memory_exit(PyObject self, PyObject args)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1003 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1004 return memory_release((PyMemoryViewObject *)self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1005 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1006
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1007
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1008 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1009 /* Casting format and shape */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1010 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1011
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1012 #define IS_BYTE_FORMAT(f) (f == 'b' \|\| f == 'B' \|\| f == 'c')
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1013
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1014 Py_LOCAL_INLINE(Py_ssize_t)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1015 get_native_fmtchar(char result, const char fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1016 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1017 Py_ssize_t size = -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1018
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1019 if (fmt[0] == '@') fmt++;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1020
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1021 switch (fmt[0]) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1022 case 'c': case 'b': case 'B': size = sizeof(char); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1023 case 'h': case 'H': size = sizeof(short); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1024 case 'i': case 'I': size = sizeof(int); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1025 case 'l': case 'L': size = sizeof(long); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1026 #ifdef HAVE_LONG_LONG
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1027 case 'q': case 'Q': size = sizeof(PY_LONG_LONG); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1028 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1029 case 'n': case 'N': size = sizeof(Py_ssize_t); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1030 case 'f': size = sizeof(float); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1031 case 'd': size = sizeof(double); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1032 #ifdef HAVE_C99_BOOL
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1033 case '?': size = sizeof(_Bool); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1034 #else
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1035 case '?': size = sizeof(char); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1036 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1037 case 'P': size = sizeof(void *); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1038 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1039
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1040 if (size > 0 && fmt[1] == '\0') {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1041 *result = fmt[0];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1042 return size;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1043 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1044
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1045 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1046 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1047
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1048 /* Cast a memoryview's data type to 'format'. The input array must be
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1049 C-contiguous. At least one of input-format, output-format must have
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1050 byte size. The output array is 1-D, with the same byte length as the
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1051 input array. Thus, view->len must be a multiple of the new itemsize. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1052 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1053 cast_to_1D(PyMemoryViewObject mv, PyObject format)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	1054 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1055 Py_buffer *view = &mv->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1056 PyObject *asciifmt;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1057 char srcchar, destchar;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1058 Py_ssize_t itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1059 int ret = -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1060
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1061 assert(view->ndim >= 1);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1062 assert(Py_SIZE(mv) == 3*view->ndim);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1063 assert(view->shape == mv->ob_array);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1064 assert(view->strides == mv->ob_array + view->ndim);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1065 assert(view->suboffsets == mv->ob_array + 2*view->ndim);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1066
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1067 if (get_native_fmtchar(&srcchar, view->format) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1068 PyErr_SetString(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1069 "memoryview: source format must be a native single character "
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1070 "format prefixed with an optional '@'");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1071 return ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1072 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1073
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1074 asciifmt = PyUnicode_AsASCIIString(format);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1075 if (asciifmt == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1076 return ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1077
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1078 itemsize = get_native_fmtchar(&destchar, PyBytes_AS_STRING(asciifmt));
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1079 if (itemsize < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1080 PyErr_SetString(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1081 "memoryview: destination format must be a native single "
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1082 "character format prefixed with an optional '@'");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1083 goto out;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1084 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1085
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1086 if (!IS_BYTE_FORMAT(srcchar) && !IS_BYTE_FORMAT(destchar)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1087 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1088 "memoryview: cannot cast between two non-byte formats");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1089 goto out;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1090 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1091 if (view->len % itemsize) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1092 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1093 "memoryview: length is not a multiple of itemsize");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1094 goto out;
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1095 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1096
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1097 strncpy(mv->format, PyBytes_AS_STRING(asciifmt),
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1098 _Py_MEMORYVIEW_MAX_FORMAT);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1099 mv->format[_Py_MEMORYVIEW_MAX_FORMAT-1] = '\0';
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1100 view->format = mv->format;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1101 view->itemsize = itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1102
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1103 view->ndim = 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1104 view->shape[0] = view->len / view->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1105 view->strides[0] = view->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1106 view->suboffsets = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1107
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1108 init_flags(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1109
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1110 ret = 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1111
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1112 out:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1113 Py_DECREF(asciifmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1114 return ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1115 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1116
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1117 /* The memoryview must have space for 3len(seq) elements. /
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1118 static Py_ssize_t
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1119 copy_shape(Py_ssize_t shape, const PyObject seq, Py_ssize_t ndim,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1120 Py_ssize_t itemsize)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1121 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1122 Py_ssize_t x, i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1123 Py_ssize_t len = itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1124
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1125 for (i = 0; i < ndim; i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1126 PyObject *tmp = PySequence_Fast_GET_ITEM(seq, i);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1127 if (!PyLong_Check(tmp)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1128 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1129 "memoryview.cast(): elements of shape must be integers");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1130 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1131 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1132 x = PyLong_AsSsize_t(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1133 if (x == -1 && PyErr_Occurred()) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1134 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1135 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1136 if (x <= 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1137 /* In general elements of shape may be 0, but not for casting. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1138 PyErr_Format(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1139 "memoryview.cast(): elements of shape must be integers > 0");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1140 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1141 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1142 if (x > PY_SSIZE_T_MAX / len) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1143 PyErr_Format(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1144 "memoryview.cast(): product(shape) > SSIZE_MAX");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1145 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1146 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1147 len *= x;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1148 shape[i] = x;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1149 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1150
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1151 return len;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1152 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1153
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1154 /* Cast a 1-D array to a new shape. The result array will be C-contiguous.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1155 If the result array does not have exactly the same byte length as the
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1156 input array, raise ValueError. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1157 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1158 cast_to_ND(PyMemoryViewObject mv, const PyObject shape, int ndim)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1159 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1160 Py_buffer *view = &mv->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1161 Py_ssize_t len;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1162
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1163 assert(view->ndim == 1); /* ndim from cast_to_1D() */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1164 assert(Py_SIZE(mv) == 3(ndim==0?1:ndim)); / ndim of result array */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1165 assert(view->shape == mv->ob_array);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1166 assert(view->strides == mv->ob_array + (ndim==0?1:ndim));
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1167 assert(view->suboffsets == NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1168
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1169 view->ndim = ndim;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1170 if (view->ndim == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1171 view->shape = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1172 view->strides = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1173 len = view->itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1174 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1175 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1176 len = copy_shape(view->shape, shape, ndim, view->itemsize);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1177 if (len < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1178 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1179 init_strides_from_shape(view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1180 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1181
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1182 if (view->len != len) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1183 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1184 "memoryview: product(shape) * itemsize != buffer size");
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1185 return -1;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1186 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1187
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1188 init_flags(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1189
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1190 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1191 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1192
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1193 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1194 zero_in_shape(PyMemoryViewObject *mv)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1195 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1196 Py_buffer *view = &mv->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1197 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1198
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1199 for (i = 0; i < view->ndim; i++)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1200 if (view->shape[i] == 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1201 return 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1202
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1203 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	1204 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	1205
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1206 /*
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1207 Cast a copy of 'self' to a different view. The input view must
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1208 be C-contiguous. The function always casts the input view to a
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1209 1-D output according to 'format'. At least one of input-format,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1210 output-format must have byte size.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1211
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1212 If 'shape' is given, the 1-D view from the previous step will
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1213 be cast to a C-contiguous view with new shape and strides.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1214
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1215 All casts must result in views that will have the exact byte
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1216 size of the original input. Otherwise, an error is raised.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1217 */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1218 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1219 memory_cast(PyMemoryViewObject self, PyObject args, PyObject *kwds)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	1220 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1221 static char *kwlist[] = {"format", "shape", NULL};
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1222 PyMemoryViewObject *mv = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1223 PyObject *shape = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1224 PyObject *format;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1225 Py_ssize_t ndim = 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1226
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1227 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1228
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1229 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|O", kwlist,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1230 &format, &shape)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1231 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1232 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1233 if (!PyUnicode_Check(format)) {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1234 PyErr_SetString(PyExc_TypeError,
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1235 "memoryview: format argument must be a string");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1236 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1237 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1238 if (!MV_C_CONTIGUOUS(self->flags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1239 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1240 "memoryview: casts are restricted to C-contiguous views");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1241 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1242 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1243 if (zero_in_shape(self)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1244 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1245 "memoryview: cannot cast view with zeros in shape or strides");
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1246 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1247 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1248 if (shape) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1249 CHECK_LIST_OR_TUPLE(shape)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1250 ndim = PySequence_Fast_GET_SIZE(shape);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1251 if (ndim > PyBUF_MAX_NDIM) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1252 PyErr_SetString(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1253 "memoryview: number of dimensions must not exceed "
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1254 STRINGIZE(PyBUF_MAX_NDIM));
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1255 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1256 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1257 if (self->view.ndim != 1 && ndim != 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1258 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1259 "memoryview: cast must be 1D -> ND or ND -> 1D");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1260 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1261 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1262 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1263
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1264 mv = (PyMemoryViewObject *)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1265 mbuf_add_incomplete_view(self->mbuf, &self->view, ndim==0 ? 1 : (int)ndim);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1266 if (mv == NULL)
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1267 return NULL;
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1268
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1269 if (cast_to_1D(mv, format) < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1270 goto error;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1271 if (shape && cast_to_ND(mv, shape, (int)ndim) < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1272 goto error;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1273
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1274 return (PyObject *)mv;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1275
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1276 error:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1277 Py_DECREF(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1278 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1279 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1280
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1281
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1282 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1283 /* getbuffer */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1284 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1285
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1286 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1287 memory_getbuf(PyMemoryViewObject self, Py_buffer view, int flags)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1288 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1289 Py_buffer *base = &self->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1290 int baseflags = self->flags;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1291
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1292 CHECK_RELEASED_INT(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1293
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1294 /* start with complete information */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1295 view = base;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1296 view->obj = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1297
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1298 if (REQ_WRITABLE(flags) && base->readonly) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1299 PyErr_SetString(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1300 "memoryview: underlying buffer is not writable");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1301 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1302 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1303 if (!REQ_FORMAT(flags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1304 /* NULL indicates that the buffer's data type has been cast to 'B'.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1305 view->itemsize is the _previous_ itemsize. If shape is present,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1306 the equality product(shape) * itemsize = len still holds at this
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1307 point. The equality calcsize(format) = itemsize does _not_ hold
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1308 from here on! */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1309 view->format = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1310 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1311
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1312 if (REQ_C_CONTIGUOUS(flags) && !MV_C_CONTIGUOUS(baseflags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1313 PyErr_SetString(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1314 "memoryview: underlying buffer is not C-contiguous");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1315 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1316 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1317 if (REQ_F_CONTIGUOUS(flags) && !MV_F_CONTIGUOUS(baseflags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1318 PyErr_SetString(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1319 "memoryview: underlying buffer is not Fortran contiguous");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1320 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1321 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1322 if (REQ_ANY_CONTIGUOUS(flags) && !MV_ANY_CONTIGUOUS(baseflags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1323 PyErr_SetString(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1324 "memoryview: underlying buffer is not contiguous");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1325 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1326 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1327 if (!REQ_INDIRECT(flags) && (baseflags & _Py_MEMORYVIEW_PIL)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1328 PyErr_SetString(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1329 "memoryview: underlying buffer requires suboffsets");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1330 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1331 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1332 if (!REQ_STRIDES(flags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1333 if (!MV_C_CONTIGUOUS(baseflags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1334 PyErr_SetString(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1335 "memoryview: underlying buffer is not C-contiguous");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1336 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1337 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1338 view->strides = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1339 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1340 if (!REQ_SHAPE(flags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1341 /* PyBUF_SIMPLE or PyBUF_WRITABLE: at this point buf is C-contiguous,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1342 so base->buf = ndbuf->data. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1343 if (view->format != NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1344 /* PyBUF_SIMPLE\|PyBUF_FORMAT and PyBUF_WRITABLE\|PyBUF_FORMAT do
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1345 not make sense. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1346 PyErr_Format(PyExc_BufferError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1347 "ndarray: cannot cast to unsigned bytes if the format flag "
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1348 "is present");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1349 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1350 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1351 /* product(shape) * itemsize = len and calcsize(format) = itemsize
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1352 do _not_ hold from here on! */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1353 view->ndim = 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1354 view->shape = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1355 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1356
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1357
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1358 view->obj = (PyObject *)self;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1359 Py_INCREF(view->obj);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1360 self->exports++;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1361
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1362 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1363 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1364
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1365 static void
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1366 memory_releasebuf(PyMemoryViewObject self, Py_buffer view)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1367 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1368 self->exports--;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1369 return;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1370 /* PyBuffer_Release() decrements view->obj after this function returns. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1371 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1372
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1373 /* Buffer methods */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1374 static PyBufferProcs memory_as_buffer = {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1375 (getbufferproc)memory_getbuf, /* bf_getbuffer */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1376 (releasebufferproc)memory_releasebuf, /* bf_releasebuffer */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1377 };
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1378
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1379
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1380 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1381 /* Optimized pack/unpack for all native format specifiers */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1382 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1383
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1384 /*
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1385 Fix exceptions:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1386 1) Include format string in the error message.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1387 2) OverflowError -> ValueError.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1388 3) The error message from PyNumber_Index() is not ideal.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1389 */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1390 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1391 type_error_int(const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1392 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1393 PyErr_Format(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1394 "memoryview: invalid type for format '%s'", fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1395 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1396 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1397
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1398 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1399 value_error_int(const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1400 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1401 PyErr_Format(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1402 "memoryview: invalid value for format '%s'", fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1403 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1404 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1405
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1406 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1407 fix_error_int(const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1408 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1409 assert(PyErr_Occurred());
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1410 if (PyErr_ExceptionMatches(PyExc_TypeError)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1411 PyErr_Clear();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1412 return type_error_int(fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1413 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1414 else if (PyErr_ExceptionMatches(PyExc_OverflowError) \|\|
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1415 PyErr_ExceptionMatches(PyExc_ValueError)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1416 PyErr_Clear();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1417 return value_error_int(fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1418 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1419
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1420 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1421 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1422
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1423 /* Accept integer objects or objects with an __index__() method. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1424 static long
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1425 pylong_as_ld(PyObject *item)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1426 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1427 PyObject *tmp;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1428 long ld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1429
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1430 tmp = PyNumber_Index(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1431 if (tmp == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1432 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1433
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1434 ld = PyLong_AsLong(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1435 Py_DECREF(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1436 return ld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1437 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1438
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1439 static unsigned long
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1440 pylong_as_lu(PyObject *item)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1441 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1442 PyObject *tmp;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1443 unsigned long lu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1444
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1445 tmp = PyNumber_Index(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1446 if (tmp == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1447 return (unsigned long)-1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1448
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1449 lu = PyLong_AsUnsignedLong(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1450 Py_DECREF(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1451 return lu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1452 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1453
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1454 #ifdef HAVE_LONG_LONG
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1455 static PY_LONG_LONG
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1456 pylong_as_lld(PyObject *item)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1457 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1458 PyObject *tmp;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1459 PY_LONG_LONG lld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1460
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1461 tmp = PyNumber_Index(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1462 if (tmp == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1463 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1464
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1465 lld = PyLong_AsLongLong(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1466 Py_DECREF(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1467 return lld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1468 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1469
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1470 static unsigned PY_LONG_LONG
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1471 pylong_as_llu(PyObject *item)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1472 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1473 PyObject *tmp;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1474 unsigned PY_LONG_LONG llu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1475
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1476 tmp = PyNumber_Index(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1477 if (tmp == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1478 return (unsigned PY_LONG_LONG)-1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1479
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1480 llu = PyLong_AsUnsignedLongLong(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1481 Py_DECREF(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1482 return llu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1483 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1484 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1485
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1486 static Py_ssize_t
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1487 pylong_as_zd(PyObject *item)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1488 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1489 PyObject *tmp;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1490 Py_ssize_t zd;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1491
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1492 tmp = PyNumber_Index(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1493 if (tmp == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1494 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1495
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1496 zd = PyLong_AsSsize_t(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1497 Py_DECREF(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1498 return zd;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1499 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1500
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1501 static size_t
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1502 pylong_as_zu(PyObject *item)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1503 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1504 PyObject *tmp;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1505 size_t zu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1506
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1507 tmp = PyNumber_Index(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1508 if (tmp == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1509 return (size_t)-1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1510
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1511 zu = PyLong_AsSize_t(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1512 Py_DECREF(tmp);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1513 return zu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1514 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1515
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1516 /* Timings with the ndarray from _testbuffer.c indicate that using the
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1517 struct module is around 15x slower than the two functions below. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1518
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1519 #define UNPACK_SINGLE(dest, ptr, type) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1520 do { \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1521 type x; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1522 memcpy((char *)&x, ptr, sizeof x); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1523 dest = x; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1524 } while (0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1525
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1526 /* Unpack a single item. 'fmt' can be any native format character in struct
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1527 module syntax. This function is very sensitive to small changes. With this
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1528 layout gcc automatically generates a fast jump table. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1529 Py_LOCAL_INLINE(PyObject *)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1530 unpack_single(const char ptr, const char fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1531 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1532 unsigned PY_LONG_LONG llu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1533 unsigned long lu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1534 size_t zu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1535 PY_LONG_LONG lld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1536 long ld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1537 Py_ssize_t zd;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1538 double d;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1539 unsigned char uc;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1540 void *p;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1541
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1542 switch (fmt[0]) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1543
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1544 /* signed integers and fast path for 'B' */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1545 case 'B': uc = ((unsigned char )ptr); goto convert_uc;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1546 case 'b': ld = ((signed char )ptr); goto convert_ld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1547 case 'h': UNPACK_SINGLE(ld, ptr, short); goto convert_ld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1548 case 'i': UNPACK_SINGLE(ld, ptr, int); goto convert_ld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1549 case 'l': UNPACK_SINGLE(ld, ptr, long); goto convert_ld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1550
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1551 /* boolean */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1552 #ifdef HAVE_C99_BOOL
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1553 case '?': UNPACK_SINGLE(ld, ptr, _Bool); goto convert_bool;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1554 #else
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1555 case '?': UNPACK_SINGLE(ld, ptr, char); goto convert_bool;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1556 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1557
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1558 /* unsigned integers */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1559 case 'H': UNPACK_SINGLE(lu, ptr, unsigned short); goto convert_lu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1560 case 'I': UNPACK_SINGLE(lu, ptr, unsigned int); goto convert_lu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1561 case 'L': UNPACK_SINGLE(lu, ptr, unsigned long); goto convert_lu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1562
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1563 /* native 64-bit */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1564 #ifdef HAVE_LONG_LONG
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1565 case 'q': UNPACK_SINGLE(lld, ptr, PY_LONG_LONG); goto convert_lld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1566 case 'Q': UNPACK_SINGLE(llu, ptr, unsigned PY_LONG_LONG); goto convert_llu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1567 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1568
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1569 /* ssize_t and size_t */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1570 case 'n': UNPACK_SINGLE(zd, ptr, Py_ssize_t); goto convert_zd;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1571 case 'N': UNPACK_SINGLE(zu, ptr, size_t); goto convert_zu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1572
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1573 /* floats */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1574 case 'f': UNPACK_SINGLE(d, ptr, float); goto convert_double;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1575 case 'd': UNPACK_SINGLE(d, ptr, double); goto convert_double;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1576
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1577 /* bytes object */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1578 case 'c': goto convert_bytes;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1579
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1580 /* pointer */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1581 case 'P': UNPACK_SINGLE(p, ptr, void *); goto convert_pointer;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1582
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1583 /* default */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1584 default: goto err_format;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1585 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1586
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1587 convert_uc:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1588 /* PyLong_FromUnsignedLong() is slower */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1589 return PyLong_FromLong(uc);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1590 convert_ld:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1591 return PyLong_FromLong(ld);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1592 convert_lu:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1593 return PyLong_FromUnsignedLong(lu);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1594 convert_lld:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1595 return PyLong_FromLongLong(lld);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1596 convert_llu:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1597 return PyLong_FromUnsignedLongLong(llu);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1598 convert_zd:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1599 return PyLong_FromSsize_t(zd);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1600 convert_zu:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1601 return PyLong_FromSize_t(zu);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1602 convert_double:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1603 return PyFloat_FromDouble(d);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1604 convert_bool:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1605 return PyBool_FromLong(ld);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1606 convert_bytes:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1607 return PyBytes_FromStringAndSize(ptr, 1);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1608 convert_pointer:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1609 return PyLong_FromVoidPtr(p);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1610 err_format:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1611 PyErr_Format(PyExc_NotImplementedError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1612 "memoryview: format %s not supported", fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1613 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1614 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1615
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1616 #define PACK_SINGLE(ptr, src, type) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1617 do { \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1618 type x; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1619 x = (type)src; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1620 memcpy(ptr, (char *)&x, sizeof x); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1621 } while (0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1622
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1623 /* Pack a single item. 'fmt' can be any native format character in
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1624 struct module syntax. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1625 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1626 pack_single(char ptr, PyObject item, const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1627 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1628 unsigned PY_LONG_LONG llu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1629 unsigned long lu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1630 size_t zu;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1631 PY_LONG_LONG lld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1632 long ld;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1633 Py_ssize_t zd;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1634 double d;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1635 void *p;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1636
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1637 switch (fmt[0]) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1638 /* signed integers */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1639 case 'b': case 'h': case 'i': case 'l':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1640 ld = pylong_as_ld(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1641 if (ld == -1 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1642 goto err_occurred;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1643 switch (fmt[0]) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1644 case 'b':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1645 if (ld < SCHAR_MIN \|\| ld > SCHAR_MAX) goto err_range;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1646 ((signed char )ptr) = (signed char)ld; break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1647 case 'h':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1648 if (ld < SHRT_MIN \|\| ld > SHRT_MAX) goto err_range;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1649 PACK_SINGLE(ptr, ld, short); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1650 case 'i':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1651 if (ld < INT_MIN \|\| ld > INT_MAX) goto err_range;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1652 PACK_SINGLE(ptr, ld, int); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1653 default: /* 'l' */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1654 PACK_SINGLE(ptr, ld, long); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1655 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1656 break;
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1657
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1658 /* unsigned integers */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1659 case 'B': case 'H': case 'I': case 'L':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1660 lu = pylong_as_lu(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1661 if (lu == (unsigned long)-1 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1662 goto err_occurred;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1663 switch (fmt[0]) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1664 case 'B':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1665 if (lu > UCHAR_MAX) goto err_range;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1666 ((unsigned char )ptr) = (unsigned char)lu; break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1667 case 'H':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1668 if (lu > USHRT_MAX) goto err_range;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1669 PACK_SINGLE(ptr, lu, unsigned short); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1670 case 'I':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1671 if (lu > UINT_MAX) goto err_range;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1672 PACK_SINGLE(ptr, lu, unsigned int); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1673 default: /* 'L' */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1674 PACK_SINGLE(ptr, lu, unsigned long); break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1675 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1676 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1677
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1678 /* native 64-bit */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1679 #ifdef HAVE_LONG_LONG
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1680 case 'q':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1681 lld = pylong_as_lld(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1682 if (lld == -1 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1683 goto err_occurred;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1684 PACK_SINGLE(ptr, lld, PY_LONG_LONG);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1685 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1686 case 'Q':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1687 llu = pylong_as_llu(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1688 if (llu == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1689 goto err_occurred;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1690 PACK_SINGLE(ptr, llu, unsigned PY_LONG_LONG);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1691 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1692 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1693
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1694 /* ssize_t and size_t */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1695 case 'n':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1696 zd = pylong_as_zd(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1697 if (zd == -1 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1698 goto err_occurred;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1699 PACK_SINGLE(ptr, zd, Py_ssize_t);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1700 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1701 case 'N':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1702 zu = pylong_as_zu(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1703 if (zu == (size_t)-1 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1704 goto err_occurred;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1705 PACK_SINGLE(ptr, zu, size_t);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1706 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1707
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1708 /* floats */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1709 case 'f': case 'd':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1710 d = PyFloat_AsDouble(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1711 if (d == -1.0 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1712 goto err_occurred;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1713 if (fmt[0] == 'f') {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1714 PACK_SINGLE(ptr, d, float);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1715 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1716 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1717 PACK_SINGLE(ptr, d, double);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1718 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1719 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1720
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1721 /* bool */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1722 case '?':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1723 ld = PyObject_IsTrue(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1724 if (ld < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1725 return -1; /* preserve original error */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1726 #ifdef HAVE_C99_BOOL
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1727 PACK_SINGLE(ptr, ld, _Bool);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1728 #else
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1729 PACK_SINGLE(ptr, ld, char);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1730 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1731 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1732
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1733 /* bytes object */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1734 case 'c':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1735 if (!PyBytes_Check(item))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1736 return type_error_int(fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1737 if (PyBytes_GET_SIZE(item) != 1)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1738 return value_error_int(fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1739 *ptr = PyBytes_AS_STRING(item)[0];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1740 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1741
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1742 /* pointer */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1743 case 'P':
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1744 p = PyLong_AsVoidPtr(item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1745 if (p == NULL && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1746 goto err_occurred;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1747 PACK_SINGLE(ptr, p, void *);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1748 break;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1749
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1750 /* default */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1751 default: goto err_format;
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1752 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1753
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1754 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1755
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1756 err_occurred:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1757 return fix_error_int(fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1758 err_range:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1759 return value_error_int(fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1760 err_format:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1761 PyErr_Format(PyExc_NotImplementedError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1762 "memoryview: format %s not supported", fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1763 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1764 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1765
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1766
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1767 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1768 /* Representations */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1769 /****************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1770
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1771 /* allow explicit form of native format */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1772 Py_LOCAL_INLINE(const char *)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1773 adjust_fmt(const Py_buffer *view)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1774 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1775 const char *fmt;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1776
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1777 fmt = (view->format[0] == '@') ? view->format+1 : view->format;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1778 if (fmt[0] && fmt[1] == '\0')
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1779 return fmt;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1780
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1781 PyErr_Format(PyExc_NotImplementedError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1782 "memoryview: unsupported format %s", view->format);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1783 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1784 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1785
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1786 /* Base case for multi-dimensional unpacking. Assumption: ndim == 1. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1787 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1788 tolist_base(const char ptr, const Py_ssize_t shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1789 const Py_ssize_t strides, const Py_ssize_t suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1790 const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1791 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1792 PyObject lst, item;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1793 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1794
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1795 lst = PyList_New(shape[0]);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1796 if (lst == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1797 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1798
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1799 for (i = 0; i < shape[0]; ptr+=strides[0], i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1800 const char *xptr = ADJUST_PTR(ptr, suboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1801 item = unpack_single(xptr, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1802 if (item == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1803 Py_DECREF(lst);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1804 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1805 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1806 PyList_SET_ITEM(lst, i, item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1807 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1808
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1809 return lst;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1810 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1811
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1812 /* Unpack a multi-dimensional array into a nested list.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1813 Assumption: ndim >= 1. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1814 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1815 tolist_rec(const char ptr, Py_ssize_t ndim, const Py_ssize_t shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1816 const Py_ssize_t strides, const Py_ssize_t suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1817 const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1818 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1819 PyObject lst, item;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1820 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1821
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1822 assert(ndim >= 1);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1823 assert(shape != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1824 assert(strides != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1825
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1826 if (ndim == 1)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1827 return tolist_base(ptr, shape, strides, suboffsets, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1828
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1829 lst = PyList_New(shape[0]);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1830 if (lst == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1831 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1832
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1833 for (i = 0; i < shape[0]; ptr+=strides[0], i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1834 const char *xptr = ADJUST_PTR(ptr, suboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1835 item = tolist_rec(xptr, ndim-1, shape+1,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1836 strides+1, suboffsets ? suboffsets+1 : NULL,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1837 fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1838 if (item == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1839 Py_DECREF(lst);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1840 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1841 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1842 PyList_SET_ITEM(lst, i, item);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1843 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1844
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1845 return lst;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1846 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1847
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1848 /* Return a list representation of the memoryview. Currently only buffers
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1849 with native format strings are supported. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1850 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1851 memory_tolist(PyMemoryViewObject mv, PyObject noargs)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1852 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1853 const Py_buffer *view = &(mv->view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1854 const char *fmt;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1855
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1856 CHECK_RELEASED(mv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1857
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1858 fmt = adjust_fmt(view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1859 if (fmt == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1860 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1861 if (view->ndim == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1862 return unpack_single(view->buf, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1863 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1864 else if (view->ndim == 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1865 return tolist_base(view->buf, view->shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1866 view->strides, view->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1867 fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1868 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1869 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1870 return tolist_rec(view->buf, view->ndim, view->shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1871 view->strides, view->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1872 fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1873 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1874 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1875
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1876 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1877 memory_tobytes(PyMemoryViewObject self, PyObject dummy)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1878 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1879 Py_buffer *src = VIEW_ADDR(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1880 PyObject *bytes = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1881
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1882 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1883
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1884 if (MV_C_CONTIGUOUS(self->flags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1885 return PyBytes_FromStringAndSize(src->buf, src->len);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1886 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1887
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1888 bytes = PyBytes_FromStringAndSize(NULL, src->len);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1889 if (bytes == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1890 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1891
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1892 if (buffer_to_c_contiguous(PyBytes_AS_STRING(bytes), src) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1893 Py_DECREF(bytes);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1894 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1895 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	1896
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1897 return bytes;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1898 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1899
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1900 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1901 memory_repr(PyMemoryViewObject *self)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1902 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1903 if (self->flags & _Py_MEMORYVIEW_RELEASED)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1904 return PyUnicode_FromFormat("<released memory at %p>", self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1905 else
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1906 return PyUnicode_FromFormat("<memory at %p>", self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1907 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1908
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1909
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1910 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1911 /* Indexing and slicing */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1912 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1913
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1914 /* Get the pointer to the item at index. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1915 static char *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1916 ptr_from_index(Py_buffer *view, Py_ssize_t index)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1917 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1918 char *ptr;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1919 Py_ssize_t nitems; /* items in the first dimension */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1920
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1921 assert(view->shape);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1922 assert(view->strides);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1923
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1924 nitems = view->shape[0];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1925 if (index < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1926 index += nitems;
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1927 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1928 if (index < 0 \|\| index >= nitems) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1929 PyErr_SetString(PyExc_IndexError, "index out of bounds");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1930 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1931 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1932
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1933 ptr = (char *)view->buf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1934 ptr += view->strides[0] * index;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1935
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1936 ptr = ADJUST_PTR(ptr, view->suboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1937
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1938 return ptr;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1939 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1940
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1941 /* Return the item at index. In a one-dimensional view, this is an object
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1942 with the type specified by view->format. Otherwise, the item is a sub-view.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1943 The function is used in memory_subscript() and memory_as_sequence. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1944 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1945 memory_item(PyMemoryViewObject *self, Py_ssize_t index)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1946 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1947 Py_buffer *view = &(self->view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1948 const char *fmt;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1949
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1950 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1951
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1952 fmt = adjust_fmt(view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1953 if (fmt == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1954 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1955
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1956 if (view->ndim == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1957 PyErr_SetString(PyExc_TypeError, "invalid indexing of 0-dim memory");
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1958 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	1959 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1960 if (view->ndim == 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1961 char *ptr = ptr_from_index(view, index);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1962 if (ptr == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1963 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1964 return unpack_single(ptr, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1965 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1966
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1967 PyErr_SetString(PyExc_NotImplementedError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1968 "multi-dimensional sub-views are not implemented");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1969 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1970 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1971
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1972 Py_LOCAL_INLINE(int)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1973 init_slice(Py_buffer base, PyObject key, int dim)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1974 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1975 Py_ssize_t start, stop, step, slicelength;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1976
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1977 if (PySlice_GetIndicesEx(key, base->shape[dim],
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1978 &start, &stop, &step, &slicelength) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1979 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1980 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1981
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1982
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1983 if (base->suboffsets == NULL \|\| dim == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1984 adjust_buf:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1985 base->buf = (char )base->buf + base->strides[dim] start;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1986 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1987 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1988 Py_ssize_t n = dim-1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1989 while (n >= 0 && base->suboffsets[n] < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1990 n--;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1991 if (n < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1992 goto adjust_buf; /* all suboffsets are negative */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1993 base->suboffsets[n] = base->suboffsets[n] + base->strides[dim] * start;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1994 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1995 base->shape[dim] = slicelength;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1996 base->strides[dim] = base->strides[dim] * step;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1997
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1998 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	1999 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2000
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2001 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2002 is_multislice(PyObject *key)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2003 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2004 Py_ssize_t size, i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2005
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2006 if (!PyTuple_Check(key))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2007 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2008 size = PyTuple_GET_SIZE(key);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2009 if (size == 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2010 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2011
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2012 for (i = 0; i < size; i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2013 PyObject *x = PyTuple_GET_ITEM(key, i);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2014 if (!PySlice_Check(x))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2015 return 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2016 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2017 return 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2018 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2019
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2020 /* mv[obj] returns an object holding the data for one element if obj
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2021 fully indexes the memoryview or another memoryview object if it
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2022 does not.
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2023
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2024 0-d memoryview objects can be referenced using mv[...] or mv[()]
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2025 but not with anything else. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2026 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2027 memory_subscript(PyMemoryViewObject self, PyObject key)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2028 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2029 Py_buffer *view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2030 view = &(self->view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2031
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2032 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2033
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2034 if (view->ndim == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2035 if (PyTuple_Check(key) && PyTuple_GET_SIZE(key) == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2036 const char *fmt = adjust_fmt(view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2037 if (fmt == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2038 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2039 return unpack_single(view->buf, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2040 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2041 else if (key == Py_Ellipsis) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2042 Py_INCREF(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2043 return (PyObject *)self;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2044 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2045 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2046 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2047 "invalid indexing of 0-dim memory");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2048 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2049 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2050 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2051
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2052 if (PyIndex_Check(key)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2053 Py_ssize_t index;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2054 index = PyNumber_AsSsize_t(key, PyExc_IndexError);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2055 if (index == -1 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2056 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2057 return memory_item(self, index);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2058 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2059 else if (PySlice_Check(key)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2060 PyMemoryViewObject *sliced;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2061
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2062 sliced = (PyMemoryViewObject *)mbuf_add_view(self->mbuf, view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2063 if (sliced == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2064 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2065
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2066 if (init_slice(&sliced->view, key, 0) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2067 Py_DECREF(sliced);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2068 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2069 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2070 init_len(&sliced->view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2071 init_flags(sliced);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2072
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2073 return (PyObject *)sliced;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2074 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2075 else if (is_multislice(key)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2076 PyErr_SetString(PyExc_NotImplementedError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2077 "multi-dimensional slicing is not implemented");
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2078 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2079 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2080
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2081 PyErr_SetString(PyExc_TypeError, "memoryview: invalid slice key");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2082 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2083 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2084
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2085 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2086 memory_ass_sub(PyMemoryViewObject self, PyObject key, PyObject *value)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2087 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2088 Py_buffer *view = &(self->view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2089 Py_buffer src;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2090 const char *fmt;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2091 char *ptr;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2092
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2093 CHECK_RELEASED_INT(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2094
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2095 fmt = adjust_fmt(view);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2096 if (fmt == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2097 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2098
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2099 if (view->readonly) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2100 PyErr_SetString(PyExc_TypeError, "cannot modify read-only memory");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2101 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2102 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2103 if (value == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2104 PyErr_SetString(PyExc_TypeError, "cannot delete memory");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2105 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2106 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2107 if (view->ndim == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2108 if (key == Py_Ellipsis \|\|
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2109 (PyTuple_Check(key) && PyTuple_GET_SIZE(key)==0)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2110 ptr = (char *)view->buf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2111 return pack_single(ptr, value, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2112 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2113 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2114 PyErr_SetString(PyExc_TypeError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2115 "invalid indexing of 0-dim memory");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2116 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2117 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2118 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2119 if (view->ndim != 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2120 PyErr_SetString(PyExc_NotImplementedError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2121 "memoryview assignments are currently restricted to ndim = 1");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2122 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2123 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2124
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2125 if (PyIndex_Check(key)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2126 Py_ssize_t index = PyNumber_AsSsize_t(key, PyExc_IndexError);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2127 if (index == -1 && PyErr_Occurred())
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2128 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2129 ptr = ptr_from_index(view, index);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2130 if (ptr == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2131 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2132 return pack_single(ptr, value, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2133 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2134 /* one-dimensional: fast path */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2135 if (PySlice_Check(key) && view->ndim == 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2136 Py_buffer dest; /* sliced view */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2137 Py_ssize_t arrays[3];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2138 int ret = -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2139
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2140 /* rvalue must be an exporter */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2141 if (PyObject_GetBuffer(value, &src, PyBUF_FULL_RO) < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2142 return ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2143
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2144 dest = *view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2145 dest.shape = &arrays[0]; dest.shape[0] = view->shape[0];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2146 dest.strides = &arrays[1]; dest.strides[0] = view->strides[0];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2147 if (view->suboffsets) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2148 dest.suboffsets = &arrays[2]; dest.suboffsets[0] = view->suboffsets[0];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2149 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2150
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2151 if (init_slice(&dest, key, 0) < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2152 goto end_block;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2153 dest.len = dest.shape[0] * dest.itemsize;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2154
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2155 ret = copy_single(&dest, &src);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2156
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2157 end_block:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2158 PyBuffer_Release(&src);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2159 return ret;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2160 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2161 else if (PySlice_Check(key) \|\| is_multislice(key)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2162 /* Call memory_subscript() to produce a sliced lvalue, then copy
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2163 rvalue into lvalue. This is already implemented in _testbuffer.c. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2164 PyErr_SetString(PyExc_NotImplementedError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2165 "memoryview slice assignments are currently restricted "
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2166 "to ndim = 1");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2167 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2168 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2169
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2170 PyErr_SetString(PyExc_TypeError, "memoryview: invalid slice key");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2171 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2172 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2173
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2174 static Py_ssize_t
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2175 memory_length(PyMemoryViewObject *self)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2176 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2177 CHECK_RELEASED_INT(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2178 return self->view.ndim == 0 ? 1 : self->view.shape[0];
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2179 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2180
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2181 /* As mapping */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2182 static PyMappingMethods memory_as_mapping = {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2183 (lenfunc)memory_length, /* mp_length */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2184 (binaryfunc)memory_subscript, /* mp_subscript */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2185 (objobjargproc)memory_ass_sub, /* mp_ass_subscript */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2186 };
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2187
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2188 /* As sequence */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2189 static PySequenceMethods memory_as_sequence = {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2190 0, /* sq_length */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2191 0, /* sq_concat */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2192 0, /* sq_repeat */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2193 (ssizeargfunc)memory_item, /* sq_item */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2194 };
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2195
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2196
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2197 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2198 /* Comparisons */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2199 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2200
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2201 #define CMP_SINGLE(p, q, type) \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2202 do { \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2203 type x; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2204 type y; \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2205 memcpy((char *)&x, p, sizeof x); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2206 memcpy((char *)&y, q, sizeof y); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2207 equal = (x == y); \
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2208 } while (0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2209
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2210 Py_LOCAL_INLINE(int)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2211 unpack_cmp(const char p, const char q, const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2212 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2213 int equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2214
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2215 switch (fmt[0]) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2216
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2217 /* signed integers and fast path for 'B' */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2218 case 'B': return ((unsigned char )p) == ((unsigned char )q);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2219 case 'b': return ((signed char )p) == ((signed char )q);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2220 case 'h': CMP_SINGLE(p, q, short); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2221 case 'i': CMP_SINGLE(p, q, int); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2222 case 'l': CMP_SINGLE(p, q, long); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2223
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2224 /* boolean */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2225 #ifdef HAVE_C99_BOOL
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2226 case '?': CMP_SINGLE(p, q, _Bool); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2227 #else
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2228 case '?': CMP_SINGLE(p, q, char); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2229 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2230
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2231 /* unsigned integers */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2232 case 'H': CMP_SINGLE(p, q, unsigned short); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2233 case 'I': CMP_SINGLE(p, q, unsigned int); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2234 case 'L': CMP_SINGLE(p, q, unsigned long); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2235
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2236 /* native 64-bit */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2237 #ifdef HAVE_LONG_LONG
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2238 case 'q': CMP_SINGLE(p, q, PY_LONG_LONG); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2239 case 'Q': CMP_SINGLE(p, q, unsigned PY_LONG_LONG); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2240 #endif
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2241
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2242 /* ssize_t and size_t */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2243 case 'n': CMP_SINGLE(p, q, Py_ssize_t); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2244 case 'N': CMP_SINGLE(p, q, size_t); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2245
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2246 /* floats */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2247 /* XXX DBL_EPSILON? */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2248 case 'f': CMP_SINGLE(p, q, float); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2249 case 'd': CMP_SINGLE(p, q, double); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2250
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2251 /* bytes object */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2252 case 'c': return p == q;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2253
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2254 /* pointer */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2255 case 'P': CMP_SINGLE(p, q, void *); return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2256
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2257 /* Py_NotImplemented */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2258 default: return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2259 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2260 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2261
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2262 /* Base case for recursive array comparisons. Assumption: ndim == 1. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2263 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2264 cmp_base(const char p, const char q, const Py_ssize_t *shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2265 const Py_ssize_t pstrides, const Py_ssize_t psuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2266 const Py_ssize_t qstrides, const Py_ssize_t qsuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2267 const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2268 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2269 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2270 int equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2271
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2272 for (i = 0; i < shape[0]; p+=pstrides[0], q+=qstrides[0], i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2273 const char *xp = ADJUST_PTR(p, psuboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2274 const char *xq = ADJUST_PTR(q, qsuboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2275 equal = unpack_cmp(xp, xq, fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2276 if (equal <= 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2277 return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2278 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2279
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2280 return 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2281 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2282
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2283 /* Recursively compare two multi-dimensional arrays that have the same
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2284 logical structure. Assumption: ndim >= 1. */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2285 static int
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2286 cmp_rec(const char p, const char q,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2287 Py_ssize_t ndim, const Py_ssize_t *shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2288 const Py_ssize_t pstrides, const Py_ssize_t psuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2289 const Py_ssize_t qstrides, const Py_ssize_t qsuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2290 const char *fmt)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2291 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2292 Py_ssize_t i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2293 int equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2294
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2295 assert(ndim >= 1);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2296 assert(shape != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2297 assert(pstrides != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2298 assert(qstrides != NULL);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2299
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2300 if (ndim == 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2301 return cmp_base(p, q, shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2302 pstrides, psuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2303 qstrides, qsuboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2304 fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2305 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2306
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2307 for (i = 0; i < shape[0]; p+=pstrides[0], q+=qstrides[0], i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2308 const char *xp = ADJUST_PTR(p, psuboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2309 const char *xq = ADJUST_PTR(q, qsuboffsets);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2310 equal = cmp_rec(xp, xq, ndim-1, shape+1,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2311 pstrides+1, psuboffsets ? psuboffsets+1 : NULL,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2312 qstrides+1, qsuboffsets ? qsuboffsets+1 : NULL,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2313 fmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2314 if (equal <= 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2315 return equal;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2316 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2317
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2318 return 1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2319 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2320
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2321 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2322 memory_richcompare(PyObject v, PyObject w, int op)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2323 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2324 PyObject *res;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2325 Py_buffer wbuf, vv, ww = NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2326 const char vfmt, wfmt;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2327 int equal = -1; /* Py_NotImplemented */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2328
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2329 if (op != Py_EQ && op != Py_NE)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2330 goto result; /* Py_NotImplemented */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2331
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2332 assert(PyMemoryView_Check(v));
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2333 if (BASE_INACCESSIBLE(v)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2334 equal = (v == w);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2335 goto result;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2336 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2337 vv = VIEW_ADDR(v);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2338
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2339 if (PyMemoryView_Check(w)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2340 if (BASE_INACCESSIBLE(w)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2341 equal = (v == w);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2342 goto result;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2343 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2344 ww = VIEW_ADDR(w);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2345 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2346 else {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2347 if (PyObject_GetBuffer(w, &wbuf, PyBUF_FULL_RO) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2348 PyErr_Clear();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2349 goto result; /* Py_NotImplemented */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2350 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2351 ww = &wbuf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2352 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2353
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2354 vfmt = adjust_fmt(vv);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2355 wfmt = adjust_fmt(ww);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2356 if (vfmt == NULL \|\| wfmt == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2357 PyErr_Clear();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2358 goto result; /* Py_NotImplemented */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2359 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2360
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2361 if (cmp_structure(vv, ww) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2362 PyErr_Clear();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2363 equal = 0;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2364 goto result;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2365 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2366
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2367 if (vv->ndim == 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2368 equal = unpack_cmp(vv->buf, ww->buf, vfmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2369 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2370 else if (vv->ndim == 1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2371 equal = cmp_base(vv->buf, ww->buf, vv->shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2372 vv->strides, vv->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2373 ww->strides, ww->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2374 vfmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2375 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2376 else {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2377 equal = cmp_rec(vv->buf, ww->buf, vv->ndim, vv->shape,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2378 vv->strides, vv->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2379 ww->strides, ww->suboffsets,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2380 vfmt);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2381 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2382
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2383 result:
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2384 if (equal < 0)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2385 res = Py_NotImplemented;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2386 else if ((equal && op == Py_EQ) \|\| (!equal && op == Py_NE))
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2387 res = Py_True;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2388 else
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2389 res = Py_False;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2390
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2391 if (ww == &wbuf)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2392 PyBuffer_Release(ww);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2393 Py_INCREF(res);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2394 return res;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2395 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2396
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2397 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2398 /* Hash */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2399 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2400
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2401 static Py_hash_t
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2402 memory_hash(PyMemoryViewObject *self)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2403 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2404 if (self->hash == -1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2405 Py_buffer *view = &self->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2406 char *mem = view->buf;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2407
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2408 CHECK_RELEASED_INT(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2409
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2410 if (!view->readonly) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2411 PyErr_SetString(PyExc_ValueError,
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2412 "cannot hash writable memoryview object");
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2413 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2414 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2415 if (view->obj != NULL && PyObject_Hash(view->obj) == -1) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2416 /* Keep the original error message */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2417 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2418 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2419
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2420 if (!MV_C_CONTIGUOUS(self->flags)) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2421 mem = PyMem_Malloc(view->len);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2422 if (mem == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2423 PyErr_NoMemory();
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2424 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2425 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2426 if (buffer_to_c_contiguous(mem, view) < 0) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2427 PyMem_Free(mem);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2428 return -1;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2429 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2430 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2431
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2432 /* Can't fail */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2433 self->hash = _Py_HashBytes((unsigned char *)mem, view->len);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2434
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2435 if (mem != view->buf)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2436 PyMem_Free(mem);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2437 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2438
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2439 return self->hash;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2440 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2441
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2442
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2443 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2444 /* getters */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2445 /**************************************************************************/
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2446
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2447 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2448 _IntTupleFromSsizet(int len, Py_ssize_t *vals)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2449 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2450 int i;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2451 PyObject *o;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2452 PyObject *intTuple;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2453
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2454 if (vals == NULL)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2455 return PyTuple_New(0);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2456
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2457 intTuple = PyTuple_New(len);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2458 if (!intTuple)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2459 return NULL;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2460 for (i=0; i<len; i++) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2461 o = PyLong_FromSsize_t(vals[i]);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2462 if (!o) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2463 Py_DECREF(intTuple);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2464 return NULL;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2465 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2466 PyTuple_SET_ITEM(intTuple, i, o);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2467 }
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2468 return intTuple;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2469 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2470
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2471 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2472 memory_obj_get(PyMemoryViewObject *self)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2473 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2474 Py_buffer *view = &self->view;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2475
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2476 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2477 if (view->obj == NULL) {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2478 Py_RETURN_NONE;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2479 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2480 Py_INCREF(view->obj);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2481 return view->obj;
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2482 }
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2483
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2484 static PyObject *
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2485 memory_nbytes_get(PyMemoryViewObject *self)
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2486 {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2487 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2488 return PyLong_FromSsize_t(self->view.len);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2489 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2490
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2491 static PyObject *
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2492 memory_format_get(PyMemoryViewObject *self)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2493 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2494 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2495 return PyUnicode_FromString(self->view.format);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2496 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2497
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2498 static PyObject *
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2499 memory_itemsize_get(PyMemoryViewObject *self)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2500 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2501 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2502 return PyLong_FromSsize_t(self->view.itemsize);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2503 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2504
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2505 static PyObject *
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2506 memory_shape_get(PyMemoryViewObject *self)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2507 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2508 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2509 return _IntTupleFromSsizet(self->view.ndim, self->view.shape);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2510 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2511
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2512 static PyObject *
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2513 memory_strides_get(PyMemoryViewObject *self)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2514 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2515 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2516 return _IntTupleFromSsizet(self->view.ndim, self->view.strides);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2517 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2518
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2519 static PyObject *
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2520 memory_suboffsets_get(PyMemoryViewObject *self)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2521 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2522 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2523 return _IntTupleFromSsizet(self->view.ndim, self->view.suboffsets);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2524 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2525
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2526 static PyObject *
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2527 memory_readonly_get(PyMemoryViewObject *self)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2528 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2529 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2530 return PyBool_FromLong(self->view.readonly);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2531 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2532
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2533 static PyObject *
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2534 memory_ndim_get(PyMemoryViewObject *self)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2535 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2536 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2537 return PyLong_FromLong(self->view.ndim);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2538 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2539
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2540 static PyObject *
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2541 memory_c_contiguous(PyMemoryViewObject self, PyObject dummy)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2542 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2543 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2544 return PyBool_FromLong(MV_C_CONTIGUOUS(self->flags));
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2545 }
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2546
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2547 static PyObject *
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2548 memory_f_contiguous(PyMemoryViewObject self, PyObject dummy)
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2549 {
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	2550 CHECK_RELEASED(self);
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2551 return PyBool_FromLong(MV_F_CONTIGUOUS(self->flags));
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2552 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2553
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2554 static PyObject *
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2555 memory_contiguous(PyMemoryViewObject self, PyObject dummy)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2556 {
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2557 CHECK_RELEASED(self);
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2558 return PyBool_FromLong(MV_ANY_CONTIGUOUS(self->flags));
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2559 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2560
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2561 static PyGetSetDef memory_getsetlist[] = {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2562 {"obj", (getter)memory_obj_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2563 {"nbytes", (getter)memory_nbytes_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2564 {"readonly", (getter)memory_readonly_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2565 {"itemsize", (getter)memory_itemsize_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2566 {"format", (getter)memory_format_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2567 {"ndim", (getter)memory_ndim_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2568 {"shape", (getter)memory_shape_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2569 {"strides", (getter)memory_strides_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2570 {"suboffsets", (getter)memory_suboffsets_get, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2571 {"c_contiguous", (getter)memory_c_contiguous, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2572 {"f_contiguous", (getter)memory_f_contiguous, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2573 {"contiguous", (getter)memory_contiguous, NULL, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2574 {NULL, NULL, NULL, NULL},
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2575 };
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2576
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2577
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2578 static PyMethodDef memory_methods[] = {
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2579 {"release", (PyCFunction)memory_release, METH_NOARGS},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2580 {"tobytes", (PyCFunction)memory_tobytes, METH_NOARGS, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2581 {"tolist", (PyCFunction)memory_tolist, METH_NOARGS, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2582 {"cast", (PyCFunction)memory_cast, METH_VARARGS\|METH_KEYWORDS, NULL},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2583 {"__enter__", memory_enter, METH_NOARGS},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2584 {"__exit__", memory_exit, METH_VARARGS},
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2585 {NULL, NULL}
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2586 };
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2587
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2588
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2589 PyTypeObject PyMemoryView_Type = {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2590 PyVarObject_HEAD_INIT(&PyType_Type, 0)
75254 3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2591 "memoryview", /* tp_name */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2592 offsetof(PyMemoryViewObject, ob_array), /* tp_basicsize */
3f9b3b6f7ff0 - Issue #10181: New memoryview implementation fixes multiple ownership Stefan Krah <skrah@bytereef.org> parents: 73669 diff changeset	2593 sizeof(Py_ssize_t), /* tp_itemsize */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2594 (destructor)memory_dealloc, /* tp_dealloc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2595 0, /* tp_print */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2596 0, /* tp_getattr */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2597 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50501 diff changeset	2598 0, /* tp_reserved */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2599 (reprfunc)memory_repr, /* tp_repr */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2600 0, /* tp_as_number */
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	2601 &memory_as_sequence, /* tp_as_sequence */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2602 &memory_as_mapping, /* tp_as_mapping */
73669 215690b782f8 Issue #13411: memoryview objects are now hashable when the underlying object is hashable. Antoine Pitrou <solipsis@pitrou.net> parents: 71810 diff changeset	2603 (hashfunc)memory_hash, /* tp_hash */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2604 0, /* tp_call */
51468 4313b4d4bdc7 Merged revisions 69438 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	2605 0, /* tp_str */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2606 PyObject_GenericGetAttr, /* tp_getattro */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2607 0, /* tp_setattro */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2608 &memory_as_buffer, /* tp_as_buffer */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2609 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2610 memory_doc, /* tp_doc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2611 (traverseproc)memory_traverse, /* tp_traverse */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2612 (inquiry)memory_clear, /* tp_clear */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2613 memory_richcompare, /* tp_richcompare */
77213 bc0281f85409 Issue #14930: Make memoryview objects weakrefable. Richard Oudkerk <shibturn@gmail.com> parents: 75440 diff changeset	2614 offsetof(PyMemoryViewObject, weakreflist),/* tp_weaklistoffset */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2615 0, /* tp_iter */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2616 0, /* tp_iternext */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2617 memory_methods, /* tp_methods */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2618 0, /* tp_members */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2619 memory_getsetlist, /* tp_getset */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2620 0, /* tp_base */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2621 0, /* tp_dict */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2622 0, /* tp_descr_get */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2623 0, /* tp_descr_set */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2624 0, /* tp_dictoffset */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2625 0, /* tp_init */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2626 0, /* tp_alloc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	2627 memory_new, /* tp_new */
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	2628 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/memoryobject.c @ 78088:eaafae4e275e