Patch Detail
Show a patch.
GET /api/patches/26540/?format=api
{ "id": 26540, "url": "https://patchwork.libcamera.org/api/patches/26540/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26540/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20260423230059.3180987-19-laurent.pinchart@ideasonboard.com>", "date": "2026-04-23T23:00:40", "name": "[v3,18/37] libcamera: value_node: Support adding nested children in one operation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "97ae8ab7616b0b1be26cdd0b5c0e731c26a7d616", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/26540/mbox/", "series": [ { "id": 5883, "url": "https://patchwork.libcamera.org/api/series/5883/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5883", "date": "2026-04-23T23:00:22", "name": "libcamera: Global configuration file improvements", "version": 3, "mbox": "https://patchwork.libcamera.org/series/5883/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/26540/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26540/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 C652EBDCB5\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 23 Apr 2026 23:01:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7A3D162FA6;\n\tFri, 24 Apr 2026 01:01:42 +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 AE09562FA0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 Apr 2026 01:01:26 +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 ESMTPSA id 3D88E9A6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 Apr 2026 00:59:47 +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=\"DqByOHhE\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1776985187;\n\tbh=PidSzAhxtWhuPeaj3OS2O7D4o3JT1bQ8YjDp+WSXyqM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=DqByOHhEXCdc+k4isSF7ip9DpCobCeb3R/7rqrCuAFeEJ8GF8lIDhCjacQU3dAzIU\n\tMZ3VCL5lsieQUVfIsNO67bmydCXDgTIh7kPblI70QsZbGh/pxymoPnUXooJLtJONF+\n\tm903eCRE4hj06bwS6ONqxd2odWmBKmkzOIMVKvZM=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH v3 18/37] libcamera: value_node: Support adding nested\n\tchildren in one operation", "Date": "Fri, 24 Apr 2026 02:00:40 +0300", "Message-ID": "<20260423230059.3180987-19-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260423230059.3180987-1-laurent.pinchart@ideasonboard.com>", "References": "<20260423230059.3180987-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": "<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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <laurent.pinchart@ideasonboard.com>\n---\nChanges since v2:\n\n- Do not move child if node->add() fails\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 | 58 +++++++++++++++++++++++++\n 2 files changed, 61 insertions(+)", "diff": "diff --git a/include/libcamera/internal/value_node.h b/include/libcamera/internal/value_node.h\nindex da68a74c5e14..578413199df1 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 <initializer_list>\n #include <iterator>\n #include <map>\n #include <memory>\n@@ -239,6 +240,8 @@ public:\n \n \tValueNode *add(std::unique_ptr<ValueNode> &&child);\n \tValueNode *add(std::string key, std::unique_ptr<ValueNode> &&child);\n+\tValueNode *add(std::initializer_list<std::string_view> path,\n+\t\t std::unique_ptr<ValueNode> &&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 fbf9ac470359..3b4041b7bbf0 100644\n--- a/src/libcamera/value_node.cpp\n+++ b/src/libcamera/value_node.cpp\n@@ -13,6 +13,8 @@\n #include <string>\n #include <vector>\n \n+#include <libcamera/base/log.h>\n+#include <libcamera/base/span.h>\n #include <libcamera/base/utils.h>\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,58 @@ ValueNode *ValueNode::add(std::string key, std::unique_ptr<ValueNode> &&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<std::string_view> path,\n+\t\t\t std::unique_ptr<ValueNode> &&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<ValueNode> obj;\n+\n+\t\t\tif (i < path.size() - 1)\n+\t\t\t\tobj = std::make_unique<ValueNode>();\n+\n+\t\t\tnode = node->add(std::string{ name },\n+\t\t\t\t\t obj ? std::move(obj) : std::move(child));\n+\t\t\tif (!node) {\n+\t\t\t\tSpan<const std::string_view> 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": [ "v3", "18/37" ] }