Author: Richard Plangger <[email protected]>
Branch:
Changeset: r89401:0615cd861fd0
Date: 2017-01-06 17:20 +0100
http://bitbucket.org/pypy/pypy/changeset/0615cd861fd0/
Log: merge cpyext-from2
diff --git a/pypy/module/cpyext/memoryobject.py
b/pypy/module/cpyext/memoryobject.py
--- a/pypy/module/cpyext/memoryobject.py
+++ b/pypy/module/cpyext/memoryobject.py
@@ -35,8 +35,24 @@
"""
Fills a newly allocated PyMemoryViewObject with the given W_MemoryView
object.
"""
+ assert isinstance(w_obj, W_MemoryView)
py_obj = rffi.cast(PyMemoryViewObject, py_obj)
- py_obj.c_view.c_obj = rffi.cast(PyObject, 0)
+ view = py_obj.c_view
+ ndim = w_obj.buf.getndim()
+ if ndim >= Py_MAX_NDIMS:
+ # XXX warn?
+ return
+ fill_Py_buffer(space, w_obj.buf, view)
+ try:
+ view.c_buf = rffi.cast(rffi.VOIDP, w_obj.buf.get_raw_address())
+ view.c_obj = make_ref(space, w_userdata)
+ rffi.setintfield(view, 'c_readonly', w_obj.buf.readonly)
+ except ValueError:
+ w_s = w_obj.descr_tobytes(space)
+ view.c_obj = make_ref(space, w_s)
+ view.c_buf = rffi.cast(rffi.VOIDP, rffi.str2charp(space.str_w(w_s),
+ track_allocation=False))
+ rffi.setintfield(view, 'c_readonly', 1)
def memory_realize(space, py_obj):
"""
@@ -88,29 +104,13 @@
return ret
@cpython_api([PyObject], Py_bufferP, error=CANNOT_FAIL)
-def PyMemoryView_GET_BUFFER(space, w_obj):
+def PyMemoryView_GET_BUFFER(space, pyobj):
"""Return a pointer to the buffer-info structure wrapped by the given
object. The object must be a memoryview instance; this macro doesn't
check its type, you must do it yourself or you will risk crashes."""
- if not isinstance(w_obj, W_MemoryView):
- return lltype.nullptr(Py_buffer)
- py_memobj = rffi.cast(PyMemoryViewObject, as_pyobj(space, w_obj)) # no
inc_ref
- view = py_memobj.c_view
- ndim = w_obj.buf.getndim()
- if ndim >= Py_MAX_NDIMS:
- # XXX warn?
- return view
- fill_Py_buffer(space, w_obj.buf, view)
- try:
- view.c_buf = rffi.cast(rffi.VOIDP, w_obj.buf.get_raw_address())
- #view.c_obj = make_ref(space, w_obj) # NO - this creates a ref cycle!
- rffi.setintfield(view, 'c_readonly', w_obj.buf.readonly)
- except ValueError:
- w_s = w_obj.descr_tobytes(space)
- view.c_obj = make_ref(space, w_s)
- view.c_buf = rffi.cast(rffi.VOIDP, rffi.str2charp(space.str_w(w_s),
track_allocation=False))
- rffi.setintfield(view, 'c_readonly', 1)
- return view
+ # XXX move to a c-macro
+ py_memobj = rffi.cast(PyMemoryViewObject, pyobj)
+ return py_memobj.c_view
def fill_Py_buffer(space, buf, view):
# c_buf, c_obj have been filled in
@@ -202,9 +202,11 @@
return (_IsCContiguous(view) or _IsFortranContiguous(view))
return 0
-@cpython_api([PyObject], PyObject)
+@cpython_api([PyObject], PyObject, result_is_ll=True)
def PyMemoryView_FromObject(space, w_obj):
- return space.call_method(space.builtin, "memoryview", w_obj)
+ w_memview = space.call_method(space.builtin, "memoryview", w_obj)
+ py_memview = make_ref(space, w_memview, w_obj)
+ return py_memview
@cpython_api([Py_bufferP], PyObject)
def PyMemoryView_FromBuffer(space, view):
@@ -212,6 +214,7 @@
The memoryview object then owns the buffer, which means you shouldn't
try to release it yourself: it will be released on deallocation of the
memoryview object."""
+ assert view.c_obj
w_obj = from_ref(space, view.c_obj)
if isinstance(w_obj, W_MemoryView):
return w_obj
diff --git a/pypy/module/cpyext/test/test_memoryobject.py
b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -4,6 +4,7 @@
from pypy.module.cpyext.test.test_api import BaseApiTest
from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
from rpython.rlib.buffer import StringBuffer
+from pypy.module.cpyext.pyobject import from_ref
only_pypy ="config.option.runappdirect and '__pypy__' not in
sys.builtin_module_names"
@@ -11,7 +12,7 @@
def test_fromobject(self, space, api):
w_hello = space.newbytes("hello")
assert api.PyObject_CheckBuffer(w_hello)
- w_view = api.PyMemoryView_FromObject(w_hello)
+ w_view = from_ref(space, api.PyMemoryView_FromObject(w_hello))
w_char = space.call_method(w_view, '__getitem__', space.wrap(0))
assert space.eq_w(w_char, space.wrap('h'))
w_bytes = space.call_method(w_view, "tobytes")
@@ -19,7 +20,7 @@
def test_frombuffer(self, space, api):
w_buf = space.newbuffer(StringBuffer("hello"))
- w_memoryview = api.PyMemoryView_FromObject(w_buf)
+ w_memoryview = from_ref(space, api.PyMemoryView_FromObject(w_buf))
view = api.PyMemoryView_GET_BUFFER(w_memoryview)
assert view.c_ndim == 1
f = rffi.charp2str(view.c_format)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
