From patchwork Fri Oct 29 04:14:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14411 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 B17EBBF415 for ; Fri, 29 Oct 2021 04:14:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6E3FD600BA; Fri, 29 Oct 2021 06:14:42 +0200 (CEST) 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="Y3i4XMcj"; dkim-atps=neutral Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DFB6D600BC for ; Fri, 29 Oct 2021 06:14:38 +0200 (CEST) Received: by mail-pg1-x52e.google.com with SMTP id r28so8720762pga.0 for ; Thu, 28 Oct 2021 21:14:38 -0700 (PDT) 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=McoQw3rc9fJF6a1dSKvOmudXfrS2GJYCbsikZQKHDsU=; b=Y3i4XMcj4Bgh2SOEakHNHVarSc7Q85OhoPKU99Pd285JYh3NhaFAHaNf1/QArmDayv CWkAvh07SJ9OLdc5W5m19G8IRvwGWfNY107tnMt6LBL02X4/J74J7cHtq0sn+Tee0Ulr rJVYxGjgjDjdD/kYRU49KOxBrd5EhF2QZCOYM= 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=McoQw3rc9fJF6a1dSKvOmudXfrS2GJYCbsikZQKHDsU=; b=P0+MZn77HzCY1FHjs59MtQrj1FPrg2a91UT0QO1+ehDT8qan+HhaPxffIPmbOfURWX woFKahSY7yz5WtSwK1sWnwZwX/I7vsXLtdPCtcb4dCjhHe2QrGdoZaVovGNlEbRHOdtI O+TZunsHtd7BpiUnzDuV3asIP6I7e3OBssU79wOCPrC0nf+eoVkW+AjkXuCSJFWtJfJF 6IlhwHDHJ76DhgDrN5D9YIrRJpESIpPXO60N9Kmx8TgMyieSXtxwjEfX+DloH9GPypry wNIyNetXaHDai4wTmNZTDkTEpC8k542oKQXJSHFxpi2zVYqWQvRAdF3Uuh41UL2mDf0R nlIQ== X-Gm-Message-State: AOAM532peG5VMjuM+7bVy/uRRK5FuDYAbff5b16l+Hgq1kbWzXckSeYW x4mCp5vi5tBwDcnpNhlktKXyIlnpGe23sw== X-Google-Smtp-Source: ABdhPJwlZwiYdyZLTcTwTCnjBJ9JZfj0nmDzOU76f/YWv0H2mHvY4NxEC5zv6968g3bOuQgIbBPT3w== X-Received: by 2002:a05:6a00:14c1:b0:47f:5f9:8675 with SMTP id w1-20020a056a0014c100b0047f05f98675mr451763pfu.22.1635480877193; Thu, 28 Oct 2021 21:14:37 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:fd56:8786:5663:b946]) by smtp.gmail.com with ESMTPSA id 11sm4826714pfl.41.2021.10.28.21.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 21:14:36 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Fri, 29 Oct 2021 13:14:22 +0900 Message-Id: <20211029041424.1430886-5-hiroh@chromium.org> X-Mailer: git-send-email 2.33.1.1089.g2158813163f-goog In-Reply-To: <20211029041424.1430886-1-hiroh@chromium.org> References: <20211029041424.1430886-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 4/6] 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. Mutex and MutexLocker there are replaced with Mutex2 and MutexLocer2. Signed-off-by: Hirokazu Honda Reviewed-by: Umang Jain --- src/android/camera_stream.cpp | 22 ++++++++++++---------- src/android/camera_stream.h | 13 +++++++------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 9023c13c..c5272445 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -119,12 +119,13 @@ int CameraStream::configure() if (type_ == Type::Internal) { allocator_ = std::make_unique(cameraDevice_->camera()); - mutex_ = std::make_unique(); + mutex_ = std::make_unique(); int ret = allocator_->allocate(stream()); if (ret < 0) return ret; + MutexLocker2 lock(*mutex_); /* Save a pointer to the reserved frame buffers */ for (const auto &frameBuffer : allocator_->buffers(stream())) buffers_.push_back(frameBuffer.get()); @@ -208,7 +209,7 @@ FrameBuffer *CameraStream::getBuffer() if (!allocator_) return nullptr; - std::lock_guard locker(*mutex_); + MutexLocker2 lock(*mutex_); if (buffers_.empty()) { LOG(HAL, Error) << "Buffer underrun"; @@ -226,20 +227,21 @@ void CameraStream::putBuffer(FrameBuffer *buffer) if (!allocator_) return; - std::lock_guard locker(*mutex_); + MutexLocker2 lock(*mutex_); buffers_.push_back(buffer); } CameraStream::PostProcessorWorker::PostProcessorWorker(PostProcessor *postProcessor) - : postProcessor_(postProcessor) + : postProcessor_(postProcessor), + state_(State::Stopped) { } CameraStream::PostProcessorWorker::~PostProcessorWorker() { { - libcamera::MutexLocker lock(mutex_); + libcamera::MutexLocker2 lock(mutex_); state_ = State::Stopped; } @@ -250,7 +252,7 @@ CameraStream::PostProcessorWorker::~PostProcessorWorker() void CameraStream::PostProcessorWorker::start() { { - libcamera::MutexLocker lock(mutex_); + libcamera::MutexLocker2 lock(mutex_); ASSERT(state_ != State::Running); state_ = State::Running; } @@ -261,7 +263,7 @@ void CameraStream::PostProcessorWorker::start() void CameraStream::PostProcessorWorker::queueRequest(Camera3RequestDescriptor::StreamBuffer *dest) { { - MutexLocker lock(mutex_); + MutexLocker2 lock(mutex_); ASSERT(state_ == State::Running); requests_.push(dest); } @@ -271,10 +273,10 @@ void CameraStream::PostProcessorWorker::queueRequest(Camera3RequestDescriptor::S void CameraStream::PostProcessorWorker::run() { - MutexLocker locker(mutex_); + MutexLocker2 locker(mutex_); while (1) { - cv_.wait(locker, [&] { + cv_.wait(locker.get(), [&]() REQUIRES(mutex_) { return state_ != State::Running || !requests_.empty(); }); @@ -308,7 +310,7 @@ void CameraStream::PostProcessorWorker::run() void CameraStream::PostProcessorWorker::flush() { - libcamera::MutexLocker lock(mutex_); + MutexLocker2 lock(mutex_); state_ = State::Flushing; lock.unlock(); diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index 0c402deb..665bdf5c 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -9,13 +9,14 @@ #include #include -#include #include #include #include +#include #include +#include #include #include @@ -153,11 +154,11 @@ private: private: PostProcessor *postProcessor_; - libcamera::Mutex mutex_; + libcamera::Mutex2 mutex_; std::condition_variable cv_; - std::queue requests_; - State state_ = State::Stopped; + std::queue requests_ GUARDED_BY(mutex_); + State state_ GUARDED_BY(mutex_); }; int waitFence(int fence); @@ -169,12 +170,12 @@ private: const unsigned int index_; std::unique_ptr allocator_; - std::vector buffers_; + std::vector buffers_ GUARDED_BY(mutex_); /* * The class has to be MoveConstructible as instances are stored in * an std::vector in CameraDevice. */ - std::unique_ptr mutex_; + std::unique_ptr mutex_; std::unique_ptr postProcessor_; std::unique_ptr worker_;