Patch Detail
Show a patch.
GET /api/1.1/patches/12353/?format=api
{ "id": 12353, "url": "https://patchwork.libcamera.org/api/1.1/patches/12353/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12353/", "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": "<20210521154227.60186-3-jacopo@jmondi.org>", "date": "2021-05-21T15:42:21", "name": "[libcamera-devel,v3,2/8] libcamera: request: Add Request::cancel()", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1581d49316facd080f5ff9764036a189d4e6c881", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/12353/mbox/", "series": [ { "id": 2045, "url": "https://patchwork.libcamera.org/api/1.1/series/2045/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2045", "date": "2021-05-21T15:42:19", "name": "Implement flush() camera operation", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2045/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12353/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12353/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 E5E17C31FF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 21 May 2021 15:41:51 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C7E2068925;\n\tFri, 21 May 2021 17:41:50 +0200 (CEST)", "from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 07A7B6891A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 21 May 2021 17:41:47 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 27B441BF212;\n\tFri, 21 May 2021 15:41:46 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 21 May 2021 17:42:21 +0200", "Message-Id": "<20210521154227.60186-3-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210521154227.60186-1-jacopo@jmondi.org>", "References": "<20210521154227.60186-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 2/8] libcamera: request: Add\n\tRequest::cancel()", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a cancel() function to the Request class that allows to forcefully\ncomplete the request and its associated buffers in error state.\n\nOnly pending requests can be forcefully cancelled. Enforce that\nby asserting the request state to be RequestPending.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\n---\n .../libcamera/internal/tracepoints/request.tp | 8 ++++++\n include/libcamera/request.h | 1 +\n src/libcamera/request.cpp | 28 +++++++++++++++++++\n 3 files changed, 37 insertions(+)", "diff": "diff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\nindex 9e872951374d..9c841b97438a 100644\n--- a/include/libcamera/internal/tracepoints/request.tp\n+++ b/include/libcamera/internal/tracepoints/request.tp\n@@ -66,6 +66,14 @@ TRACEPOINT_EVENT_INSTANCE(\n \t)\n )\n \n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_cancel,\n+\tTP_ARGS(\n+\t\tlibcamera::Request *, req\n+\t)\n+)\n \n TRACEPOINT_EVENT(\n \tlibcamera,\ndiff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex 4cf5ff3f7d3b..5596901ddd8e 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -65,6 +65,7 @@ private:\n \tfriend class PipelineHandler;\n \n \tvoid complete();\n+\tvoid cancel();\n \n \tbool completeBuffer(FrameBuffer *buffer);\n \ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex ce2dd7b17f10..69b2d0172e3d 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -292,6 +292,34 @@ void Request::complete()\n \tLIBCAMERA_TRACEPOINT(request_complete, this);\n }\n \n+/**\n+ * \\brief Cancel a queued request\n+ *\n+ * Mark the request and its associated buffers as cancelled and complete it.\n+ *\n+ * Set each pending buffer in error state and emit the buffer completion signal\n+ * before completing the Request.\n+ */\n+void Request::cancel()\n+{\n+\tLIBCAMERA_TRACEPOINT(request_cancel, this);\n+\n+\tASSERT(status_ == RequestPending);\n+\n+\t/*\n+\t * We can't simply loop and call completeBuffer() as the erase() call\n+\t * invalidates pointers and iterators, so we have to manually cancel the\n+\t * buffer from the pending buffers list.\n+\t */\n+\tfor (auto buffer = pending_.begin(); buffer != pending_.end();) {\n+\t\t(*buffer)->cancel();\n+\t\tcamera_->bufferCompleted.emit(this, *buffer);\n+\t\tbuffer = pending_.erase(buffer);\n+\t}\n+\n+\tcancelled_ = true;\n+}\n+\n /**\n * \\brief Complete a buffer for the request\n * \\param[in] buffer The buffer that has completed\n", "prefixes": [ "libcamera-devel", "v3", "2/8" ] }