[{"id":17140,"web_url":"https://patchwork.libcamera.org/comment/17140/","msgid":"","date":"2021-05-23T18:15:49","subject":"Re: [libcamera-devel] [PATCH v3 7/8] android: Rename\n\tCameraDevice::mutex_","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Fri, May 21, 2021 at 05:42:26PM +0200, Jacopo Mondi wrote:\n> With the introduction of an additional mutex class member, the name of\n> the existing one is too generic.\n> \n> Rename CameraDevice::mutex_ in CameraDevice::requestsMutex_ and use the\n> libcamera provided libcamera::Mutex type to align the style with the\n> rest of the code base.\n\nAh, this is where you use libcamera::Mutex :-)\n\n> Signed-off-by: Jacopo Mondi \n> Reviewed-by: Niklas Söderlund \n> Reviewed-by: Hirokazu Honda \n> ---\n> src/android/camera_device.cpp | 4 ++--\n> src/android/camera_device.h | 3 ++-\n> 2 files changed, 4 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 6645c019410e..3fce14035718 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1953,7 +1953,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> @@ -1964,7 +1964,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/*\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 6fe5454c6535..7cf8e8370387 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\nI think you can drop #include .\n\n> \n> #include \"camera_metadata.h\"\n> #include \"camera_stream.h\"\n> @@ -133,7 +134,7 @@ private:\n> \tstd::map formatsMap_;\n> \tstd::vector streams_;\n> \n> -\tstd::mutex mutex_; /* Protect descriptors_ */\n> +\tlibcamera::Mutex requestsMutex_; /* Protects descriptors_. */\n\nWe could also name this descriptorsMutex_ (unless you expand its scope\nin patch 8/8), up to you.\n\nReviewed-by: Laurent Pinchart \n\n> \tstd::map descriptors_;\n> \n> \tstd::string maker_;","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 8050EC3201\n\tfor ;\n\tSun, 23 May 2021 18:15:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E075F6891B;\n\tSun, 23 May 2021 20:15:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 30B22601A9\n\tfor ;\n\tSun, 23 May 2021 20:15:53 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 816662A8;\n\tSun, 23 May 2021 20:15:52 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"JZE8VtHn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621793752;\n\tbh=nwp/oCyjINd37Uddq0ZxBaSdhjkn493IdtrAYWT+BTk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=JZE8VtHn6gLHtSWDsieSDx820vXaVnZfcjkk+GIJtCsz0/fDd45IVGKhWVgvJOVZX\n\tBuWStM8v6zSUcCtpSkS6tFgA+IUQZKoHz9zr0SoFoJHNEczG/ZVTHC8ykXKx+Y+TPL\n\tzbv56wVu9AHRUjMMcQG0Fy1VfzsIElAjqampynOg=","Date":"Sun, 23 May 2021 21:15:49 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210521154227.60186-1-jacopo@jmondi.org>\n\t<20210521154227.60186-8-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20210521154227.60186-8-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v3 7/8] android: Rename\n\tCameraDevice::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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]