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())