From patchwork Mon Jun 20 16:50:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 16289 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 B2299BE173 for ; Mon, 20 Jun 2022 16:50:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 74B416563A; Mon, 20 Jun 2022 18:50:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1655743843; bh=re4OBnNCW5TdEGTRkkjM/RrhyqeVTtPo5/e/DE+wZ4s=; 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=Y5WY31OR16WUZFBV+idZ9UBz6mSdSeRi78UAOmez1k9B6UqLQoMFskKGZCPZKURFA UgCvYvO8JNhFg4EoKkXX9tBLVLgNhBQI/OddP2qsSB3KBKjaFuzfaEuEDu50QA0d5U M382VwdIciVQcg7lBIHe+U2kndEwaX6UCV2arXKy9wLwPhGO80qMBKWNXsVcPfckaM d/wZM4MF9ANMO0a4gk3/fHP8WaCXD2JDoK17Q2FlYRMc/CDLpmvf9H2jKtv8ymIP9k 3ABIIOefrkV2scz/TfKm3beUD8zyqj6lT7RBg0h1WaYKqx9yKAk+uyM8B+uKY8tbjN eyyS59+hIRJeg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7F74A65634 for ; Mon, 20 Jun 2022 18:50:41 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ek7W0TgT"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [IPv6:2401:4900:1f3f:e389:cb58:4104:f66:a571]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 595A9883; Mon, 20 Jun 2022 18:50:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1655743841; bh=re4OBnNCW5TdEGTRkkjM/RrhyqeVTtPo5/e/DE+wZ4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ek7W0TgTkcTq2f1G1Wb5gAmkHAgRJqaDz6tSsITL9WoW6Fca+HEalLeqTtfxoV83T heUqlzsK58pu4GdoVxDmJ8aPo5S9zPKmxK0g+YOrsSW79mYiZxabjMxQ/s1+sXibUm 2E8DTSe61wjczo7rH/c+ikvPnSPgWkd/Dhtp5Y7k= To: libcamera-devel@lists.libcamera.org Date: Mon, 20 Jun 2022 22:20:24 +0530 Message-Id: <20220620165027.549085-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220620165027.549085-1-umang.jain@ideasonboard.com> References: <20220620165027.549085-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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 --- src/libcamera/base/thread.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp index 6bda9d14..2e26b83c 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_; @@ -160,7 +160,7 @@ private: ConditionVariable cv_; std::atomic exit_; - int exitCode_; + int exitCode_ LIBCAMERA_TSA_GUARDED_BY(mutex_); MessageQueue messages_; }; @@ -422,11 +422,19 @@ bool Thread::wait(utils::duration duration) { MutexLocker locker(data_->mutex_); - if (duration == utils::duration::max()) - data_->cv_.wait(locker, [&]() { return !data_->running_; }); - else - hasFinished = data_->cv_.wait_for(locker, duration, - [&]() { return !data_->running_; }); + if (duration == utils::duration::max()) { + data_->cv_.wait( + locker, + [&]() LIBCAMERA_TSA_REQUIRES(data_->mutex_) { + return !data_->running_; + }); + } else { + hasFinished = data_->cv_.wait_for( + locker, duration, + [&]() LIBCAMERA_TSA_REQUIRES(data_->mutex_) { + return !data_->running_; + }); + } } if (thread_.joinable())