Patch Detail
Show a patch.
GET /api/patches/14929/?format=api
{ "id": 14929, "url": "https://patchwork.libcamera.org/api/patches/14929/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14929/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20211201070728.3114247-4-hiroh@chromium.org>", "date": "2021-12-01T07:07:19", "name": "[libcamera-devel,v4,03/12] v4l2: Consolidate mutex classes to Mutex and MutexLocker", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "edf468b2a56120633d55bcc7661452b3a1e68cbb", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14929/mbox/", "series": [ { "id": 2789, "url": "https://patchwork.libcamera.org/api/series/2789/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2789", "date": "2021-12-01T07:07:16", "name": "Introduce clang thread safety annotations", "version": 4, "mbox": "https://patchwork.libcamera.org/series/2789/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14929/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14929/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 7CAD3BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 1 Dec 2021 07:07:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 359B160727;\n\tWed, 1 Dec 2021 08:07:43 +0100 (CET)", "from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com\n\t[IPv6:2607:f8b0:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B232160721\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Dec 2021 08:07:41 +0100 (CET)", "by mail-pf1-x42e.google.com with SMTP id i12so23422842pfd.6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Nov 2021 23:07:41 -0800 (PST)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:3892:a049:59ba:c772])\n\tby smtp.gmail.com with ESMTPSA id\n\tm10sm16598962pgv.75.2021.11.30.23.07.38\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 30 Nov 2021 23:07:39 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"RVlZg/yu\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=FEPgOt+Hso6kjyjJCaZkES4+k/22ZXFKdEsxG1OY+gI=;\n\tb=RVlZg/yul7nRwKiVmmeL1pYPeIpIXXJeoS9nN/nqT6OOLL9oZfCVRfvD7HoYSzMHlP\n\t03CJosIZo+uQ9xHbH3nZcLNPVDHpUDASE2pJ1oiwelRHt6jSNgLkib/DTUSDYnbjUwAH\n\tsnF0SkMbESF2IJ9JzMm4dw5kmzOPxvSEYlm6Y=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=FEPgOt+Hso6kjyjJCaZkES4+k/22ZXFKdEsxG1OY+gI=;\n\tb=OV86EH4KuPQO7MuB9OjQvjFlCqplOfK4SGe6CNM4/5Rw0RETysiWtef2Sb5ufGU5d3\n\t3+bYjHrEyLeS9k3OnlPcoa/VOT8iGWUYY6E2flXr2vdoh9a7vfLJXREXmD6+TYw+DLRT\n\tKWXtVh5Nb3X3B3goVfnjuWLWzPAfBUZ7Nc32CyR35U+lesPct/WlWu5DgTEnbfQ2paHI\n\twvr3VCbBkOXNU4KnNsOCPkl9olXjOPuyJg4uKCUQ16RsLdsaw5C/ToO8J7lHRVZ/z3pB\n\tc7M2r1F1Me0Yy81jaU9sBc9tBrC92YG55m12N0ausug8BjKwaBfEVkGggA6JMywx5MG8\n\tX8+A==", "X-Gm-Message-State": "AOAM533cHCFRXU18p6w05kwEo8bGmeOQAKokYGxeXzN/DTkcEEqLZcde\n\tQaq+8B06ADjo/5HWiSoJFuxgsqZeQ9HiLA==", "X-Google-Smtp-Source": "ABdhPJzeyqZ703mGj6oH+q04zvsmSNPKiMyWoBZZfaCGPE5qNUC1/0DBOECwHnhj/Sn/E0YSvJ78uw==", "X-Received": "by 2002:aa7:9acc:0:b0:4a2:b8b5:8813 with SMTP id\n\tx12-20020aa79acc000000b004a2b8b58813mr4383036pfp.4.1638342459872; \n\tTue, 30 Nov 2021 23:07:39 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 1 Dec 2021 16:07:19 +0900", "Message-Id": "<20211201070728.3114247-4-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.34.0.rc2.393.gf8c9666880-goog", "In-Reply-To": "<20211201070728.3114247-1-hiroh@chromium.org>", "References": "<20211201070728.3114247-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 03/12] v4l2: Consolidate mutex classes\n\tto Mutex and MutexLocker", "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": "std::mutex and std::unique_lock are used in v4l2 directory,\nmixing Mutex and MutexLocker. This consolidates them to Mutex\nand MutexLocker.\n\nThis also fixes vidioc_dqbuf argument to take Mutex instead of\nMutexLocker.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/v4l2/v4l2_camera.h | 4 ++--\n src/v4l2/v4l2_camera_proxy.cpp | 8 ++++----\n src/v4l2/v4l2_camera_proxy.h | 4 +++-\n 3 files changed, 9 insertions(+), 7 deletions(-)", "diff": "diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex 4afbb331..bf1b6de4 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -8,10 +8,10 @@\n #pragma once\n \n #include <deque>\n-#include <mutex>\n #include <utility>\n \n #include <libcamera/base/semaphore.h>\n+#include <libcamera/base/thread.h>\n \n #include <libcamera/camera.h>\n #include <libcamera/file_descriptor.h>\n@@ -71,7 +71,7 @@ private:\n \n \tbool isRunning_;\n \n-\tstd::mutex bufferLock_;\n+\tlibcamera::Mutex bufferLock_;\n \tlibcamera::FrameBufferAllocator *bufferAllocator_;\n \n \tstd::vector<std::unique_ptr<libcamera::Request>> requestPool_;\ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 3610e63c..79bc880d 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -575,7 +575,7 @@ int V4L2CameraProxy::vidioc_qbuf(V4L2CameraFile *file, struct v4l2_buffer *arg)\n }\n \n int V4L2CameraProxy::vidioc_dqbuf(V4L2CameraFile *file, struct v4l2_buffer *arg,\n-\t\t\t\t MutexLocker *locker)\n+\t\t\t\t Mutex *lock)\n {\n \tLOG(V4L2Compat, Debug) << \"Servicing vidioc_dqbuf fd = \" << file->efd();\n \n@@ -593,9 +593,9 @@ int V4L2CameraProxy::vidioc_dqbuf(V4L2CameraFile *file, struct v4l2_buffer *arg,\n \t\treturn -EINVAL;\n \n \tif (!file->nonBlocking()) {\n-\t\tlocker->unlock();\n+\t\tlock->unlock();\n \t\tvcam_->waitForBufferAvailable();\n-\t\tlocker->lock();\n+\t\tlock->lock();\n \t} else if (!vcam_->isBufferAvailable())\n \t\treturn -EAGAIN;\n \n@@ -753,7 +753,7 @@ int V4L2CameraProxy::ioctl(V4L2CameraFile *file, unsigned long request, void *ar\n \t\tret = vidioc_qbuf(file, static_cast<struct v4l2_buffer *>(arg));\n \t\tbreak;\n \tcase VIDIOC_DQBUF:\n-\t\tret = vidioc_dqbuf(file, static_cast<struct v4l2_buffer *>(arg), &locker);\n+\t\tret = vidioc_dqbuf(file, static_cast<struct v4l2_buffer *>(arg), &proxyMutex_);\n \t\tbreak;\n \tcase VIDIOC_STREAMON:\n \t\tret = vidioc_streamon(file, static_cast<int *>(arg));\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex fccec241..040954dd 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -14,6 +14,8 @@\n #include <sys/types.h>\n #include <vector>\n \n+#include <libcamera/base/thread.h>\n+\n #include <libcamera/camera.h>\n \n #include \"v4l2_camera.h\"\n@@ -57,7 +59,7 @@ private:\n \tint vidioc_querybuf(V4L2CameraFile *file, struct v4l2_buffer *arg);\n \tint vidioc_qbuf(V4L2CameraFile *file, struct v4l2_buffer *arg);\n \tint vidioc_dqbuf(V4L2CameraFile *file, struct v4l2_buffer *arg,\n-\t\t\t libcamera::MutexLocker *locker);\n+\t\t\t libcamera::Mutex *lock);\n \tint vidioc_streamon(V4L2CameraFile *file, int *arg);\n \tint vidioc_streamoff(V4L2CameraFile *file, int *arg);\n \n", "prefixes": [ "libcamera-devel", "v4", "03/12" ] }