{"id":16414,"url":"https://patchwork.libcamera.org/api/1.1/patches/16414/?format=json","web_url":"https://patchwork.libcamera.org/patch/16414/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20220629070416.17550-9-tomi.valkeinen@ideasonboard.com>","date":"2022-06-29T07:04:10","name":"[libcamera-devel,v2,08/14] py: Use libcamera's Mutex classes","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c537582db24334714f3b0501e8f508f9fc95d2da","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/1.1/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16414/mbox/","series":[{"id":3230,"url":"https://patchwork.libcamera.org/api/1.1/series/3230/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3230","date":"2022-06-29T07:04:02","name":"Python bindings event handling","version":2,"mbox":"https://patchwork.libcamera.org/series/3230/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16414/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16414/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 5B3C0BE173\n\tfor ;\n\tWed, 29 Jun 2022 07:04:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DF0596564D;\n\tWed, 29 Jun 2022 09:04:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 935D965642\n\tfor ;\n\tWed, 29 Jun 2022 09:04: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 0C98C6D1;\n\tWed, 29 Jun 2022 09:04:44 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656486295;\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=UmTpezF5HVg5UTCl2jv9NVO1G2Dxuc/gYqs3tDxGtRoj36Fo0kLQnAXdJBdOZy2PC\n\tXGbTc69jHN51EEeS3JZN0VNi2EATDWBuBgGRvTDmtKLI8O3ZNSJu0HcWzVn6VVY/iG\n\t55Hvv4c2uTRRGItkDHbEsU9EdKe9+FOqnL/Uv/zNfwYvVasuGrEjjrA04gk614TV9R\n\twWF8Oa4WaN31S5T4+oGjo1iQHibA5vA66rzdCN0NIhO3A61sU6kco6BqRmPS/cEgXi\n\tbucDa1VvE687ZHHTWMOXBYcwZPWL4pwL1d0z7DgjNfFRH+mi1SsnXVFoIVTbtmET9a\n\t1ybw2TbJ8gLhg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656486284;\n\tbh=P4csJrs78yKiXsTsTozO9b8oqqTGp+igSSWlBlKQZyo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ogt2/5L8WRctwbAsV66J/1pC3rh97iw32Sn1KfBlxjCQ6XHGF22D0qx/yLoe0IJl3\n\ti9cdwWWlLCm2zuS4JXgUgE/QNdn528HljUyO2WpW3e9bXGR4Atqy28sDp5YZtykZ72\n\tOODcyJvh1toIyFdYfThyQlKs1eKJoHJeKOxty0qI="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ogt2/5L8\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman ,\n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tJacopo Mondi ","Date":"Wed, 29 Jun 2022 10:04:10 +0300","Message-Id":"<20220629070416.17550-9-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220629070416.17550-1-tomi.valkeinen@ideasonboard.com>","References":"<20220629070416.17550-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 08/14] py: Use libcamera's Mutex classes","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","From":"Tomi Valkeinen via libcamera-devel\n\t","Reply-To":"Tomi Valkeinen ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Use libcamera's Mutex and MutexLocker instead of the std versions to get\nthread safety annotations.\n\nSigned-off-by: Tomi Valkeinen \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 PyCameraManager::getCompletedRequests()\n {\n \tstd::vector 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 \n+#include \n \n #include \n \n@@ -34,8 +34,9 @@ private:\n \tstd::unique_ptr cameraManager_;\n \n \tUniqueFD eventFd_;\n-\tstd::mutex completedRequestsMutex_;\n-\tstd::vector completedRequests_;\n+\tlibcamera::Mutex completedRequestsMutex_;\n+\tstd::vector completedRequests_\n+\t\tLIBCAMERA_TSA_GUARDED_BY(completedRequestsMutex_);\n \n \tvoid writeFd();\n \tvoid readFd();\n","prefixes":["libcamera-devel","v2","08/14"]}