[{"id":13188,"web_url":"https://patchwork.libcamera.org/comment/13188/","msgid":"<20201013184300.GI11939@pendragon.ideasonboard.com>","date":"2020-10-13T18:43:00","subject":"Re: [libcamera-devel] [PATCH 03/10] libcamera: thread: Prevent\n\taliasing of signal name","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Tue, Oct 13, 2020 at 04:12:34PM +0100, Kieran Bingham wrote:\n> The Thread::wait() function creates a boolean flag 'finished' which\n> aliases the internal member signal of the same name.\n> \n> Rename the boolean flag to prevent confusion and aliasing of the signal.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> ---\n>  src/libcamera/thread.cpp | 8 ++++----\n>  1 file changed, 4 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp\n> index 87006a9c4301..b5d7103ad341 100644\n> --- a/src/libcamera/thread.cpp\n> +++ b/src/libcamera/thread.cpp\n> @@ -374,7 +374,7 @@ void Thread::exit(int code)\n>   */\n>  bool Thread::wait(utils::duration duration)\n>  {\n> -\tbool finished = true;\n> +\tbool hasFinished = true;\n>  \n>  \t{\n>  \t\tMutexLocker locker(data_->mutex_);\n> @@ -382,14 +382,14 @@ bool Thread::wait(utils::duration duration)\n>  \t\tif (duration == utils::duration::max())\n>  \t\t\tdata_->cv_.wait(locker, [&]() { return !data_->running_; });\n>  \t\telse\n> -\t\t\tfinished = data_->cv_.wait_for(locker, duration,\n> -\t\t\t\t\t\t       [&]() { return !data_->running_; });\n> +\t\t\thasFinished = data_->cv_.wait_for(locker, duration,\n> +\t\t\t\t\t\t\t  [&]() { return !data_->running_; });\n>  \t}\n>  \n>  \tif (thread_.joinable())\n>  \t\tthread_.join();\n>  \n> -\treturn finished;\n> +\treturn hasFinished;\n>  }\n>  \n>  /**","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 1F8C6BEEDF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 13 Oct 2020 18:43:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DE33260E83;\n\tTue, 13 Oct 2020 20:43:47 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1C4A860589\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 13 Oct 2020 20:43:47 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AE2ECB87;\n\tTue, 13 Oct 2020 20:43:46 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"B9qNrO7x\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602614626;\n\tbh=QCMzN/2+hKj6/OBXh9t+lSlUCHNeEEsGF1EXzVyA45E=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=B9qNrO7xAia2m2n6aP5zfgqy9/wROdRY1C+9hH+xww5E8HQB8wkHfytp9kDZAmREk\n\t36WNYoGJQrpCDWE5a9oH4Bqa4F/UnI4TYtel0NMtQrwzepeCRyG1ayLivQ+atPFWLS\n\tZ7RVrZDnciddpyVsxXhRJTBWyQyTndnIRhqa7/t8=","Date":"Tue, 13 Oct 2020 21:43:00 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<20201013184300.GI11939@pendragon.ideasonboard.com>","References":"<20201013151241.3557005-1-kieran.bingham@ideasonboard.com>\n\t<20201013151241.3557005-4-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201013151241.3557005-4-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 03/10] libcamera: thread: Prevent\n\taliasing of signal name","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>","Cc":"libcamera devel <libcamera-devel@lists.libcamera.org>","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>"}},{"id":13197,"web_url":"https://patchwork.libcamera.org/comment/13197/","msgid":"<20201014122313.qqc7jue4zlycatxe@oden.dyn.berto.se>","date":"2020-10-14T12:23:13","subject":"Re: [libcamera-devel] [PATCH 03/10] libcamera: thread: Prevent\n\taliasing of signal name","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Kieran,\n\nOn 2020-10-13 16:12:34 +0100, Kieran Bingham wrote:\n> The Thread::wait() function creates a boolean flag 'finished' which\n> aliases the internal member signal of the same name.\n> \n> Rename the boolean flag to prevent confusion and aliasing of the signal.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n> ---\n>  src/libcamera/thread.cpp | 8 ++++----\n>  1 file changed, 4 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp\n> index 87006a9c4301..b5d7103ad341 100644\n> --- a/src/libcamera/thread.cpp\n> +++ b/src/libcamera/thread.cpp\n> @@ -374,7 +374,7 @@ void Thread::exit(int code)\n>   */\n>  bool Thread::wait(utils::duration duration)\n>  {\n> -\tbool finished = true;\n> +\tbool hasFinished = true;\n>  \n>  \t{\n>  \t\tMutexLocker locker(data_->mutex_);\n> @@ -382,14 +382,14 @@ bool Thread::wait(utils::duration duration)\n>  \t\tif (duration == utils::duration::max())\n>  \t\t\tdata_->cv_.wait(locker, [&]() { return !data_->running_; });\n>  \t\telse\n> -\t\t\tfinished = data_->cv_.wait_for(locker, duration,\n> -\t\t\t\t\t\t       [&]() { return !data_->running_; });\n> +\t\t\thasFinished = data_->cv_.wait_for(locker, duration,\n> +\t\t\t\t\t\t\t  [&]() { return !data_->running_; });\n>  \t}\n>  \n>  \tif (thread_.joinable())\n>  \t\tthread_.join();\n>  \n> -\treturn finished;\n> +\treturn hasFinished;\n>  }\n>  \n>  /**\n> -- \n> 2.25.1\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 B2F4DBEEE0\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 14 Oct 2020 12:23:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 71B6C60355;\n\tWed, 14 Oct 2020 14:23:17 +0200 (CEST)","from mail-lj1-x243.google.com (mail-lj1-x243.google.com\n\t[IPv6:2a00:1450:4864:20::243])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8A65A60354\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 14 Oct 2020 14:23:15 +0200 (CEST)","by mail-lj1-x243.google.com with SMTP id c21so3000419ljj.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 14 Oct 2020 05:23:15 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tq25sm1084121lfa.234.2020.10.14.05.23.14\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 14 Oct 2020 05:23:14 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"o/Tdl7Dv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=1eXnn7aU21bYJDhpnNiIqd3/7OwL316N4yCZNw8ixUs=;\n\tb=o/Tdl7DvZpkaYqPLdL1M05kPuPACGlmiYPta+02rvbHTpQZ7CEyW2mbktzLefILAec\n\tFLqZbSPjcTExRXYc2O6Z8n/iTRuQ0znBNZ7nsQ3ThzANCSYjmPTxxZQ/9UT0Sh2HkuBt\n\tbMcfJ5tTgivT6MuKMa/wll/dSJqjg0kiLSZ0X3hd6n0fvEwIAkrU8zgvVq6WMzI32csp\n\taQBbrPivxYhrXwKhCjmMhkHvsTQENMcWXmoKg8FURVDdSEzC2fLS0dAGkqvuIZPpsFGK\n\t5AJRlbpwxR5lyhVtE1HPNIgKUVS7xRUdivP4RPJNsVisDBLzuwgaPEQmnZdzqQLDvG0n\n\teOfA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=1eXnn7aU21bYJDhpnNiIqd3/7OwL316N4yCZNw8ixUs=;\n\tb=GzKFsCjc1mHyquvh2GVhNXj5ai8lvfLLJcEmEX+Fs76A/pH2lHRJW68My2L+9Ri3YP\n\tzvmYzu1coHDUlyRbESQhOMzX4GJpKLkqqQG3X7CVUsLUyNb7P+77EkwT/prZRYKGt2+6\n\tt82/OAhitvigmLfFx64BJXhAEZqIQamUZ0GxBdbazGVJqWWrP6SALOZN/3yL23c5558F\n\tylwnsbkpG4IsBEz0Z/mHplIeRNuaK6cq1E6GQkvpnZ286K0lebSEAX8h+++2ZdDrOOQM\n\ti8bhD4KxpkW+JWtUPsCRIJqtw6NP4whRsKm5P6tHMWLua5uQktfLWLPqdG2Nu1aCyLAu\n\t2/Jg==","X-Gm-Message-State":"AOAM533dkfhij19095ecV1i8iPZwTQyDehtE00JSCik8EA/ETohqpC8b\n\tw7HJccHrv+GciMK/Px5brP4gcMhTil0fUg==","X-Google-Smtp-Source":"ABdhPJxHYgwgzTYez/xSXHNwfTvDw1Yj37GOHm13bQC1M1oBMHkRDsWFQDd2AHUAaOB8fDbFfLEMmw==","X-Received":"by 2002:a2e:7217:: with SMTP id n23mr1766142ljc.43.1602678195006;\n\tWed, 14 Oct 2020 05:23:15 -0700 (PDT)","Date":"Wed, 14 Oct 2020 14:23:13 +0200","From":"Niklas =?utf-8?q?S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<20201014122313.qqc7jue4zlycatxe@oden.dyn.berto.se>","References":"<20201013151241.3557005-1-kieran.bingham@ideasonboard.com>\n\t<20201013151241.3557005-4-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201013151241.3557005-4-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 03/10] libcamera: thread: Prevent\n\taliasing of signal name","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>","Cc":"libcamera devel <libcamera-devel@lists.libcamera.org>","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]