{"id":26464,"url":"https://patchwork.libcamera.org/api/patches/26464/?format=json","web_url":"https://patchwork.libcamera.org/patch/26464/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20260407153427.1825999-25-laurent.pinchart@ideasonboard.com>","date":"2026-04-07T15:34:09","name":"[v2,24/42] libcamera: value_node: Support adding nested children in one operation","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b8903ecdc8c90d918d2c0fb697c531274b7e4fdd","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26464/mbox/","series":[{"id":5873,"url":"https://patchwork.libcamera.org/api/series/5873/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5873","date":"2026-04-07T15:33:45","name":"libcamera: Global configuration file improvements","version":2,"mbox":"https://patchwork.libcamera.org/series/5873/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26464/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26464/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 0C3E0C3308\n\tfor ;\n\tTue, 7 Apr 2026 15:35:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 89D5362E08;\n\tTue, 7 Apr 2026 17:35:06 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A2C062DF3\n\tfor ;\n\tTue, 7 Apr 2026 17:35:01 +0200 (CEST)","from killaraus.ideasonboard.com\n\t(2001-14ba-703d-e500--2a1.rev.dnainternet.fi\n\t[IPv6:2001:14ba:703d:e500::2a1])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 035F6596\n\tfor ;\n\tTue, 7 Apr 2026 17:33:33 +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=\"ddkpBlOm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1775576014;\n\tbh=ZfrG/3RBI3gpHlOmZR8SJEw+XMb4nfySn9LrELgFp7s=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=ddkpBlOm0fPwc7tEs6DVGeUEZZLlNSCunkHxGQ92W8q4PpGo1XGuklrHhzlyrp7Th\n\tHMpD0u7QZ2NWJKomOfdIzu/EPVnWt4/FzXMmn1sDubI+CChPHe5ilvj6XCuLIF1lEt\n\toGUSxpE2he8ZVYzwY8RhqBFVCIEAcA/Pr3fh+O1U=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 24/42] libcamera: value_node: Support adding nested\n\tchildren in one operation","Date":"Tue, 7 Apr 2026 18:34:09 +0300","Message-ID":"<20260407153427.1825999-25-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260407153427.1825999-1-laurent.pinchart@ideasonboard.com>","References":"<20260407153427.1825999-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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\" "},"content":"The GlobalConfiguration class will need to add nested children to a\nValueNode. Add a new overload to the add() function for this purpose.\n\nSigned-off-by: Laurent Pinchart \n---\nChanges since v1:\n\n- Documentation improvements\n- Replace NULL with nullptr\n- Don't move child node if add fails\n---\n include/libcamera/internal/value_node.h | 3 ++\n src/libcamera/value_node.cpp | 59 +++++++++++++++++++++++++\n 2 files changed, 62 insertions(+)","diff":"diff --git a/include/libcamera/internal/value_node.h b/include/libcamera/internal/value_node.h\nindex d237b2c1e0d6..be28c2b73832 100644\n--- a/include/libcamera/internal/value_node.h\n+++ b/include/libcamera/internal/value_node.h\n@@ -8,6 +8,7 @@\n \n #pragma once\n \n+#include \n #include \n #include \n #include \n@@ -239,6 +240,8 @@ public:\n \n \tValueNode *add(std::unique_ptr &&child);\n \tValueNode *add(std::string key, std::unique_ptr &&child);\n+\tValueNode *add(std::initializer_list path,\n+\t\t std::unique_ptr &&child);\n \n private:\n \tLIBCAMERA_DISABLE_COPY_AND_MOVE(ValueNode)\ndiff --git a/src/libcamera/value_node.cpp b/src/libcamera/value_node.cpp\nindex 4c3a5e4d381d..e8db7ef3c37f 100644\n--- a/src/libcamera/value_node.cpp\n+++ b/src/libcamera/value_node.cpp\n@@ -13,6 +13,8 @@\n #include \n #include \n \n+#include \n+#include \n #include \n \n /**\n@@ -22,6 +24,8 @@\n \n namespace libcamera {\n \n+LOG_DEFINE_CATEGORY(ValueNode)\n+\n namespace {\n \n /* Empty static ValueNode as a safe result for invalid operations */\n@@ -539,4 +543,59 @@ ValueNode *ValueNode::add(std::string key, std::unique_ptr &&child)\n \treturn list_.emplace_back(it->first, std::move(child)).value.get();\n }\n \n+/**\n+ * \\brief Add a child node at the given path\n+ * \\param[in] path The path\n+ * \\param[in] child The child node\n+ *\n+ * Add the \\a child node at the given \\a path starting at this node. Missing\n+ * nodes are created along the path. Nodes along the path must be empty (in\n+ * which case they are converted to the Type::Dictionary type), be a dictionary,\n+ * or be missing. Otherwise, the function returns a nullptr and the \\a child is\n+ * not modified.\n+ *\n+ * Path elements are unique in the context of a parent node. If a child with the\n+ * same \\a key already exist at the end of the path, the function returns a\n+ * nullptr and the \\a child is not modified.\n+ *\n+ * \\note Any node added along the \\a path will remain even if this function\n+ * returns a failure.\n+ *\n+ * \\return A pointer to the \\a child node if successfully added, nullptr\n+ * otherwise\n+ */\n+ValueNode *ValueNode::add(std::initializer_list path,\n+\t\t\t std::unique_ptr &&child)\n+{\n+\tif (!path.size())\n+\t\treturn nullptr;\n+\n+\tValueNode *node = this;\n+\n+\tfor (const auto [i, name] : utils::enumerate(path)) {\n+\t\tauto iter = node->dictionary_.find(name);\n+\t\tif (iter == node->dictionary_.end()) {\n+\t\t\tstd::unique_ptr obj;\n+\n+\t\t\tif (i < path.size() - 1)\n+\t\t\t\tobj = std::make_unique();\n+\t\t\telse\n+\t\t\t\tobj = std::move(child);\n+\n+\t\t\tnode = node->add(std::string{ name }, std::move(obj));\n+\t\t\tif (!node) {\n+\t\t\t\tSpan pathName{ std::data(path), i + 1 };\n+\t\t\t\tLOG(ValueNode, Error)\n+\t\t\t\t\t<< \"Failed to populate '\"\n+\t\t\t\t\t<< utils::join(pathName, \"/\") << \"'\";\n+\t\t\t\treturn nullptr;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tnode = iter->second;\n+\t\t}\n+\t}\n+\n+\treturn node;\n+}\n+\n } /* namespace libcamera */\n","prefixes":["v2","24/42"]}