{"id":15221,"url":"https://patchwork.libcamera.org/api/patches/15221/?format=json","web_url":"https://patchwork.libcamera.org/patch/15221/","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":"<20211226231255.18653-3-laurent.pinchart@ideasonboard.com>","date":"2021-12-26T23:12:55","name":"[libcamera-devel,v2,2/2] libcamera: pipeline_handler: Make lock() and unlock() thread-safe","commit_ref":"152adad97a95c15ae9ac2e1889f94a3dc6412165","pull_url":null,"state":"accepted","archived":false,"hash":"6518c844b11014e68da6786b0078d6391859f37e","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15221/mbox/","series":[{"id":2865,"url":"https://patchwork.libcamera.org/api/series/2865/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2865","date":"2021-12-26T23:12:53","name":"libcamera: Small cleanups for pipeline handler locking","version":2,"mbox":"https://patchwork.libcamera.org/series/2865/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15221/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15221/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 45829BF415\n\tfor ;\n\tSun, 26 Dec 2021 23:13:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E81D360918;\n\tMon, 27 Dec 2021 00:13:09 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3E981608E6\n\tfor ;\n\tMon, 27 Dec 2021 00:13:06 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DA3C5148B\n\tfor ;\n\tMon, 27 Dec 2021 00:13:05 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Xc+kGqp5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1640560386;\n\tbh=t3SMdk0VGcMS6YGie3R8h/BleNltHY+0ZzOxkUkRncs=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Xc+kGqp59cMmCktum+H7FwOofiUpXyPM1b+UNlRbx73wuEYhQqlA5isV6Ml04ML/y\n\tRfFdCwo6tLT3rUYN+47JRy/jUEfqXV943CSMfy96BUiSF76ddHM1QHUGOvvWS8Ha6o\n\t6qX9rFnBqTA+sYXdnVmoMhT1Uklu99jhiabOEXqY=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 27 Dec 2021 01:12:55 +0200","Message-Id":"<20211226231255.18653-3-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20211226231255.18653-1-laurent.pinchart@ideasonboard.com>","References":"<20211226231255.18653-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/2] libcamera: pipeline_handler: Make\n\tlock() and unlock() thread-safe","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":"The PipelineHandler lock() and unlock() functions are documented as\nthread-safe, but they're not. Fix them using a mutex.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\nChanges since v1:\n\n- Add thread safety annotation\n- Comment that lockOwner_ does not indicate ownership of lock_\n---\n include/libcamera/internal/pipeline_handler.h | 4 +++-\n src/libcamera/pipeline_handler.cpp | 5 +++++\n 2 files changed, 8 insertions(+), 1 deletion(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex a7331cedfb16..e5b8ffb4db3d 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -14,6 +14,7 @@\n #include \n #include \n \n+#include \n #include \n \n #include \n@@ -88,7 +89,8 @@ private:\n \n \tconst char *name_;\n \n-\tbool lockOwner_;\n+\tMutex lock_;\n+\tbool lockOwner_ LIBCAMERA_TSA_GUARDED_BY(lock_); /* *Not* ownership of lock_ */\n \n \tfriend class PipelineHandlerFactory;\n };\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex a9241ac62979..03e4b9e66aa6 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -11,6 +11,7 @@\n #include \n \n #include \n+#include \n #include \n \n #include \n@@ -155,6 +156,8 @@ MediaDevice *PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,\n */\n bool PipelineHandler::lock()\n {\n+\tMutexLocker locker(lock_);\n+\n \t/* Do not allow nested locking in the same libcamera instance. */\n \tif (lockOwner_)\n \t\treturn false;\n@@ -183,6 +186,8 @@ bool PipelineHandler::lock()\n */\n void PipelineHandler::unlock()\n {\n+\tMutexLocker locker(lock_);\n+\n \tif (!lockOwner_)\n \t\treturn;\n \n","prefixes":["libcamera-devel","v2","2/2"]}