{"id":661,"url":"https://patchwork.libcamera.org/api/patches/661/?format=json","web_url":"https://patchwork.libcamera.org/patch/661/","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":"<20190228162913.6508-9-laurent.pinchart@ideasonboard.com>","date":"2019-02-28T16:29:11","name":"[libcamera-devel,08/10] libcamera: request: Add request completion status","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"406608344f77ab1753497da7156abac003aee428","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/661/mbox/","series":[{"id":196,"url":"https://patchwork.libcamera.org/api/series/196/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=196","date":"2019-02-28T16:29:03","name":"Rework request completion handling","version":1,"mbox":"https://patchwork.libcamera.org/series/196/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/661/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/661/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C5762610B7\n\tfor ;\n\tThu, 28 Feb 2019 17:29:27 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6878067\n\tfor ;\n\tThu, 28 Feb 2019 17:29:27 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1551371367;\n\tbh=Z3eX5qXbTA306L8rPhCv+xNc6a2yWaBd65cagntz7hc=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=u5Cc0/YcXOsiM0eKpiJ6omXsRj8kzOdHYDnyh7Qse/xH/m1BCAvCeU3i7bW0NXUE0\n\tn/bttSMxb4A6YJUnlGZN75ztLbS1enEHWIw3u/SNe2niSZK8YZ/xaGZrG/gqcYb943\n\tRKyuEzAGhlu/v7ILZnzJcJrzvPUPD7aFgxuGVeM0=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 28 Feb 2019 18:29:11 +0200","Message-Id":"<20190228162913.6508-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190228162913.6508-1-laurent.pinchart@ideasonboard.com>","References":"<20190228162913.6508-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 08/10] libcamera: request: Add request\n\tcompletion status","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 28 Feb 2019 16:29:28 -0000"},"content":"Add a new field to the Request class to report its completion status,\nand a new complete() method to update the status.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/request.h | 12 +++++++++++\n src/libcamera/request.cpp | 40 ++++++++++++++++++++++++++++++++++++-\n 2 files changed, 51 insertions(+), 1 deletion(-)","diff":"diff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex ef081177309f..0b75f9d9bd19 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -18,9 +18,16 @@ class Buffer;\n class Camera;\n class Stream;\n \n+\n class Request\n {\n public:\n+\tenum Status {\n+\t\tRequestPending,\n+\t\tRequestComplete,\n+\t\tRequestCancelled,\n+\t};\n+\n \texplicit Request(Camera *camera);\n \tRequest(const Request &) = delete;\n \tRequest &operator=(const Request &) = delete;\n@@ -28,15 +35,20 @@ public:\n \tint setBuffers(const std::map &streamMap);\n \tBuffer *findBuffer(Stream *stream) const;\n \n+\tStatus status() const { return status_; }\n+\n private:\n \tfriend class Camera;\n \n \tint prepare();\n+\tvoid complete(Status status);\n \tvoid bufferCompleted(Buffer *buffer);\n \n \tCamera *camera_;\n \tstd::map bufferMap_;\n \tstd::unordered_set pending_;\n+\n+\tStatus status_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex d76db24de0e2..cb170930fbb6 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -23,6 +23,17 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(Request)\n \n+/**\n+ * \\enum Request::Status\n+ * Request completion status\n+ * \\var Request::RequestPending\n+ * The request hasn't completed yet\n+ * \\var Request::RequestComplete\n+ * The request has completed\n+ * \\var Request::RequestCancelled\n+ * The request has been cancelled due to capture stop\n+ */\n+\n /**\n * \\class Request\n * \\brief A frame capture request\n@@ -36,7 +47,7 @@ LOG_DEFINE_CATEGORY(Request)\n * \\param[in] camera The camera that creates the request\n */\n Request::Request(Camera *camera)\n-\t: camera_(camera)\n+\t: camera_(camera), status_(RequestPending)\n {\n }\n \n@@ -82,6 +93,19 @@ Buffer *Request::findBuffer(Stream *stream) const\n \treturn it->second;\n }\n \n+/**\n+ * \\fn Request::status()\n+ * \\brief Retrieve the request completion status\n+ *\n+ * The request status indicates whether the request has completed successfully\n+ * or with an error. When requests are created and before they complete the\n+ * request status is set to RequestPending, and is updated at completion time\n+ * to RequestComplete. If a request is cancelled at capture stop before it has\n+ * completed, its status is set to RequestCancelled.\n+ *\n+ * \\return The request completion status\n+ */\n+\n /**\n * \\brief Prepare the resources for the completion handler\n */\n@@ -96,6 +120,18 @@ int Request::prepare()\n \treturn 0;\n }\n \n+/**\n+ * \\brief Complete a queued request\n+ * \\param[in] status The request completion status\n+ *\n+ * Mark the request as complete by updating its status to \\a status.\n+ */\n+void Request::complete(Status status)\n+{\n+\tASSERT(pending_.empty());\n+\tstatus_ = status;\n+}\n+\n /**\n * \\brief Slot for the buffer completed signal\n *\n@@ -117,6 +153,8 @@ void Request::bufferCompleted(Buffer *buffer)\n \tif (!pending_.empty())\n \t\treturn;\n \n+\tcomplete(RequestComplete);\n+\n \tstd::map buffers(std::move(bufferMap_));\n \tcamera_->requestCompleted.emit(this, buffers);\n \tdelete this;\n","prefixes":["libcamera-devel","08/10"]}