{"id":12391,"url":"https://patchwork.libcamera.org/api/patches/12391/?format=json","web_url":"https://patchwork.libcamera.org/patch/12391/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210524191309.90238-2-nfraprado@collabora.com>","date":"2021-05-24T19:13:05","name":"[libcamera-devel,v5,1/5] libcamera: camera: Make stop() idempotent","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ec422dc6e8d501d95f65f38743fbffbd35c07ab5","submitter":{"id":84,"url":"https://patchwork.libcamera.org/api/people/84/?format=json","name":"Nícolas F. R. A. Prado","email":"nfraprado@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12391/mbox/","series":[{"id":2057,"url":"https://patchwork.libcamera.org/api/series/2057/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2057","date":"2021-05-24T19:13:04","name":"lc-compliance: Refactor using Googletest","version":5,"mbox":"https://patchwork.libcamera.org/series/2057/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12391/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12391/checks/","tags":{},"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 5A62DC3201\n\tfor ;\n\tMon, 24 May 2021 19:14:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 26F206891E;\n\tMon, 24 May 2021 21:14:07 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6620868915\n\tfor ;\n\tMon, 24 May 2021 21:14:05 +0200 (CEST)","from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: nfraprado) with ESMTPSA id 81E8B1F4215A"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 24 May 2021 16:13:05 -0300","Message-Id":"<20210524191309.90238-2-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210524191309.90238-1-nfraprado@collabora.com>","References":"<20210524191309.90238-1-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 1/5] libcamera: camera: Make stop()\n\tidempotent","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","Cc":"kernel@collabora.com, =?utf-8?q?Andr=C3=A9_Almeida?=\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Make Camera::stop() idempotent so that it can be called in any state and\nconsecutive times. When called in any state other than CameraRunning, it\nis a no-op. This simplifies the cleanup path for applications.\n\nSigned-off-by: Nícolas F. R. A. Prado \nReviewed-by: Laurent Pinchart \n---\nChanges in v5:\n- Thanks to Laurent:\n - Simplified isRunning()\n\nChanges in v4:\n- Thanks to Jacopo:\n - Added \\todo in Camera::stop()\n\nNo changes in v3\n\nChanges in v2:\n- Suggested by Kieran:\n - Add new isRunning() function instead of relying on isAccessAllowed()\n- Suggested by Laurent:\n - Make stop()'s description clearer\n\n src/libcamera/camera.cpp | 20 +++++++++++++++++---\n 1 file changed, 17 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 1340c266cc5f..a13a15dd1fc9 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -347,6 +347,7 @@ public:\n \t\tconst std::set &streams);\n \t~Private();\n \n+\tbool isRunning() const;\n \tint isAccessAllowed(State state, bool allowDisconnected = false,\n \t\t\t const char *from = __builtin_FUNCTION()) const;\n \tint isAccessAllowed(State low, State high,\n@@ -388,6 +389,11 @@ static const char *const camera_state_names[] = {\n \t\"Running\",\n };\n \n+bool Camera::Private::isRunning() const\n+{\n+\treturn state_.load(std::memory_order_acquire) == CameraRunning;\n+}\n+\n int Camera::Private::isAccessAllowed(State state, bool allowDisconnected,\n \t\t\t\t const char *from) const\n {\n@@ -1061,9 +1067,10 @@ int Camera::start(const ControlList *controls)\n * This method stops capturing and processing requests immediately. All pending\n * requests are cancelled and complete synchronously in an error state.\n *\n- * \\context This function may only be called when the camera is in the Running\n- * state as defined in \\ref camera_operation, and shall be synchronized by the\n- * caller with other functions that affect the camera state.\n+ * \\context This function may be called in any camera state as defined in \\ref\n+ * camera_operation, and shall be synchronized by the caller with other\n+ * functions that affect the camera state. If called when the camera isn't\n+ * running, it is a no-op.\n *\n * \\return 0 on success or a negative error code otherwise\n * \\retval -ENODEV The camera has been disconnected from the system\n@@ -1073,6 +1080,13 @@ int Camera::stop()\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n+\t/*\n+\t * \\todo Make calling stop() when not in 'Running' part of the state\n+\t * machine rather than take this shortcut\n+\t */\n+\tif (!d->isRunning())\n+\t\treturn 0;\n+\n \tint ret = d->isAccessAllowed(Private::CameraRunning);\n \tif (ret < 0)\n \t\treturn ret;\n","prefixes":["libcamera-devel","v5","1/5"]}