Patch Detail
Show a patch.
GET /api/1.1/patches/17178/?format=api
{ "id": 17178, "url": "https://patchwork.libcamera.org/api/1.1/patches/17178/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17178/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220819111615.39814-4-tomi.valkeinen@ideasonboard.com>", "date": "2022-08-19T11:16:12", "name": "[libcamera-devel,v4,3/6] py: Use UniqueFD", "commit_ref": "f4933ee77f40b4861f2dd513b913065ac1bad96f", "pull_url": null, "state": "accepted", "archived": false, "hash": "a8cd8f5ff68e02b51772f645f7aa76bf7b84cc48", "submitter": { "id": 109, "url": "https://patchwork.libcamera.org/api/1.1/people/109/?format=api", "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17178/mbox/", "series": [ { "id": 3428, "url": "https://patchwork.libcamera.org/api/1.1/series/3428/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3428", "date": "2022-08-19T11:16:09", "name": "Python bindings: PyCameraManager and non-blocking eventfd", "version": 4, "mbox": "https://patchwork.libcamera.org/series/3428/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17178/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17178/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 01ED0C327D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 19 Aug 2022 11:16:36 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AB17261FCF;\n\tFri, 19 Aug 2022 13:16:36 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B767A61FA4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 19 Aug 2022 13:16:31 +0200 (CEST)", "from deskari.lan (91-158-154-79.elisa-laajakaista.fi\n\t[91.158.154.79])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 30B25D51;\n\tFri, 19 Aug 2022 13:16:31 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660907796;\n\tbh=pIBSw2MG0xHoUVahGKD6tsWMWqXwvmJx/AUNp1RZles=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=CCWbfvh5Ks0unQpy7cqzjy+RSKf68g0/7WEvgfx0bQg5SMTooFL0nICMbqaUrPWwH\n\tSCOTvsQ0LcpjJMoEX9lhaYK1kBZgZq8/Sai02BhwBSCjm3jV0316TB4WYk7f508wOm\n\tv4Hd0mFgF8WTlMdaG1vEBONWBCzVYs78G/J1UVrtBCI5Sr828NOuEEtik6r1ic/a/U\n\tDcHnpb+D2KAhiuUszAo/zvn/rdDZvMj9pzI/FHScVSuI22vDiKut/2fntFYm9CTm/4\n\tE7boN0EUkb5GkGEmcoKDZJxZrhIPZ+E2KmhqM3s4g4PgRkJEL7l1PvN2G4CCsnx3LT\n\tJMBQp5cJP31/Q==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660907791;\n\tbh=pIBSw2MG0xHoUVahGKD6tsWMWqXwvmJx/AUNp1RZles=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VWssCl9nVTpp0syJYi/JOn/tbg3y++wQVjhGMejdInV41PAmwOjXKFg2/lnvKUIzj\n\tLG+5Rjkyv90CEQ89QDIF9KzAFmKKywNc3WRF937iIxonqXKu1xdwp/Nd274fuHWfGL\n\tEY/Bxy+L2F5Cv/qRBHjattTQQtiLVGJqhccp1w6Y=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"VWssCl9n\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org,\n\tDavid Plowman <david.plowman@raspberrypi.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tJacopo Mondi <jacopo@jmondi.org>", "Date": "Fri, 19 Aug 2022 14:16:12 +0300", "Message-Id": "<20220819111615.39814-4-tomi.valkeinen@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220819111615.39814-1-tomi.valkeinen@ideasonboard.com>", "References": "<20220819111615.39814-1-tomi.valkeinen@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 3/6] py: Use UniqueFD", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Tomi Valkeinen via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Use UniqueFD to automate the eventfd lifetime management.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/py/libcamera/py_camera_manager.cpp | 16 ++++------------\n src/py/libcamera/py_camera_manager.h | 4 ++--\n 2 files changed, 6 insertions(+), 14 deletions(-)", "diff": "diff --git a/src/py/libcamera/py_camera_manager.cpp b/src/py/libcamera/py_camera_manager.cpp\nindex 228fb212..18fdb623 100644\n--- a/src/py/libcamera/py_camera_manager.cpp\n+++ b/src/py/libcamera/py_camera_manager.cpp\n@@ -29,25 +29,17 @@ PyCameraManager::PyCameraManager()\n \t\tthrow std::system_error(errno, std::generic_category(),\n \t\t\t\t\t\"Failed to create eventfd\");\n \n-\teventFd_ = fd;\n+\teventFd_ = UniqueFD(fd);\n \n \tint ret = cameraManager_->start();\n-\tif (ret) {\n-\t\tclose(fd);\n-\t\teventFd_ = -1;\n+\tif (ret)\n \t\tthrow std::system_error(-ret, std::generic_category(),\n \t\t\t\t\t\"Failed to start CameraManager\");\n-\t}\n }\n \n PyCameraManager::~PyCameraManager()\n {\n \tLOG(Python, Debug) << \"~PyCameraManager()\";\n-\n-\tif (eventFd_ != -1) {\n-\t\tclose(eventFd_);\n-\t\teventFd_ = -1;\n-\t}\n }\n \n py::list PyCameraManager::cameras()\n@@ -95,7 +87,7 @@ void PyCameraManager::writeFd()\n {\n \tuint64_t v = 1;\n \n-\tsize_t s = write(eventFd_, &v, 8);\n+\tsize_t s = write(eventFd_.get(), &v, 8);\n \t/*\n \t * We should never fail, and have no simple means to manage the error,\n \t * so let's log a fatal error.\n@@ -108,7 +100,7 @@ void PyCameraManager::readFd()\n {\n \tuint8_t buf[8];\n \n-\tif (read(eventFd_, buf, 8) != 8)\n+\tif (read(eventFd_.get(), buf, 8) != 8)\n \t\tthrow std::system_error(errno, std::generic_category());\n }\n \ndiff --git a/src/py/libcamera/py_camera_manager.h b/src/py/libcamera/py_camera_manager.h\nindex 9c15f814..710163e8 100644\n--- a/src/py/libcamera/py_camera_manager.h\n+++ b/src/py/libcamera/py_camera_manager.h\n@@ -24,7 +24,7 @@ public:\n \n \tstatic const std::string &version() { return CameraManager::version(); }\n \n-\tint eventFd() const { return eventFd_; }\n+\tint eventFd() const { return eventFd_.get(); }\n \n \tstd::vector<pybind11::object> getReadyRequests();\n \n@@ -33,7 +33,7 @@ public:\n private:\n \tstd::unique_ptr<CameraManager> cameraManager_;\n \n-\tint eventFd_ = -1;\n+\tUniqueFD eventFd_;\n \tstd::mutex completedRequestsMutex_;\n \tstd::vector<Request *> completedRequests_;\n \n", "prefixes": [ "libcamera-devel", "v4", "3/6" ] }