From patchwork Thu Nov 3 13:20:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 17753 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id F1EFBC3285 for ; Thu, 3 Nov 2022 13:20:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7E72A63081; Thu, 3 Nov 2022 14:20:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1667481653; bh=xehfdJ8bkEZHFwHbUtXONtyLqRSwjY8EfbL0qgWYzUc=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=GihTOB2QJ/H/SHN+TdjwvQwsA/l8Bq/QDrc1rc3FLyKJmROjAloI056cuLRGPiFXS 6kPAI6kaAD58E1Ro3S/JLL8YNjJo/xvLnylGjJzA0TUzsuNzcPhAKzrFtpN6fYToaW Yh5d5drT6/h0UlBYvUiU794X1E62FHWRUg2ZV24G5vjt7KxIoQc8ZPf9k8I9iWhqVT eFvZJ060i2FJWqDvLWuuQ/DasHOcZ71V7jufzbi1DMa6PBvt7pwjHbDyAfmvhvvrNQ inFzZMNoeLx63m+jcWa+bNwKrlgejCg46mHKp/fGCGTimBqgmNyRHe2P3hWiRpu4Ct dMUMAuJG7NusQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1088261F42 for ; Thu, 3 Nov 2022 14:20:52 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="SXqdvjWp"; dkim-atps=neutral Received: from umang.jainideasonboard.com (unknown [103.251.226.107]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D98334B2; Thu, 3 Nov 2022 14:20:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1667481651; bh=xehfdJ8bkEZHFwHbUtXONtyLqRSwjY8EfbL0qgWYzUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SXqdvjWpzyYQgdeN0iqQUH9qOzfNoHK2gcIspM32p58uUGcVbLfUkXQlHJHUPCr4K D71z1IvYb4whWEL2I0FXRYWFfLklEMdLYQUNUHL9Cbb4M9g58nymlf+jyHllfHQD0N lfFj/S9x890xfrnEjGOzDieqPNXc29f2AxaIPXIg= To: libcamera-devel@lists.libcamera.org Date: Thu, 3 Nov 2022 18:50:37 +0530 Message-Id: <20221103132041.64644-2-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103132041.64644-1-umang.jain@ideasonboard.com> References: <20221103132041.64644-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/5] libcamera: base: semaphore: Apply clang thread safety annotation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Hirokazu Honda This annotates member functions and variables of Semaphore by clang thread safety annotations. Signed-off-by: Hirokazu Honda Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- include/libcamera/base/semaphore.h | 10 +++++----- src/libcamera/base/semaphore.cpp | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h index c11e8dd1..f1052317 100644 --- a/include/libcamera/base/semaphore.h +++ b/include/libcamera/base/semaphore.h @@ -18,15 +18,15 @@ class Semaphore public: Semaphore(unsigned int n = 0); - unsigned int available(); - void acquire(unsigned int n = 1); - bool tryAcquire(unsigned int n = 1); - void release(unsigned int n = 1); + unsigned int available() LIBCAMERA_TSA_EXCLUDES(mutex_); + void acquire(unsigned int n = 1) LIBCAMERA_TSA_EXCLUDES(mutex_); + bool tryAcquire(unsigned int n = 1) LIBCAMERA_TSA_EXCLUDES(mutex_); + void release(unsigned int n = 1) LIBCAMERA_TSA_EXCLUDES(mutex_); private: Mutex mutex_; ConditionVariable cv_; - unsigned int available_; + unsigned int available_ LIBCAMERA_TSA_GUARDED_BY(mutex_); }; } /* namespace libcamera */ diff --git a/src/libcamera/base/semaphore.cpp b/src/libcamera/base/semaphore.cpp index 4fe30293..6217e386 100644 --- a/src/libcamera/base/semaphore.cpp +++ b/src/libcamera/base/semaphore.cpp @@ -56,7 +56,9 @@ unsigned int Semaphore::available() void Semaphore::acquire(unsigned int n) { MutexLocker locker(mutex_); - cv_.wait(locker, [&] { return available_ >= n; }); + cv_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(mutex_) { + return available_ >= n; + }); available_ -= n; } From patchwork Thu Nov 3 13:20:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 17754 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 531CBBDB16 for ; Thu, 3 Nov 2022 13:20:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EE1EC6307F; Thu, 3 Nov 2022 14:20:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1667481656; bh=Nau0p4nP5MV8MRZIcHSlvqOY1c6oJkKKFVEptY/PLBQ=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=fNBMxJmiWmDrfqqGiK5rXMJM7JzIeF7NOI+5SnnbMHYU+OycJDQKxkUBz0F2e6jij jWctBEcXFPDeFfyXVmV97OhW6witRJV62wT1Lin1F4ugE3hL3/MU8uu4ouViehDfVR Xf6Wj3gMGSgIaN+JjxezVNIummOhTNJ5YXWS83ejc6nuM6ziwJq10c9hDLdvTdADeQ PADfFbwlx4srVoPU0Jpr7Al+4t1ZkjABK7AO+KckUfM6ZCYbiaixeKUII2eMSLjwnX j3wz51S+XFbuDKzK1gGh8WLnGwLGQUfUkFdLs0gPH/Z+yTCFnL0eQUi/33F/1r/5V0 dPFmB+deCj/yg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 531AA63079 for ; Thu, 3 Nov 2022 14:20:55 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hmwLGu1S"; dkim-atps=neutral Received: from umang.jainideasonboard.com (unknown [103.251.226.107]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EAFBB4B2; Thu, 3 Nov 2022 14:20:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1667481654; bh=Nau0p4nP5MV8MRZIcHSlvqOY1c6oJkKKFVEptY/PLBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hmwLGu1SzaMCxMuGYof6gEAHBrIBLDlGiaE97/jFO/T32Kq87eqeMKSkfQZ+WlcxQ JxbIN/weELTU9aQVICxtPtAfSi7P+iw7aNB0+hQfmxmxG5HjGgepA4IPpm9PvkSZmQ lJpytTYIyhefTNnw/oh4IKu0iqrjCShZdcpnRUyw= To: libcamera-devel@lists.libcamera.org Date: Thu, 3 Nov 2022 18:50:38 +0530 Message-Id: <20221103132041.64644-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103132041.64644-1-umang.jain@ideasonboard.com> References: <20221103132041.64644-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/5] libcamera: base: thread: Apply clang thread safety annotation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Hirokazu Honda This annotates member variables of ThreadData by clang thread safety annotations. Signed-off-by: Hirokazu Honda Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/libcamera/base/thread.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp index 6bda9d14..b96951ac 100644 --- a/src/libcamera/base/thread.cpp +++ b/src/libcamera/base/thread.cpp @@ -151,7 +151,7 @@ private: friend class ThreadMain; Thread *thread_; - bool running_; + bool running_ LIBCAMERA_TSA_GUARDED_BY(mutex_); pid_t tid_; Mutex mutex_; @@ -422,11 +422,15 @@ bool Thread::wait(utils::duration duration) { MutexLocker locker(data_->mutex_); + auto isRunning = ([&]() LIBCAMERA_TSA_REQUIRES(data_->mutex_) { + return !data_->running_; + }); + if (duration == utils::duration::max()) - data_->cv_.wait(locker, [&]() { return !data_->running_; }); + data_->cv_.wait(locker, isRunning); else hasFinished = data_->cv_.wait_for(locker, duration, - [&]() { return !data_->running_; }); + isRunning); } if (thread_.joinable()) From patchwork Thu Nov 3 13:20:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 17755 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id AC637C3285 for ; Thu, 3 Nov 2022 13:21:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 562FA63083; Thu, 3 Nov 2022 14:21:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1667481660; bh=f4h+ip3NlN/U3w2+q3lDxqUOwIhIZfN8LShVKJpA2h0=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=iX5Wd6OlXNOwX+46ZPaMU3SsNFeUCA6bf08Zr9p26YC79NJ5VP8HUu+hBbETMYNkP DhqPvRDzBQvOLzpMNlKVCcpi0Y4UjFklkS2NxusLED6zPfWhNBUXwXxDendJV46blO vsejy58QEE5S31jsVsJ9Cm4BXSUdUvMPBmlL33iWhiCeE3N8/s/41VU7vVpOP1Ofw1 ON/X+zaixBaYEggSzig0ck2oVPB28baW+7nYFQ9WMEpETjYswjDyYfoLi8mLQc9Qjf yn3N2nDu47/H8+IVsTNv1tDximiCApE2j0j5YAyQy/SCR5fMdi6exFaAAczRNbNpwI 482Zn3ogje26Q== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 47F8A63079 for ; Thu, 3 Nov 2022 14:20:58 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Zn5jUXHE"; dkim-atps=neutral Received: from umang.jainideasonboard.com (unknown [103.251.226.107]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3BA7256D; Thu, 3 Nov 2022 14:20:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1667481658; bh=f4h+ip3NlN/U3w2+q3lDxqUOwIhIZfN8LShVKJpA2h0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zn5jUXHEMPu5e914CyTNG0q6uoHIpOh2gmwfSvTBGjX2qMscbqgCoxIN/3851eobT Ls7Al+S6PFZPOTk5a0fbimPFuq7dPmR8xGBdJeksNgc/7RVPibK1pd8urOZc5AQ7iA 0xRUQ10pHYsgBGrhOO2v9dd+vvd6B8k/KrqArx5Q= To: libcamera-devel@lists.libcamera.org Date: Thu, 3 Nov 2022 18:50:39 +0530 Message-Id: <20221103132041.64644-4-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103132041.64644-1-umang.jain@ideasonboard.com> References: <20221103132041.64644-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/5] libcamera: camera_manager: Apply clang thread safety annotation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Hirokazu Honda This annotates member functions and variables of CameraManager::Private by clang thread safety annotations. Signed-off-by: Hirokazu Honda Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/libcamera/camera_manager.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 2c100c24..b1785f75 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -42,8 +42,8 @@ public: int start(); void addCamera(std::shared_ptr camera, - const std::vector &devnums); - void removeCamera(Camera *camera); + const std::vector &devnums) LIBCAMERA_TSA_EXCLUDES(mutex_); + void removeCamera(Camera *camera) LIBCAMERA_TSA_EXCLUDES(mutex_); /* * This mutex protects @@ -52,8 +52,8 @@ public: * - cameras_ and camerasByDevnum_ after initialization */ mutable Mutex mutex_; - std::vector> cameras_; - std::map> camerasByDevnum_; + std::vector> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_); + std::map> camerasByDevnum_ LIBCAMERA_TSA_GUARDED_BY(mutex_); protected: void run() override; @@ -61,11 +61,11 @@ protected: private: int init(); void createPipelineHandlers(); - void cleanup(); + void cleanup() LIBCAMERA_TSA_EXCLUDES(mutex_); ConditionVariable cv_; - bool initialized_; - int status_; + bool initialized_ LIBCAMERA_TSA_GUARDED_BY(mutex_); + int status_ LIBCAMERA_TSA_GUARDED_BY(mutex_); std::unique_ptr enumerator_; @@ -87,7 +87,9 @@ int CameraManager::Private::start() { MutexLocker locker(mutex_); - cv_.wait(locker, [&] { return initialized_; }); + cv_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(mutex_) { + return initialized_; + }); status = status_; } @@ -178,7 +180,11 @@ void CameraManager::Private::cleanup() * process deletion requests from the thread's message queue as the event * loop is not in action here. */ - cameras_.clear(); + { + MutexLocker locker(mutex_); + cameras_.clear(); + } + dispatchMessages(Message::Type::DeferredDelete); enumerator_.reset(nullptr); From patchwork Thu Nov 3 13:20:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 17756 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 3DBB9C3286 for ; Thu, 3 Nov 2022 13:21:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AFF8B6308A; Thu, 3 Nov 2022 14:21:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1667481662; bh=ETmrG/1EA4MoKNRz52ny2k1ELjOzHpDB/vd5CTFpzfA=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Ru1OA9hY4vRHIU5g+clzlRbiLWJzebX9eQBFQ+pennK86mw6EWziosrcFGYj5olPJ BUgEf70grFNLEF+KPonKHx/nOY/wqn2XDnv5h+vgMvO7VCiHRywV/uvBGdBlGOVJp6 D7dd8Xx2KkKfa1ipVpZ7Q62OnfWbipOwpUGuCHhZ31aEa3b3g4iS4dDiqVpimO/VW9 1UnhlNWvDRKgeNSfcMG6PnTCvqykHGR1LMHsE0LXFDVtWqp6lJ48iW0wFansXjZcYO NNrh3XKLS/Klo7VFA2Ut8wD0yzMN6DiVgkW7F7sQdcH0FcdUc02mPm1uKeO9v6rQlR I8O8NDKzwq7vw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4871563079 for ; Thu, 3 Nov 2022 14:21:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="kVqHIfUK"; dkim-atps=neutral Received: from umang.jainideasonboard.com (unknown [103.251.226.107]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4BF4E4B2; Thu, 3 Nov 2022 14:20:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1667481661; bh=ETmrG/1EA4MoKNRz52ny2k1ELjOzHpDB/vd5CTFpzfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kVqHIfUKdmIhuOkmWNuMzvpgadax9wEz4gt8Y5+zOS0SXoep+dggLim9hjsIkLUmw CiexBRzpWMAGSLbPAz2sxQZlV/SSI4w+kUbsP3hqW3oNeb/URms4eTGQU3d+seTBQi T2jfYNvBoGt4BrEOuF6ukBOn9XT7KkKkT4UjUwWw= To: libcamera-devel@lists.libcamera.org Date: Thu, 3 Nov 2022 18:50:40 +0530 Message-Id: <20221103132041.64644-5-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103132041.64644-1-umang.jain@ideasonboard.com> References: <20221103132041.64644-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 4/5] v4l2: v4l2_camera_proxy: Apply clang thread safety annotation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Hirokazu Honda This annotates member functions of V4L2CameraProxy by clang thread safety annotations. Signed-off-by: Hirokazu Honda Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/v4l2/v4l2_camera_proxy.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index 76ca2d8a..8a0195e1 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -27,13 +27,15 @@ class V4L2CameraProxy public: V4L2CameraProxy(unsigned int index, std::shared_ptr camera); - int open(V4L2CameraFile *file); - void close(V4L2CameraFile *file); + int open(V4L2CameraFile *file) LIBCAMERA_TSA_EXCLUDES(proxyMutex_); + void close(V4L2CameraFile *file) LIBCAMERA_TSA_EXCLUDES(proxyMutex_); void *mmap(V4L2CameraFile *file, void *addr, size_t length, int prot, - int flags, off64_t offset); - int munmap(V4L2CameraFile *file, void *addr, size_t length); + int flags, off64_t offset) LIBCAMERA_TSA_EXCLUDES(proxyMutex_); + int munmap(V4L2CameraFile *file, void *addr, size_t length) + LIBCAMERA_TSA_EXCLUDES(proxyMutex_); - int ioctl(V4L2CameraFile *file, unsigned long request, void *arg); + int ioctl(V4L2CameraFile *file, unsigned long request, void *arg) + LIBCAMERA_TSA_EXCLUDES(proxyMutex_); private: bool validateBufferType(uint32_t type); From patchwork Thu Nov 3 13:20:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 17757 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id B68FCC3287 for ; Thu, 3 Nov 2022 13:21:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 38F0D63089; Thu, 3 Nov 2022 14:21:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1667481665; bh=kfmepM45QS7U93rRH4WG1oOHio2OG+kiikAbDbHpmHw=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=j4J4f9Y2gPsb74/cPT/Uzm1cNt0fFn0cpTcsU7MsOASwuW2K+s6c2Qs6tXN/Q6+zJ IrWE7gIGU7DxeuOb/4fGaIl0mgE/HpfTRi9c7e+l4GqqAM4DqZFXEWRZhi4WbSuqBY m3Jh+0Zlb19cPTYWhcaSzVVAVMVpqvkSe9l9vgSXmeBkZYyyWu9cV6GNKpfSZ5dxFI 0g1/Z3TgRbsblsPfskUpe5KuFxlODGNcUBTZWBw+Z8xkzVAADUNY3v5/wLBiETWLtR vY9pN66k3J7iDkHw0aoMl6YXxJfuJ1hkXg7GV76gPp+8nWMgsJN//p7ah/cez/y7G3 L3CJ9k8kfOq4Q== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CDC6E63079 for ; Thu, 3 Nov 2022 14:21:03 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="JTnIco7O"; dkim-atps=neutral Received: from umang.jainideasonboard.com (unknown [103.251.226.107]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ED9C856D; Thu, 3 Nov 2022 14:21:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1667481663; bh=kfmepM45QS7U93rRH4WG1oOHio2OG+kiikAbDbHpmHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JTnIco7OJvKaIo+aPeSvV0ERBq0uaAPifQv1vbf2augKtPbm7Bu3HTUZMeJ2XhoBi oaq2cSy5GX+qdJVa+yHgnN+2Z9Ho55iyKdhJ6qVt51cfcCuVh3UuP1+6u4c0wotupj pwgAsFZhKSrPOjaA3YbRIAvdYeqn7vGE1Jn4FXIE= To: libcamera-devel@lists.libcamera.org Date: Thu, 3 Nov 2022 18:50:41 +0530 Message-Id: <20221103132041.64644-6-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103132041.64644-1-umang.jain@ideasonboard.com> References: <20221103132041.64644-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 5/5] v4l2: v4l2_camera: Apply clang thread safety annotation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Hirokazu Honda This annotates member functions and variables of V4L2Camera by clang thread safety annotations. Signed-off-by: Hirokazu Honda Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/v4l2/v4l2_camera.cpp | 5 ++--- src/v4l2/v4l2_camera.h | 14 ++++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index e922b9e6..7b97c2d5 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -71,11 +71,10 @@ std::vector V4L2Camera::completedBuffers() { std::vector v; - bufferLock_.lock(); + MutexLocker lock(bufferLock_); for (std::unique_ptr &metadata : completedBuffers_) v.push_back(*metadata.get()); completedBuffers_.clear(); - bufferLock_.unlock(); return v; } @@ -278,7 +277,7 @@ int V4L2Camera::qbuf(unsigned int index) void V4L2Camera::waitForBufferAvailable() { MutexLocker locker(bufferMutex_); - bufferCV_.wait(locker, [&] { + bufferCV_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(bufferMutex_) { return bufferAvailableCount_ >= 1 || !isRunning_; }); if (isRunning_) diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index 03e74118..d3483444 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -39,7 +39,7 @@ public: void bind(int efd); void unbind(); - std::vector completedBuffers(); + std::vector completedBuffers() LIBCAMERA_TSA_EXCLUDES(bufferLock_); int configure(libcamera::StreamConfiguration *streamConfigOut, const libcamera::Size &size, @@ -58,13 +58,14 @@ public: int qbuf(unsigned int index); - void waitForBufferAvailable(); - bool isBufferAvailable(); + void waitForBufferAvailable() LIBCAMERA_TSA_EXCLUDES(bufferMutex_); + bool isBufferAvailable() LIBCAMERA_TSA_EXCLUDES(bufferMutex_); bool isRunning(); private: - void requestComplete(libcamera::Request *request); + void requestComplete(libcamera::Request *request) + LIBCAMERA_TSA_EXCLUDES(bufferLock_); std::shared_ptr camera_; std::unique_ptr config_; @@ -77,11 +78,12 @@ private: std::vector> requestPool_; std::deque pendingRequests_; - std::deque> completedBuffers_; + std::deque> completedBuffers_ + LIBCAMERA_TSA_GUARDED_BY(bufferLock_); int efd_; libcamera::Mutex bufferMutex_; libcamera::ConditionVariable bufferCV_; - unsigned int bufferAvailableCount_; + unsigned int bufferAvailableCount_ LIBCAMERA_TSA_GUARDED_BY(bufferMutex_); };