{"id":14839,"url":"https://patchwork.libcamera.org/api/patches/14839/?format=json","web_url":"https://patchwork.libcamera.org/patch/14839/","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":"<20211129114453.3186042-4-hiroh@chromium.org>","date":"2021-11-29T11:44:45","name":"[libcamera-devel,v2,03/11] v4l2: Consolidate mutex classes to Mutex and MutexLocker","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0dba07d857032b4a64b9de05fddf0f0bfd79047d","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14839/mbox/","series":[{"id":2770,"url":"https://patchwork.libcamera.org/api/series/2770/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2770","date":"2021-11-29T11:44:42","name":"Introduce clang thread safety annotations","version":2,"mbox":"https://patchwork.libcamera.org/series/2770/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14839/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14839/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 8BA48BF415\n\tfor ;\n\tMon, 29 Nov 2021 11:45:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 423C2605B4;\n\tMon, 29 Nov 2021 12:45:10 +0100 (CET)","from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com\n\t[IPv6:2607:f8b0:4864:20::1036])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A35A2605A6\n\tfor ;\n\tMon, 29 Nov 2021 12:45:06 +0100 (CET)","by mail-pj1-x1036.google.com with SMTP id\n\tw33-20020a17090a6ba400b001a722a06212so11621069pjj.0\n\tfor ;\n\tMon, 29 Nov 2021 03:45:06 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:f254:cda9:46e8:17b7])\n\tby smtp.gmail.com with ESMTPSA id\n\thg4sm17951966pjb.1.2021.11.29.03.45.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 29 Nov 2021 03:45:04 -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=\"Nojlp41L\"; 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=ZOAZZb3YEiRY/bi7D7SmcCZ54QwiXVWiBu6nuv2zOfg=;\n\tb=Nojlp41LO/UwoDV0m0INyo9FzDa8ZUrYGF8/RBX6Pku7dftWW7nY7rjeCBWL+ftfyY\n\tZQJQ1BYX4bxK5wRvdSJoKzwj51cgweSu7+y2rATUr7p8a6JgjKBi8vJZSIH58mVqJ8bI\n\tyRGyea0GfVdZ6aITs9e5NakLMeBP7WWOrP2Uc=","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=ZOAZZb3YEiRY/bi7D7SmcCZ54QwiXVWiBu6nuv2zOfg=;\n\tb=ZvrvlSxx2FEvckiLmX4PEjeo/CyXtPgj944r1cHqmF7ch13apfVoAb6ENL4rprrS/Q\n\tMAv42+8SGlNqlDquDW9hGoY8ZqekhJpWMKD6UGsDshf/5gqImHN0vM6EB6NXK2lmPdM8\n\tuy4qTfQ2ljCK8b/BCp4RFy1jQDExvwLnRQBMgBGHfqY2v7O0L488XaxLoV9ZrLvM4Miy\n\tOQehIz0ZsJB5MhJCSi4C3hta075n5xo/qxEZZvpoCb2iuQg5xS2OPj1BQhEeflphygHk\n\tKraCsfZOscUNAdMU5xGApeyrNlhQSuil+9/OaXMOENEtj/yem77nzpCdc/+LzfJ2e2Fz\n\tcgmQ==","X-Gm-Message-State":"AOAM530uZBika6Aaso1JOax40/h4r2OUPbE3mg5jIhdLmzSvhQ6yYXeg\n\tUg5lxxYii51bSLD5FnXoRTlfn/9EdWKiQg==","X-Google-Smtp-Source":"ABdhPJwWuf7K2R2hv6ebF74r+AjOno81sAEV5VbaGuvyKOZwlVCvL5VE2ssgK5LFe0t6Psj2WyW3tQ==","X-Received":"by 2002:a17:902:d2cd:b0:141:fbe2:b658 with SMTP id\n\tn13-20020a170902d2cd00b00141fbe2b658mr59418906plc.49.1638186305025; \n\tMon, 29 Nov 2021 03:45:05 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 29 Nov 2021 20:44:45 +0900","Message-Id":"<20211129114453.3186042-4-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc2.393.gf8c9666880-goog","In-Reply-To":"<20211129114453.3186042-1-hiroh@chromium.org>","References":"<20211129114453.3186042-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 03/11] 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"std::mutex and std::unique_lcok are used in v4l2 directory,\nmixing Mutex and MutexLocker. This consolidates them to Mutex\nand MutexLocker.\n\nThis also fixes vidoc_dqbuf argument to take Mutex instead of\nMutexLocker.\n\nSigned-off-by: Hirokazu Honda \n---\n src/v4l2/v4l2_camera.h | 2 +-\n src/v4l2/v4l2_camera_proxy.cpp | 8 ++++----\n src/v4l2/v4l2_camera_proxy.h | 4 +++-\n 3 files changed, 8 insertions(+), 6 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex 4afbb331..2f6fcb3c 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.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> 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(arg));\n \t\tbreak;\n \tcase VIDIOC_DQBUF:\n-\t\tret = vidioc_dqbuf(file, static_cast(arg), &locker);\n+\t\tret = vidioc_dqbuf(file, static_cast(arg), &proxyMutex_);\n \t\tbreak;\n \tcase VIDIOC_STREAMON:\n \t\tret = vidioc_streamon(file, static_cast(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 \n #include \n \n+#include \n+\n #include \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","v2","03/11"]}