{"id":17180,"url":"https://patchwork.libcamera.org/api/patches/17180/?format=json","web_url":"https://patchwork.libcamera.org/patch/17180/","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":"<20220819111615.39814-6-tomi.valkeinen@ideasonboard.com>","date":"2022-08-19T11:16:14","name":"[libcamera-devel,v4,5/6] py: Use libcamera's Mutex classes","commit_ref":"de7f1aa591881e112b67ec4f6507a6079b226089","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/17180/mbox/","series":[{"id":3428,"url":"https://patchwork.libcamera.org/api/series/3428/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3428","date":"2022-08-19T11:16:09","name":"Python bindings: PyCameraManager and non-blocking eventfd","version":4,"mbox":"https://patchwork.libcamera.org/series/3428/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17180/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17180/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 1DB78C327E\n\tfor ;\n\tFri, 19 Aug 2022 11:16:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BEBA361FC9;\n\tFri, 19 Aug 2022 13:16:37 +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 C898A61FA4\n\tfor ;\n\tFri, 19 Aug 2022 13:16:32 +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 3E4C7576;\n\tFri, 19 Aug 2022 13:16:32 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660907797;\n\tbh=8NLR0FxcULLStTI51TfPY5LofhxaBSG9bWYCSh60mxc=;\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=C03zgG9KIwsB6PcrJ/OrGrVJvWhPnwb6TQd9MYJBzB2FxMwWvoLBrKi2+UZJlC+gE\n\tBrV4md3392Vu1eV55xaSXDE8k1IUiabKDQtd8yS5HemZtxiSjS83CySlUNnsvyuWVu\n\tLWzpZxO2R+sGim/GKShxQ+hKMK/vmftiDT5MlZuvoJb0vo3irptEwRYNPuZDhve8Fk\n\toYvUFQnrTxKTwtb8B/aSXosiLMgQkmmFnL3uS5tNsf3UJkUF/JZwUhch6/1BtgGxIa\n\tDbiQr6lh7sfCFG1ldC4gk/T9g/KTC2Xlkkqznw+eFRDm0GnJ00klZcpE0wYRz1zcao\n\trznJwZixWufqg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660907792;\n\tbh=8NLR0FxcULLStTI51TfPY5LofhxaBSG9bWYCSh60mxc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=SPUPGSg8msC0/IN65vNbKEHwRe5JrxiWNCryTcjHT2J0x9Plj5p0JmocMp7y7l+RA\n\tLON6X6p8Ndm7X3imeo2EgT2j7xAmTRtWqPUaWEaGIF84JJswuRoGXbtGvI3npnSLd3\n\tQS0LeJ1pJ1zoSLXNTcx0rZw+K3RToqaxtPO2hkaA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"SPUPGSg8\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman ,\n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tJacopo Mondi ","Date":"Fri, 19 Aug 2022 14:16:14 +0300","Message-Id":"<20220819111615.39814-6-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220819111615.39814-1-tomi.valkeinen@ideasonboard.com>","References":"<20220819111615.39814-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 5/6] 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 \nReviewed-by: Laurent Pinchart \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 8bfb8e57..ea4ae825 100644\n--- a/src/py/libcamera/py_camera_manager.cpp\n+++ b/src/py/libcamera/py_camera_manager.cpp\n@@ -106,14 +106,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","v4","5/6"]}