[{"id":23192,"web_url":"https://patchwork.libcamera.org/comment/23192/","msgid":"","date":"2022-05-27T10:53:35","subject":"Re: [libcamera-devel] [PATCH v2 17/19] py: Rename 'efd' to\n\t'event_fd'","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Tomi,\n\nThank you for the patch.\n\nOn Tue, May 24, 2022 at 02:46:08PM +0300, Tomi Valkeinen wrote:\n> From: Tomi Valkeinen \n> \n> Perhaps it's better to have a more descriptive name here. I also\n> considered just renaming 'efd' to 'fd', but 'event_fd' won.\n> \n> Signed-off-by: Tomi Valkeinen \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/py/cam/cam_kms.py | 2 +-\n> src/py/cam/cam_null.py | 2 +-\n> src/py/cam/cam_qt.py | 2 +-\n> src/py/cam/cam_qtgl.py | 2 +-\n> src/py/examples/itest.py | 2 +-\n> src/py/examples/simple-continuous-capture.py | 2 +-\n> src/py/libcamera/py_main.cpp | 2 +-\n> test/py/unittests.py | 2 +-\n> 8 files changed, 8 insertions(+), 8 deletions(-)\n> \n> diff --git a/src/py/cam/cam_kms.py b/src/py/cam/cam_kms.py\n> index 213e0b03..49b00211 100644\n> --- a/src/py/cam/cam_kms.py\n> +++ b/src/py/cam/cam_kms.py\n> @@ -161,7 +161,7 @@ class KMSRenderer:\n> \n> sel = selectors.DefaultSelector()\n> sel.register(self.card.fd, selectors.EVENT_READ, self.readdrm)\n> - sel.register(self.cm.efd, selectors.EVENT_READ, self.readcam)\n> + sel.register(self.cm.event_fd, selectors.EVENT_READ, self.readcam)\n> sel.register(sys.stdin, selectors.EVENT_READ, self.readkey)\n> \n> print('Press enter to exit')\n> diff --git a/src/py/cam/cam_null.py b/src/py/cam/cam_null.py\n> index 45c5f467..40dbd266 100644\n> --- a/src/py/cam/cam_null.py\n> +++ b/src/py/cam/cam_null.py\n> @@ -23,7 +23,7 @@ class NullRenderer:\n> self.running = True\n> \n> sel = selectors.DefaultSelector()\n> - sel.register(self.cm.efd, selectors.EVENT_READ, self.readcam)\n> + sel.register(self.cm.event_fd, selectors.EVENT_READ, self.readcam)\n> sel.register(sys.stdin, selectors.EVENT_READ, self.readkey)\n> \n> print('Press enter to exit')\n> diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\n> index 739e9749..d8d6a98f 100644\n> --- a/src/py/cam/cam_qt.py\n> +++ b/src/py/cam/cam_qt.py\n> @@ -193,7 +193,7 @@ class QtRenderer:\n> self.windows = windows\n> \n> def run(self):\n> - camnotif = QtCore.QSocketNotifier(self.cm.efd, QtCore.QSocketNotifier.Read)\n> + camnotif = QtCore.QSocketNotifier(self.cm.event_fd, QtCore.QSocketNotifier.Read)\n> camnotif.activated.connect(lambda _: self.readcam())\n> \n> keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)\n> diff --git a/src/py/cam/cam_qtgl.py b/src/py/cam/cam_qtgl.py\n> index 5f7ccf1e..4b43f51d 100644\n> --- a/src/py/cam/cam_qtgl.py\n> +++ b/src/py/cam/cam_qtgl.py\n> @@ -142,7 +142,7 @@ class QtRenderer:\n> self.window = window\n> \n> def run(self):\n> - camnotif = QtCore.QSocketNotifier(self.state.cm.efd, QtCore.QSocketNotifier.Read)\n> + camnotif = QtCore.QSocketNotifier(self.state.cm.event_fd, QtCore.QSocketNotifier.Read)\n> camnotif.activated.connect(lambda _: self.readcam())\n> \n> keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)\n> diff --git a/src/py/examples/itest.py b/src/py/examples/itest.py\n> index 01e020e2..2d1c6453 100755\n> --- a/src/py/examples/itest.py\n> +++ b/src/py/examples/itest.py\n> @@ -66,7 +66,7 @@ def capture(ctx):\n> # Use Selector to wait for events from the camera and from the keyboard\n> \n> sel = selectors.DefaultSelector()\n> - sel.register(cm.efd, selectors.EVENT_READ, lambda fd: handle_camera_event(ctx))\n> + sel.register(cm.event_fd, selectors.EVENT_READ, lambda fd: handle_camera_event(ctx))\n> \n> reqs = []\n> \n> diff --git a/src/py/examples/simple-continuous-capture.py b/src/py/examples/simple-continuous-capture.py\n> index 05fa2ada..12708914 100755\n> --- a/src/py/examples/simple-continuous-capture.py\n> +++ b/src/py/examples/simple-continuous-capture.py\n> @@ -76,7 +76,7 @@ def capture(cm, cam, reqs):\n> # Use Selector to wait for events from the camera and from the keyboard\n> \n> sel = selectors.DefaultSelector()\n> - sel.register(cm.efd, selectors.EVENT_READ, lambda fd: handle_camera_event(cm, cam))\n> + sel.register(cm.event_fd, selectors.EVENT_READ, lambda fd: handle_camera_event(cm, cam))\n> sel.register(sys.stdin, selectors.EVENT_READ, handle_key_envet)\n> \n> reqs = []\n> diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\n> index 80f26c12..3fd5c0fc 100644\n> --- a/src/py/libcamera/py_main.cpp\n> +++ b/src/py/libcamera/py_main.cpp\n> @@ -209,7 +209,7 @@ PYBIND11_MODULE(_libcamera, m)\n> \n> \t\t.def_property_readonly(\"version\", &CameraManager::version)\n> \n> -\t\t.def_property_readonly(\"efd\", [](CameraManager &) {\n> +\t\t.def_property_readonly(\"event_fd\", [](CameraManager &) {\n> \t\t\treturn gEventfd;\n> \t\t})\n> \n> diff --git a/test/py/unittests.py b/test/py/unittests.py\n> index 8c445bc9..426efb06 100755\n> --- a/test/py/unittests.py\n> +++ b/test/py/unittests.py\n> @@ -269,7 +269,7 @@ class SimpleCaptureMethods(CameraTesterBase):\n> gc.collect()\n> \n> sel = selectors.DefaultSelector()\n> - sel.register(cm.efd, selectors.EVENT_READ)\n> + sel.register(cm.event_fd, selectors.EVENT_READ)\n> \n> reqs = []\n>","headers":{"Return-Path":"","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 BF33BBD160\n\tfor ;\n\tFri, 27 May 2022 10:53:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 75ED5633A7;\n\tFri, 27 May 2022 12:53:47 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6439E633A2\n\tfor ;\n\tFri, 27 May 2022 12:53:46 +0200 (CEST)","from pendragon.ideasonboard.com (unknown [46.183.103.8])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7893E31A;\n\tFri, 27 May 2022 12:53:45 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653648827;\n\tbh=pIqxxm7m+eZJN1Oddgl/049rGE84FyRQrPK8De6HR9k=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=Hzc9z/DsVrS7okeLuzCG//fGF/oQt4h+uHPnKGk1KhjevaoSmN9xAPBbbioxWlyf+\n\tE3pTNYwq5maaUE8WDzOpPm6JZy4P1A3Qa4dmhOQJWr+HkAwEccv27WcxzW5X1/YfU6\n\tVKZHLhpZ1PY05zmApzKCTiTcw4MZvOk8Ho69IiOEDK43o7NjeFCaStwazy645ilBqc\n\t1ry7w0HUOk6IYjQYtobg2yb0eOYQh7qXgO6VJz9mTEtbLLIyW5y41jmzh04RBZldt0\n\tgPNWkMnHkrk1P6LbK6A6zM2R/WXkMPC38Opwb3oFxTOP3i7nC5miQJzVMWf+OoVz9u\n\tTHO8T3cxsYYbQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653648826;\n\tbh=pIqxxm7m+eZJN1Oddgl/049rGE84FyRQrPK8De6HR9k=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=oPGut2IFbjaiKF97jpVW/qy333B/MbRiQPA3DLj7S206vOoR78Y1wdcBjcx9nOQ0O\n\tjAtziuce1KwoRXpkYVJyiL/0gYLrA3UN29h0zqIiizo3AQTr20ljSzKz8TlCsVMdlc\n\tmP26A5/8vFdij75OWdVWBBZF61zLOs02nnizUw24="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"oPGut2IF\"; dkim-atps=neutral","Date":"Fri, 27 May 2022 13:53:35 +0300","To":"Tomi Valkeinen ","Message-ID":"","References":"<20220524114610.41848-1-tomi.valkeinen@ideasonboard.com>\n\t<20220524114610.41848-18-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220524114610.41848-18-tomi.valkeinen@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 17/19] py: Rename 'efd' to\n\t'event_fd'","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org,\n\tTomi Valkeinen ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]