Patch Detail
Show a patch.
GET /api/patches/19922/?format=api
{ "id": 19922, "url": "https://patchwork.libcamera.org/api/patches/19922/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19922/", "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": "<20240423103034.364150-7-mzamazal@redhat.com>", "date": "2024-04-23T10:30:21", "name": "[v2,06/13] config: Look up log color configuration in configuration file", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "fb26ad711bcffe6e5a2bbe393a1d8f918646f196", "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/19922/mbox/", "series": [ { "id": 4267, "url": "https://patchwork.libcamera.org/api/series/4267/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4267", "date": "2024-04-23T10:30:15", "name": "Add global configuration file", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4267/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19922/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19922/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 AEDE7BE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Apr 2024 10:31:36 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F24546342C;\n\tTue, 23 Apr 2024 12:31:35 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C62D66340B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Apr 2024 12:31:27 +0200 (CEST)", "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-437-jUfMoCmXMsmdUPO2y2l7uQ-1; Tue, 23 Apr 2024 06:31:23 -0400", "from smtp.corp.redhat.com\n\t(int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7])\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 279F51049C97;\n\tTue, 23 Apr 2024 10:31:23 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.63])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 0579B1C0654E;\n\tTue, 23 Apr 2024 10:31:21 +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=\"C+fS3Bna\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1713868286;\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=81tpj4sF5aHADBZjfTHkU93z/3TXnfys6hJ6xl/sRAk=;\n\tb=C+fS3BnagWxBt1SLsJVlT7BQxkAsISohPH6qW78jpfkazvI1SlY2ci2Wk8aqrZY7kMtDWP\n\tBDQ/wIvkem7VHPJ7P1PhBETBv4wtSpf1lbL089RoSTH9mLZ49MGXYElEMHxm9/cYXVTHVU\n\trGAHDVKzYW3BxZLVqfKDQlTBfMGWUQw=", "X-MC-Unique": "jUfMoCmXMsmdUPO2y2l7uQ-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tNaushir Patuck <naush@raspberrypi.com>", "Subject": "[PATCH v2 06/13] config: Look up log color configuration in\n\tconfiguration file", "Date": "Tue, 23 Apr 2024 12:30:21 +0200", "Message-ID": "<20240423103034.364150-7-mzamazal@redhat.com>", "In-Reply-To": "<20240423103034.364150-1-mzamazal@redhat.com>", "References": "<20240423103034.364150-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.7", "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": "The configuration snippet:\n\n configuration:\n log:\n color: BOOL\n\nIn order to use the global configuration access helper for a boolean\nvalue, we must make a template from it. To make the template visible,\nwe must implement it in the header file, otherwise undefined reference\nerror would be reported when linking.\n\nWe don't implement envOption helper for boolean here, because we would\nhave to deal with a specific value interpretation in this particular\ncase.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../libcamera/internal/global_configuration.h | 24 ++++++++++++++++++-\n src/libcamera/base/global_configuration.cpp | 17 ++++---------\n src/libcamera/base/log.cpp | 2 ++\n 3 files changed, 30 insertions(+), 13 deletions(-)", "diff": "diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\nindex 6c49f8e7..a8a965dd 100644\n--- a/include/libcamera/internal/global_configuration.h\n+++ b/include/libcamera/internal/global_configuration.h\n@@ -11,6 +11,8 @@\n #include <optional>\n #include <vector>\n \n+#include <libcamera/base/utils.h>\n+\n #include \"libcamera/internal/yaml_parser.h\"\n \n namespace libcamera {\n@@ -22,7 +24,27 @@ public:\n \n \tstatic unsigned int version();\n \tstatic Configuration configuration();\n-\tstatic std::optional<std::string> option(const char *const confPath);\n+\n+\ttemplate<typename T,\n+\t\t std::enable_if_t<\n+\t\t\t std::is_same_v<bool, T> ||\n+\t\t\t std::is_same_v<double, T> ||\n+\t\t\t std::is_same_v<int8_t, T> ||\n+\t\t\t std::is_same_v<uint8_t, T> ||\n+\t\t\t std::is_same_v<int16_t, T> ||\n+\t\t\t std::is_same_v<uint16_t, T> ||\n+\t\t\t std::is_same_v<int32_t, T> ||\n+\t\t\t std::is_same_v<uint32_t, T> ||\n+\t\t\t std::is_same_v<std::string, T> ||\n+\t\t\t std::is_same_v<Size, T>> * = nullptr>\n+\tstatic std::optional<T> option(const char *const confPath)\n+\t{\n+\t\tYamlObject *c = &const_cast<YamlObject &>(configuration());\n+\t\tfor (auto part : utils::details::StringSplitter(confPath, \".\"))\n+\t\t\tc = &const_cast<YamlObject &>((*c)[part]);\n+\t\treturn c->get<T>();\n+\t}\n+\n \tstatic std::optional<std::string> envOption(const char *const envVariable,\n \t\t\t\t\t\t const char *const confPath);\n \ndiff --git a/src/libcamera/base/global_configuration.cpp b/src/libcamera/base/global_configuration.cpp\nindex f72ca352..03d0369b 100644\n--- a/src/libcamera/base/global_configuration.cpp\n+++ b/src/libcamera/base/global_configuration.cpp\n@@ -15,7 +15,6 @@\n \n #include <libcamera/base/file.h>\n #include <libcamera/base/log.h>\n-#include <libcamera/base/utils.h>\n \n #include \"libcamera/internal/yaml_parser.h\"\n \n@@ -146,20 +145,14 @@ GlobalConfiguration::Configuration GlobalConfiguration::get()\n }\n \n /**\n+ * \\fn static std::optional<T> GlobalConfiguration::option(const char *const confPath)\n * \\brief Return value of the configuration option identified by \\a confPath\n+ * \\tparam T The type of the retrieved configuration value\n * \\param[in] confPath Sequence of the YAML section names (excluding\n * `configuration') leading to the requested option separated by dots\n- * \\return A value if an item corresponding to \\a confPath exists in the\n- * configuration file, no value otherwise\n+ * \\return A value of type \\a T if an item corresponding to \\a confPath exists\n+ * in the configuration file and matches type \\a T, no value otherwise\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 Return value of the configuration option from a file or environment\n@@ -185,7 +178,7 @@ std::optional<std::string> GlobalConfiguration::envOption(\n \tconst char *envValue = utils::secure_getenv(envVariable);\n \tif (envValue)\n \t\treturn std::optional{ std::string{ envValue } };\n-\treturn option(confPath);\n+\treturn option<std::string>(confPath);\n }\n \n /**\ndiff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp\nindex ff6be340..d4421a36 100644\n--- a/src/libcamera/base/log.cpp\n+++ b/src/libcamera/base/log.cpp\n@@ -590,6 +590,8 @@ void Logger::logSetLevel(const char *category, const char *level)\n Logger::Logger()\n {\n \tbool color = !utils::secure_getenv(\"LIBCAMERA_LOG_NO_COLOR\");\n+\tif (color)\n+\t\tcolor = GlobalConfiguration::option<bool>(\"log.color\").value_or(true);\n \tlogSetStream(&std::cerr, color);\n \n \tparseLogFile();\n", "prefixes": [ "v2", "06/13" ] }