{"id":16500,"url":"https://patchwork.libcamera.org/api/patches/16500/?format=json","web_url":"https://patchwork.libcamera.org/patch/16500/","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":"<20220701084521.31831-9-tomi.valkeinen@ideasonboard.com>","date":"2022-07-01T08:45:12","name":"[libcamera-devel,v3,08/17] py: Use libcamera's Mutex classes","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c537582db24334714f3b0501e8f508f9fc95d2da","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16500/mbox/","series":[{"id":3241,"url":"https://patchwork.libcamera.org/api/series/3241/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3241","date":"2022-07-01T08:45:04","name":"Python bindings event handling","version":3,"mbox":"https://patchwork.libcamera.org/series/3241/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16500/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16500/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 82DFEBD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri,  1 Jul 2022 08:45:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 96EF7656A2;\n\tFri,  1 Jul 2022 10:45:51 +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 706146565A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  1 Jul 2022 10:45:44 +0200 (CEST)","from deskari.lan (91-158-154-79.elisa-laajakaista.fi\n\t[91.158.154.79])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E93C46BB;\n\tFri,  1 Jul 2022 10:45:43 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656665151;\n\tbh=P4csJrs78yKiXsTsTozO9b8oqqTGp+igSSWlBlKQZyo=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=2/vUu7/DC0dhRkaIqLBHftWYN4YhKCy+vB5rUbdDVUcKZLb1Rt0FQBog2ShAZBRH5\n\tqRYJXq0mS+wtfdQaIA9mEkrECxhm9sGkqJ4vIgopCKXMm/khx8vG7z2Q6mSS5t6MGv\n\tJyiS6kcV8ql3z4+ooatG0/crQmCA5y8oo65Lke6gQ0UyvFHlfPlp88AcJnSb1F31sn\n\twnCHwchtll3Sq6GExTC1F0l8nZvFpVzyE6cCuyz9K/97ngTnEokjHPDRK8RFimV1eC\n\tLooZSw9aXwDcxjHdk0c2wq7yyOczh4baZ+ssjC05SJP21R/2mmF5XVLPkO85ZZTOSr\n\th6yMT6Yk7hykg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656665144;\n\tbh=P4csJrs78yKiXsTsTozO9b8oqqTGp+igSSWlBlKQZyo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=E8M8d94Y67VIBIDmTdeXp8JqrhS8qibWJZTqUODEDjLHDGg/gs67R7d0hUYpAbY9F\n\tgLCQqBzdHwNwb+838+HoMf5cDN+LHg5HXD6WqU3N6oEMFf1AZ2hrRTAzktAudyGG4j\n\tBUxW9LHcLVx7oLbTDH3p8OMXUgWWz+drRnvBxyX8="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"E8M8d94Y\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman <david.plowman@raspberrypi.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tJacopo Mondi <jacopo@jmondi.org>","Date":"Fri,  1 Jul 2022 11:45:12 +0300","Message-Id":"<20220701084521.31831-9-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220701084521.31831-1-tomi.valkeinen@ideasonboard.com>","References":"<20220701084521.31831-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 08/17] py: Use libcamera's Mutex classes","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>","From":"Tomi Valkeinen via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Use libcamera's Mutex and MutexLocker instead of the std versions to get\nthread safety annotations.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n---\n src/py/libcamera/py_camera_manager.cpp | 4 ++--\n src/py/libcamera/py_camera_manager.h   | 7 ++++---\n 2 files changed, 6 insertions(+), 5 deletions(-)","diff":"diff --git a/src/py/libcamera/py_camera_manager.cpp b/src/py/libcamera/py_camera_manager.cpp\nindex 3d422c9e..5600f661 100644\n--- a/src/py/libcamera/py_camera_manager.cpp\n+++ b/src/py/libcamera/py_camera_manager.cpp\n@@ -104,14 +104,14 @@ void PyCameraManager::readFd()\n \n void PyCameraManager::pushRequest(Request *req)\n {\n-\tstd::lock_guard guard(completedRequestsMutex_);\n+\tMutexLocker guard(completedRequestsMutex_);\n \tcompletedRequests_.push_back(req);\n }\n \n std::vector<Request *> PyCameraManager::getCompletedRequests()\n {\n \tstd::vector<Request *> v;\n-\tstd::lock_guard guard(completedRequestsMutex_);\n+\tMutexLocker guard(completedRequestsMutex_);\n \tswap(v, completedRequests_);\n \treturn v;\n }\ndiff --git a/src/py/libcamera/py_camera_manager.h b/src/py/libcamera/py_camera_manager.h\nindex 710163e8..56bea13d 100644\n--- a/src/py/libcamera/py_camera_manager.h\n+++ b/src/py/libcamera/py_camera_manager.h\n@@ -5,7 +5,7 @@\n \n #pragma once\n \n-#include <mutex>\n+#include <libcamera/base/mutex.h>\n \n #include <libcamera/libcamera.h>\n \n@@ -34,8 +34,9 @@ private:\n \tstd::unique_ptr<CameraManager> cameraManager_;\n \n \tUniqueFD eventFd_;\n-\tstd::mutex completedRequestsMutex_;\n-\tstd::vector<Request *> completedRequests_;\n+\tlibcamera::Mutex completedRequestsMutex_;\n+\tstd::vector<Request *> completedRequests_\n+\t\tLIBCAMERA_TSA_GUARDED_BY(completedRequestsMutex_);\n \n \tvoid writeFd();\n \tvoid readFd();\n","prefixes":["libcamera-devel","v3","08/17"]}