Patch Detail
Show a patch.
GET /api/1.1/patches/12269/?format=api
{ "id": 12269, "url": "https://patchwork.libcamera.org/api/1.1/patches/12269/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12269/", "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": "<20210513092246.42847-8-jacopo@jmondi.org>", "date": "2021-05-13T09:22:45", "name": "[libcamera-devel,v2,7/8] android: Rename CameraDevice::mutex_", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7d945ef4eecbec2c4bfaabff634df8736b1b82f0", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": { "id": 15, "url": "https://patchwork.libcamera.org/api/1.1/users/15/?format=api", "username": "jmondi", "first_name": "Jacopo", "last_name": "Mondi", "email": "jacopo@jmondi.org" }, "mbox": "https://patchwork.libcamera.org/patch/12269/mbox/", "series": [ { "id": 2025, "url": "https://patchwork.libcamera.org/api/1.1/series/2025/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2025", "date": "2021-05-13T09:22:38", "name": "Implement flush() camera operation", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2025/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12269/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12269/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 F3F96C31EE\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 13 May 2021 09:22:15 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6F31A68930;\n\tThu, 13 May 2021 11:22:15 +0200 (CEST)", "from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2175C68922\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 May 2021 11:22:12 +0200 (CEST)", "from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 7E9E2240006;\n\tThu, 13 May 2021 09:22:11 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 13 May 2021 11:22:45 +0200", "Message-Id": "<20210513092246.42847-8-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210513092246.42847-1-jacopo@jmondi.org>", "References": "<20210513092246.42847-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 7/8] android: Rename\n\tCameraDevice::mutex_", "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>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "With the introduction of an additional mutex class member, the name of\nthe existing one is too generic.\n\nRename CameraDevice::mutex_ in CameraDevice::requestsMutex_ and use the\nlibcamera provided libcamera::Mutex type to align the style with the\nrest of the code base.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/android/camera_device.cpp | 4 ++--\n src/android/camera_device.h | 3 ++-\n 2 files changed, 4 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex c6cd0b6e8be7..7f8c9bd7832d 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -2024,7 +2024,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \tworker_.queueRequest(descriptor.request_.get());\n \n \t{\n-\t\tMutexLocker lock(mutex_);\n+\t\tMutexLocker requestsLock(requestsMutex_);\n \t\tdescriptors_[descriptor.request_->cookie()] = std::move(descriptor);\n \t}\n \n@@ -2035,7 +2035,7 @@ void CameraDevice::requestComplete(Request *request)\n {\n \tdecltype(descriptors_)::node_type node;\n \t{\n-\t\tMutexLocker lock(mutex_);\n+\t\tMutexLocker requestsLock(requestsMutex_);\n \t\tauto it = descriptors_.find(request->cookie());\n \t\tif (it == descriptors_.end()) {\n \t\t\t/*\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex f263fdae472a..ed992ae56d5d 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -24,6 +24,7 @@\n #include \"libcamera/internal/buffer.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/message.h\"\n+#include \"libcamera/internal/thread.h\"\n \n #include \"camera_metadata.h\"\n #include \"camera_stream.h\"\n@@ -134,7 +135,7 @@ private:\n \tstd::map<int, libcamera::PixelFormat> formatsMap_;\n \tstd::vector<CameraStream> streams_;\n \n-\tstd::mutex mutex_; /* Protect descriptors_ */\n+\tlibcamera::Mutex requestsMutex_; /* Protects descriptors_. */\n \tstd::map<uint64_t, Camera3RequestDescriptor> descriptors_;\n \n \tstd::string maker_;\n", "prefixes": [ "libcamera-devel", "v2", "7/8" ] }