{"id":10178,"url":"https://patchwork.libcamera.org/api/1.1/patches/10178/?format=json","web_url":"https://patchwork.libcamera.org/patch/10178/","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":"<20201021154148.511505-2-kieran.bingham@ideasonboard.com>","date":"2020-10-21T15:41:34","name":"[libcamera-devel,v4,01/15] libcamera: thread: Prevent shadowing of signal name","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"90258bd9b6d3a00121e99239bc30ef0459f474f0","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10178/mbox/","series":[{"id":1401,"url":"https://patchwork.libcamera.org/api/1.1/series/1401/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1401","date":"2020-10-21T15:41:33","name":"Shadowed Variables","version":4,"mbox":"https://patchwork.libcamera.org/series/1401/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10178/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10178/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 C05C5BDB13\n\tfor ;\n\tWed, 21 Oct 2020 15:41:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7567560DF8;\n\tWed, 21 Oct 2020 17:41:55 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8F04660986\n\tfor ;\n\tWed, 21 Oct 2020 17:41:53 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 94BBAAEE;\n\tWed, 21 Oct 2020 17:41:52 +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=\"F33lSUez\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1603294913;\n\tbh=OtrTKmCaTvWBCtkRvw14X1FPLDeE3Sx+DMPQTrhPlqE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=F33lSUezrSzhCLr+/Dtrpg3Ly9YBYrq6bWKcYbVN36wF7nCJ2tp8G7erg7+3MpHqO\n\tFoY6Kmspb+6GiiahTg7SbM47Ul+SMTgULxhWtNkgjSaddSVydbZG3r1sQNeA224UAs\n\tmxmiQjPkThSYMmsBpFhC0nQ6zc7qHfeIl4HVKm2M=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Wed, 21 Oct 2020 16:41:34 +0100","Message-Id":"<20201021154148.511505-2-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20201021154148.511505-1-kieran.bingham@ideasonboard.com>","References":"<20201021154148.511505-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 01/15] libcamera: thread: Prevent\n\tshadowing of signal name","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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Thread::wait() function creates a boolean flag 'finished' which\nshadows the internal member signal of the same name.\n\nRename the boolean flag to prevent confusion and shadowing of the signal.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \n---\n src/libcamera/thread.cpp | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp\nindex 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","prefixes":["libcamera-devel","v4","01/15"]}