Patch Detail
Show a patch.
GET /api/patches/19805/?format=api
{ "id": 19805, "url": "https://patchwork.libcamera.org/api/patches/19805/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19805/", "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": "<20240326112419.503286-5-mzamazal@redhat.com>", "date": "2024-03-26T11:24:07", "name": "[RFC,04/11] config: Add configuration retrieval helpers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b3a08d635d24be96607f127b3490a25f78ec8c96", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19805/mbox/", "series": [ { "id": 4241, "url": "https://patchwork.libcamera.org/api/series/4241/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4241", "date": "2024-03-26T11:24:03", "name": "Add global configuration file", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4241/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19805/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19805/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 83957BD160\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Mar 2024 11:26:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 35AD063334;\n\tTue, 26 Mar 2024 12:26:23 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D4D606331B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Mar 2024 12:26:20 +0100 (CET)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n\t[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-450-a4MzkkZcNGSRqN5bA13ezA-1; Tue, 26 Mar 2024 07:26:17 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mimecast-mx02.redhat.com (Postfix) with ESMTPS id ADA7784B162\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Mar 2024 11:26:17 +0000 (UTC)", "from nuthatch.brq.redhat.com (unknown [10.43.17.39])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 357CC3C22;\n\tTue, 26 Mar 2024 11:26:17 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"KTivKatl\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1711452379;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=NGQUOluWVd3l2g+6aByZJMX68em3b48gIEq3iXmWcts=;\n\tb=KTivKatlF6Qp23Unugv4KYTWH7sRCirWGdY2VPpjY8povV97ZiY8gi9XV5OIxFXJVCBoe2\n\t/cUdIuXzgrt2k5my4zm6qOwzhHZrmBdj7AGxcjjPH1EeLNPSLHSQm/Z2sGhE2p7ECmg1Hf\n\tZWTTLZwZSplx3+9AvXn/98ZX0nJ4I4E=", "X-MC-Unique": "a4MzkkZcNGSRqN5bA13ezA-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>", "Subject": "[RFC PATCH 04/11] config: Add configuration retrieval helpers", "Date": "Tue, 26 Mar 2024 12:24:07 +0100", "Message-ID": "<20240326112419.503286-5-mzamazal@redhat.com>", "In-Reply-To": "<20240326112419.503286-1-mzamazal@redhat.com>", "References": "<20240326112419.503286-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.1", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "Due to the restrictions of YamlObject class, ugly type casting dance is needed.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../libcamera/internal/global_configuration.h | 4 +++\n src/libcamera/base/global_configuration.cpp | 28 +++++++++++++++++++\n src/libcamera/base/log.cpp | 13 ++++-----\n 3 files changed, 37 insertions(+), 8 deletions(-)", "diff": "diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\nindex 0a4f3c02..41ac57cf 100644\n--- a/include/libcamera/internal/global_configuration.h\n+++ b/include/libcamera/internal/global_configuration.h\n@@ -8,6 +8,7 @@\n #pragma once\n \n #include <filesystem>\n+#include <optional>\n #include <vector>\n \n #include \"libcamera/internal/yaml_parser.h\"\n@@ -27,6 +28,9 @@ public:\n \n \tstatic unsigned int version();\n \tstatic Configuration configuration();\n+\tstatic std::optional<std::string> option(const char *const confPath);\n+\tstatic std::optional<std::string> envOption(const char *const envVariable,\n+\t\t\t\t\t\t const char *const confPath);\n \n private:\n \tstatic const std::vector<std::filesystem::path> globalConfigurationFiles;\ndiff --git a/src/libcamera/base/global_configuration.cpp b/src/libcamera/base/global_configuration.cpp\nindex e9c44057..b29f452b 100644\n--- a/src/libcamera/base/global_configuration.cpp\n+++ b/src/libcamera/base/global_configuration.cpp\n@@ -10,6 +10,7 @@\n #include <cstdint>\n #include <filesystem>\n #include <memory>\n+#include <string>\n #include <sys/types.h>\n \n #include <libcamera/base/file.h>\n@@ -118,6 +119,33 @@ GlobalConfiguration::Configuration GlobalConfiguration::get()\n \treturn (*instance().configuration_);\n }\n \n+/**\n+ * \\brief Retrieve string configuration identified by the given string\n+ * ...\n+ */\n+std::optional<std::string> GlobalConfiguration::option(\n+\tconst char *const confPath)\n+{\n+\tYamlObject *c = &const_cast<YamlObject &>(configuration());\n+\tfor (auto part : utils::details::StringSplitter(confPath, \".\"))\n+\t\tc = &const_cast<YamlObject &>((*c)[part]);\n+\treturn c->get<std::string>();\n+}\n+\n+/**\n+ * \\brief Retrieve string configuration from the given environment variable or configuration\n+ * ...\n+ */\n+std::optional<std::string> GlobalConfiguration::envOption(\n+\tconst char *const envVariable,\n+\tconst char *const confPath)\n+{\n+\tconst char *envValue = utils::secure_getenv(envVariable);\n+\tif (envValue)\n+\t\treturn std::optional{ std::string{ envValue } };\n+\treturn option(confPath);\n+}\n+\n /**\n * \\brief Return configuration version.\n *\ndiff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp\nindex 0564306d..7e58e4f9 100644\n--- a/src/libcamera/base/log.cpp\n+++ b/src/libcamera/base/log.cpp\n@@ -628,14 +628,11 @@ void Logger::parseLogFile()\n */\n void Logger::parseLogLevels()\n {\n-\tconst char *debug = utils::secure_getenv(\"LIBCAMERA_LOG_LEVELS\");\n-\tif (!debug) {\n-\t\tconst std::optional<std::string> confDebug =\n-\t\t\tGlobalConfiguration::configuration()[\"log\"][\"levels\"].get<std::string>();\n-\t\tif (!confDebug.has_value())\n-\t\t\treturn;\n-\t\tdebug = confDebug.value().c_str();\n-\t}\n+\tconst std::optional<std::string> confDebug =\n+\t\tGlobalConfiguration::envOption(\"LIBCAMERA_LOG_LEVELS\", \"log.levels\");\n+\tif (!confDebug.has_value())\n+\t\treturn;\n+\tconst char *debug = confDebug.value().c_str();\n \n \tfor (const char *pair = debug; *debug != '\\0'; pair = debug) {\n \t\tconst char *comma = strchrnul(debug, ',');\n", "prefixes": [ "RFC", "04/11" ] }