From patchwork Tue Nov 30 15:55:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14906 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 B2395BF415 for ; Tue, 30 Nov 2021 15:56:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 689CC60732; Tue, 30 Nov 2021 16:56:30 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="YGQa92f6"; dkim-atps=neutral Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3A8A560732 for ; Tue, 30 Nov 2021 16:56:25 +0100 (CET) Received: by mail-pg1-x52b.google.com with SMTP id k4so10108442pgb.8 for ; Tue, 30 Nov 2021 07:56:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p0wg4tkm5r0N24uGxepa+fD7mFrPPlTowXc6iiDkvuY=; b=YGQa92f6L0xiioUkgo/I/6vQHqthKYUlSgSq4LvK+Bj1z/82AmOs8tgLBSHRP+7Zle 6NRJ89ae7EdwWibRO1wciKa9LOuq6GswTmNkLMJrRWgSuPK+geKGosPBS3Y93WIm6ZnH cd9eQMeo3y+Q6/kOPzmRPEODzBZ4GWBNhnX50= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p0wg4tkm5r0N24uGxepa+fD7mFrPPlTowXc6iiDkvuY=; b=R8CIyLmSyyrmCOrL5BEeKU3M/OXkshptQpaCe365wl0IyRG9nI87P++ebmRxr740tY DgOVktsqAgYLSxkNu6PB9N2XwLA+gPXHMP+d320LHhxB04EVr3i5tZ+1RUwhCeTVfcI5 NJoK0J41XtmtqQ68T/ln6NarkYkLYZde2ZHwY3W96L3HaAmQktUZq6mhuIBR030cz7Vz 12Pqh8aFXwRjg010bOHF7/JETt2Q7na+KwnzacBBvF3d7Nfv+BQa/NASsJWbJw37kSPO IV4/0wND6w6kJmNgH4YdvZbLxNm4RldVMl+Lvl0jsT4wKiJKlKZpXOn3EJegyazGdRMx DMcA== X-Gm-Message-State: AOAM533KAxd2jyp8b/C+5DQwH1vfBOT+7SzK1g7LP6hpWkAmatcitkgl 9nf8izMTnNuGHGi2X1MN2gLiwGBHIK5eXg== X-Google-Smtp-Source: ABdhPJztii9AUAjdRcEn7DPfpJ9pI2uOzaM/zT6kyHLY6pDr4C9NAe9h0AIqrNXndEu7N3zq/Ej4lQ== X-Received: by 2002:a05:6a00:148d:b0:49f:def7:9cfe with SMTP id v13-20020a056a00148d00b0049fdef79cfemr48470475pfu.69.1638287783587; Tue, 30 Nov 2021 07:56:23 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:c90a:5a53:b139:1336]) by smtp.gmail.com with ESMTPSA id pc10sm3510283pjb.9.2021.11.30.07.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 07:56:23 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 1 Dec 2021 00:55:57 +0900 Message-Id: <20211130155600.2203123-10-hiroh@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211130155600.2203123-1-hiroh@chromium.org> References: <20211130155600.2203123-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 09/12] android: camera_stream: Add 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This applies clang thread safety annotation to CameraStream. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/android/camera_stream.cpp | 2 +- src/android/camera_stream.h | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 2181d094..ae659808 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -275,7 +275,7 @@ void CameraStream::PostProcessorWorker::run() MutexLocker locker(mutex_); while (1) { - cv_.wait(locker, [&] { + cv_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(mutex_) { return state_ != State::Running || !requests_.empty(); }); diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index e4eb953a..6737bd2d 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -155,8 +156,10 @@ private: libcamera::Mutex mutex_; libcamera::ConditionVariable cv_; - std::queue requests_; - State state_ = State::Stopped; + std::queue requests_ + LIBCAMERA_TSA_GUARDED_BY(mutex_); + + State state_ LIBCAMERA_TSA_GUARDED_BY(mutex_) = State::Stopped; }; int waitFence(int fence); @@ -168,7 +171,7 @@ private: const unsigned int index_; std::unique_ptr allocator_; - std::vector buffers_; + std::vector buffers_ LIBCAMERA_TSA_GUARDED_BY(mutex_); /* * The class has to be MoveConstructible as instances are stored in * an std::vector in CameraDevice.