{"id":9093,"url":"https://patchwork.libcamera.org/api/1.1/patches/9093/?format=json","web_url":"https://patchwork.libcamera.org/patch/9093/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200731140801.13253-3-david.plowman@raspberrypi.com>","date":"2020-07-31T14:07:59","name":"[libcamera-devel,v2,2/4] libcamera: ipa: raspberrypi: ALSC: Improve locking in a few places","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2fe7a98a0de2373183cd6eb1e284251edce92734","submitter":{"id":42,"url":"https://patchwork.libcamera.org/api/1.1/people/42/?format=json","name":"David Plowman","email":"david.plowman@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9093/mbox/","series":[{"id":1169,"url":"https://patchwork.libcamera.org/api/1.1/series/1169/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1169","date":"2020-07-31T14:07:57","name":"Raspberry Pi ALSC improvements","version":2,"mbox":"https://patchwork.libcamera.org/series/1169/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9093/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9093/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 54472BD86F\n\tfor ;\n\tFri, 31 Jul 2020 14:08:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 61F2A61DCF;\n\tFri, 31 Jul 2020 16:08:11 +0200 (CEST)","from mail-wm1-x342.google.com (mail-wm1-x342.google.com\n\t[IPv6:2a00:1450:4864:20::342])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 434B061DCF\n\tfor ;\n\tFri, 31 Jul 2020 16:08:09 +0200 (CEST)","by mail-wm1-x342.google.com with SMTP id q76so8148412wme.4\n\tfor ;\n\tFri, 31 Jul 2020 07:08:09 -0700 (PDT)","from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tg126sm12815084wme.16.2020.07.31.07.08.07\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 31 Jul 2020 07:08:08 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"Lx111BbB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=ZqilBsLzMKmrddlWmS1RYYMDXLW+mCOVb0l3nhtKIeU=;\n\tb=Lx111BbBtf8qRqWTyaeYITHlokM6pliFuuNahUllbWTZov0iS0geMNURRpAm/q4qMD\n\tbcunSkfooCmEjrvVjou7md/fja5XsBZiWcQExLuog4BkpBijB3dVG/KSVS7moLIABn5i\n\tfnnRzhANKrW/8Slr4vYZHDf0XF7ZuRUcZmw/evOmUUhPd/jcXYuEuJwe1oDV44Tw+vK5\n\tMo75cn3Ii1Ds9GxHlc2D3jcRQJB7+DtJfU6Mtg2rBIryIhTW86hA8+i82vq271jtTsIN\n\tBSDgWHZNj5IB15uLcCBhKVgNFCbpD1gtCOgQQqjmcxE7Dpg27L0v9XkYuBn+kyX/8aCI\n\trlow==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=ZqilBsLzMKmrddlWmS1RYYMDXLW+mCOVb0l3nhtKIeU=;\n\tb=cVFabsKgxBP9jEU43XagAgXjZ0lzCRU1lEs1toVX8+7lhY4PbXQQIaX6phmGmUIEDW\n\tMbW0/x9t+PC5NG2IlCX1Z/ms/s2+AsUMfy4oPzFRSsWO6tnIMGq2ugdVoBAYA3YeWKI2\n\tooHnBqaKAuAIK/3gmdfxH+PZ/NvASayQAuTnHOv3SiHTJ0coBXgf8L5DGTxHgsXtVxX+\n\t6U60yF3qt/DUIszqu/qO6eEQgZIS0BUxXwich/QRWqUUCCk2n7qWos9QyLa5NVhxM5s5\n\t/PzErJE3dLQo5xbZZuxmTjVZO1syqlJvM8EGYbjTvXlaryCt3yiCeKbbetxqlKNvI1A8\n\tDDxQ==","X-Gm-Message-State":"AOAM533h4q4oQhfBZ/9SLUYxjmwdThWv7r0TQSQz2YSdEOIzwWzrt0Bw\n\tc5LNhDuhfcl+ZFlWzSpFkJb9dDk9j6yb+A==","X-Google-Smtp-Source":"ABdhPJz0mkurWtkGrIjMfJI/a6zySzd+mb5ktcPSRgr8Cgju9qsILQPLI8K2HnBNbLTxIxm6VV0Tlw==","X-Received":"by 2002:a7b:c40a:: with SMTP id\n\tk10mr3849860wmi.127.1596204488580; \n\tFri, 31 Jul 2020 07:08:08 -0700 (PDT)","From":"David Plowman ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 31 Jul 2020 15:07:59 +0100","Message-Id":"<20200731140801.13253-3-david.plowman@raspberrypi.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200731140801.13253-1-david.plowman@raspberrypi.com>","References":"<20200731140801.13253-1-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/4] libcamera: ipa: raspberrypi: ALSC:\n\tImprove locking in a few places","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Fix up a few locations where we call notify_one() with the lock\nheld. In particular, restartAsync does not need to be called with the\nlock held for its entire duration.\n\nSigned-off-by: David Plowman \n---\n src/ipa/raspberrypi/controller/rpi/alsc.cpp | 10 ++++++----\n 1 file changed, 6 insertions(+), 4 deletions(-)","diff":"diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\nindex 76e2f04..12359dc 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n@@ -32,8 +32,8 @@ Alsc::~Alsc()\n \t{\n \t\tstd::lock_guard lock(mutex_);\n \t\tasync_abort_ = true;\n-\t\tasync_signal_.notify_one();\n \t}\n+\tasync_signal_.notify_one();\n \tasync_thread_.join();\n }\n \n@@ -268,8 +268,11 @@ void Alsc::restartAsync(StatisticsPtr &stats, Metadata *image_metadata)\n \tframe_phase_ = 0;\n \t// copy the camera mode so it won't change during the calculations\n \tasync_camera_mode_ = camera_mode_;\n-\tasync_start_ = true;\n \tasync_started_ = true;\n+\t{\n+\t\tstd::lock_guard lock(mutex_);\n+\t\tasync_start_ = true;\n+\t}\n \tasync_signal_.notify_one();\n }\n \n@@ -315,7 +318,6 @@ void Alsc::Process(StatisticsPtr &stats, Metadata *image_metadata)\n \tRPI_LOG(\"Alsc: frame_phase \" << frame_phase_);\n \tif (frame_phase_ >= (int)config_.frame_period ||\n \t frame_count2_ < (int)config_.startup_frames) {\n-\t\tstd::unique_lock lock(mutex_);\n \t\tif (async_started_ == false) {\n \t\t\tRPI_LOG(\"ALSC thread starting\");\n \t\t\trestartAsync(stats, image_metadata);\n@@ -339,8 +341,8 @@ void Alsc::asyncFunc()\n \t\t{\n \t\t\tstd::lock_guard lock(mutex_);\n \t\t\tasync_finished_ = true;\n-\t\t\tsync_signal_.notify_one();\n \t\t}\n+\t\tsync_signal_.notify_one();\n \t}\n }\n \n","prefixes":["libcamera-devel","v2","2/4"]}