Patch Detail
Show a patch.
GET /api/1.1/patches/9126/?format=api
{ "id": 9126, "url": "https://patchwork.libcamera.org/api/1.1/patches/9126/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9126/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200801080151.4282-3-david.plowman@raspberrypi.com>", "date": "2020-08-01T08:01:49", "name": "[libcamera-devel,v3,2/4] libcamera: ipa: raspberrypi: ALSC: Improve locking in a few places", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2fe7a98a0de2373183cd6eb1e284251edce92734", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/1.1/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9126/mbox/", "series": [ { "id": 1174, "url": "https://patchwork.libcamera.org/api/1.1/series/1174/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1174", "date": "2020-08-01T08:01:47", "name": "Raspberry Pi ALSC improvements", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1174/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9126/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9126/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 951FCBD878\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 1 Aug 2020 08:02:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6130261F44;\n\tSat, 1 Aug 2020 10:02:00 +0200 (CEST)", "from mail-wm1-x343.google.com (mail-wm1-x343.google.com\n\t[IPv6:2a00:1450:4864:20::343])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1CA3C61F34\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 1 Aug 2020 10:01:58 +0200 (CEST)", "by mail-wm1-x343.google.com with SMTP id k20so11099567wmi.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 01 Aug 2020 01:01:58 -0700 (PDT)", "from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tl67sm17385253wml.13.2020.08.01.01.01.56\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 01 Aug 2020 01:01:57 -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=\"WVw+3uUV\"; 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=6/gEh2ZY2aznNHMFS+s1Y6SPKqzLhNzjjy68vEp8MrE=;\n\tb=WVw+3uUVKutxQI+D+AsQL2kiIpKNMo5vJCoOMJVn1GlUxqnzjdCGNcRanIXcPBqVzd\n\tiYy7b7zP3Mi646Wc/WMALivG64r9M6OY1ryN6ssnafVUZcgz/Z+gfRdMQJjQcWZk9EBJ\n\tg7NYcqI4WS9eyJ09bnxf4pG6afLDvzASjJBxMEorHHtuncCQjNcBbuUZJSgkXcaiye7s\n\tuZTWi+CsD+dSKyLU/aKmRIMj8Ekyw7aUAvTGNmCQR+GSewkN4bj1uDLXhYz9XMN8SmHf\n\tkj6rq+AI7Cx4vO9TbdYkXIVVTgvSE2L/XFgNNhunNvmp90WbQbZycQ29pjYXXPavMAzK\n\tatcA==", "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=6/gEh2ZY2aznNHMFS+s1Y6SPKqzLhNzjjy68vEp8MrE=;\n\tb=IPRwhDU6ixN371aq9w9Y6gzv3+MVxx4fj2Aq7XDk86COTFUrX4E/6UTI3H4JSAjWjW\n\tHLdMGaoSQrW7kgC4Iz1M7zxLOTt9bfAAwdZlM2PqwGIEG7/KzXwba8zT7hx3MsAu9zbW\n\tHrfpZN4XszoNkrfC//L3V391IWHcrGiCb/+08CNopZ+mrzAd0WTCePDQUTJKgkz7Pyid\n\tyvbz/oTqFsszv/ZfDX9Ph8+rH3RWr+sFUYo10vP4fHCdD6/AHFJmaojmAniZQx9w3cYu\n\t6w6AnU+PkmlPXFFYwGS/0x/bEuqgRrX1iK55Z34cJ0RNmq2GuW0Jt6mi5nymRSTe4slr\n\toZPQ==", "X-Gm-Message-State": "AOAM5323pA+GT7/HjBrr1kwONNI+RGNS0eabAWt7unfdkbEOsbA7oynn\n\tpGQW1rdUXerHAvxiA9gxWrKTnHuDADCi8w==", "X-Google-Smtp-Source": "ABdhPJyao8QKPSeG6WvLL5I8zIGnj3zDeTLALzfn1XrqRn8R1s9icXl/SBMho2m2EA4BYwDmMTLNcA==", "X-Received": "by 2002:a1c:3285:: with SMTP id\n\ty127mr7127980wmy.104.1596268917523; \n\tSat, 01 Aug 2020 01:01:57 -0700 (PDT)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 1 Aug 2020 09:01:49 +0100", "Message-Id": "<20200801080151.4282-3-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200801080151.4282-1-david.plowman@raspberrypi.com>", "References": "<20200801080151.4282-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <david.plowman@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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<std::mutex> 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<std::mutex> 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<std::mutex> 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<std::mutex> 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", "v3", "2/4" ] }