From 95de32aa7fbb1a2da547418b296f649ee4be1feb Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 5 Sep 2017 11:01:17 +0300 Subject: py: drop the fancy event handling Unfortunately the nice event handler added previously doesn't work: we may get multiple page-flip events, which would lead to unref'ing the passed python object multiple times, leading to memory corruption. I guess it's only possible to pass a plain int as user data to commit() and page_flip(). --- py/pykms/pykmsbase.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'py/pykms/pykmsbase.cpp') diff --git a/py/pykms/pykmsbase.cpp b/py/pykms/pykmsbase.cpp index 604e07c..e53fe54 100644 --- a/py/pykms/pykmsbase.cpp +++ b/py/pykms/pykmsbase.cpp @@ -53,13 +53,10 @@ void init_pykmsbase(py::module &m) .def("set_mode", &Crtc::set_mode) .def("disable_mode", &Crtc::disable_mode) .def("page_flip", - [](Crtc* self, Framebuffer& fb, py::object ob) + [](Crtc* self, Framebuffer& fb, uint32_t data) { - // This adds a ref to the object, and must be unpacked with __ob_unpack_helper() - PyObject* pob = ob.ptr(); - Py_XINCREF(pob); - self->page_flip(fb, pob); - }) + self->page_flip(fb, (void*)(intptr_t)data); + }, py::arg("fb"), py::arg("data") = 0) .def("set_plane", &Crtc::set_plane) .def_property_readonly("possible_planes", &Crtc::get_possible_planes) .def_property_readonly("primary_plane", &Crtc::get_primary_plane) @@ -196,13 +193,10 @@ void init_pykmsbase(py::module &m) .def("add", (void (AtomicReq::*)(DrmPropObject*, const map&)) &AtomicReq::add) .def("test", &AtomicReq::test, py::arg("allow_modeset") = false) .def("commit", - [](AtomicReq* self, py::object ob, bool allow) + [](AtomicReq* self, uint32_t data, bool allow) { - // This adds a ref to the object, and must be unpacked with __ob_unpack_helper() - PyObject* pob = ob.ptr(); - Py_XINCREF(pob); - return self->commit(pob, allow); - }, py::arg("data"), py::arg("allow_modeset") = false) + return self->commit((void*)(intptr_t)data, allow); + }, py::arg("data") = 0, py::arg("allow_modeset") = false) .def("commit_sync", &AtomicReq::commit_sync, py::arg("allow_modeset") = false) ; } -- cgit v1.2.3