{"id":12247,"url":"https://patchwork.libcamera.org/api/patches/12247/?format=json","web_url":"https://patchwork.libcamera.org/patch/12247/","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":"<20210510105235.28319-8-jacopo@jmondi.org>","date":"2021-05-10T10:52:34","name":"[libcamera-devel,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/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/12247/mbox/","series":[{"id":2016,"url":"https://patchwork.libcamera.org/api/series/2016/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2016","date":"2021-05-10T10:52:27","name":"android: Implement flush() camera operation","version":1,"mbox":"https://patchwork.libcamera.org/series/2016/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12247/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12247/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 43177BF835\n\tfor ;\n\tMon, 10 May 2021 10:52:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 04DDC68924;\n\tMon, 10 May 2021 12:52:04 +0200 (CEST)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D8F616891C\n\tfor ;\n\tMon, 10 May 2021 12:52:01 +0200 (CEST)","from uno.homenet.telecomitalia.it\n\t(host-82-59-136-116.retail.telecomitalia.it [82.59.136.116])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 2B9F9E01E6;\n\tMon, 10 May 2021 10:52:00 +0000 (UTC)"],"X-Originating-IP":"82.59.136.116","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 10 May 2021 12:52:34 +0200","Message-Id":"<20210510105235.28319-8-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210510105235.28319-1-jacopo@jmondi.org>","References":"<20210510105235.28319-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 7/8] android: Rename CameraDevice::mutex_","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \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 14a3f79a7402..fa12ce5b0133 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -2022,7 +2022,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@@ -2033,7 +2033,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 formatsMap_;\n \tstd::vector streams_;\n \n-\tstd::mutex mutex_; /* Protect descriptors_ */\n+\tlibcamera::Mutex requestsMutex_; /* Protects descriptors_. */\n \tstd::map descriptors_;\n \n \tstd::string maker_;\n","prefixes":["libcamera-devel","7/8"]}