[{"id":33780,"web_url":"https://patchwork.libcamera.org/comment/33780/","msgid":"<174343890959.3394313.1612126416167315582@ping.linuxembedded.co.uk>","date":"2025-03-31T16:35:09","subject":"Re: [PATCH 2/9] utils: gen-debug-controls: Fix handling of controls\n\tthat appear multiple times","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Stefan Klug (2025-03-31 15:43:41)\n> Allow usage of the same debug control in multiple places as long as all\n> instances are of the same type and size.\n> \n> Signed-off-by: Stefan Klug \n\nAcked-by: Kieran Bingham \n\n> ---\n> utils/gen-debug-controls.py | 11 ++++++++++-\n> 1 file changed, 10 insertions(+), 1 deletion(-)\n> \n> diff --git a/utils/gen-debug-controls.py b/utils/gen-debug-controls.py\n> index 53c8fa70d76d..ff22b986475e 100755\n> --- a/utils/gen-debug-controls.py\n> +++ b/utils/gen-debug-controls.py\n> @@ -96,6 +96,7 @@ def main(argv):\n> controls_map[k] = v\n> \n> obsolete_names = list(controls_map.keys())\n> + found_by_name = {}\n> \n> for m in matches:\n> if not m.type:\n> @@ -111,6 +112,12 @@ def main(argv):\n> if m.size is not None:\n> desc['size'] = m.size\n> \n> + c = found_by_name.setdefault(m.name, m)\n> + if c.type != m.type or c.size != m.size:\n> + logger.error(\n> + f\"Found multiple entries for control '{m.name}' with differing type or size\")\n> + return 1\n> +\n> if m.name in controls_map:\n> # Can't use == for modified check because of the special yaml dicts.\n> update_needed = False\n> @@ -127,7 +134,9 @@ def main(argv):\n> controls_map[m.name].clear()\n> controls_map[m.name].update(desc)\n> \n> - obsolete_names.remove(m.name)\n> + # Don't try to remove more than once in case control was found in multiple files.\n> + if m.name in obsolete_names:\n> + obsolete_names.remove(m.name)\n> else:\n> logger.info(f\"Add control '{m.name}'\")\n> insert_before = len(controls)\n> -- \n> 2.43.0\n>","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 45E9FC323E\n\tfor ;\n\tMon, 31 Mar 2025 16:35:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 01A5B68989;\n\tMon, 31 Mar 2025 18:35:14 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 79E3868981\n\tfor ;\n\tMon, 31 Mar 2025 18:35:12 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F0016725;\n\tMon, 31 Mar 2025 18:33:20 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Hjxdl/rx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1743438801;\n\tbh=4IR59yLTPPW/0G3q48HbGyCCA3Gxi/0SsK+iZ8vmVT0=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=Hjxdl/rx+eN727u4llvwgzV3F0EMOCNtGrNoO2L7aAOjs+ZkV9xti8n8QPhoeb0xm\n\tkYw3/fHprXj3Zvm97ghZzisem8Yy5r1lTuuhJtSB6Ktolmo7jI/2VR9vDBbPemiA88\n\tpTsklDfQGs9WZ+wNdY9VRX00nbkwxSBr2SaN+owI=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20250331144352.736700-3-stefan.klug@ideasonboard.com>","References":"<20250331144352.736700-1-stefan.klug@ideasonboard.com>\n\t<20250331144352.736700-3-stefan.klug@ideasonboard.com>","Subject":"Re: [PATCH 2/9] utils: gen-debug-controls: Fix handling of controls\n\tthat appear multiple times","From":"Kieran Bingham ","Cc":"Stefan Klug ","To":"Stefan Klug ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 31 Mar 2025 17:35:09 +0100","Message-ID":"<174343890959.3394313.1612126416167315582@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]