Patch Detail
Show a patch.
GET /api/patches/20442/?format=api
{ "id": 20442, "url": "https://patchwork.libcamera.org/api/patches/20442/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20442/", "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": "<20240627145156.1094127-7-mzamazal@redhat.com>", "date": "2024-06-27T14:51:43", "name": "[v3,06/14] config: Look up log color configuration in configuration file", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ae8c293a13d2db828bc1013e1c9fae242f0f4e24", "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/20442/mbox/", "series": [ { "id": 4426, "url": "https://patchwork.libcamera.org/api/series/4426/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4426", "date": "2024-06-27T14:51:37", "name": "Add global configuration file", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4426/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20442/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20442/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 21358BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 27 Jun 2024 14:52:50 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A244C62E25;\n\tThu, 27 Jun 2024 16:52:49 +0200 (CEST)", "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 3449662C9D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 27 Jun 2024 16:52:47 +0200 (CEST)", "from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-244-4tN5TxgPNgW0DLT1l8MBxA-1;\n\tThu, 27 Jun 2024 10:52:43 -0400", "from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.15])\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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id A91A71954233; Thu, 27 Jun 2024 14:52:41 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.47])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 07F4719773D9; Thu, 27 Jun 2024 14:52:39 +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=\"dG2t93/+\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1719499965;\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=w5RW8Do9fs2CBR+4offTqLnYppKeO8Hn9gRIrnEQQKo=;\n\tb=dG2t93/++iVUEnMvWwMwofxKGRt+qBMY11iqW6fgzoPhN6w/eQHgLuSHbRCX24TY2qIp0i\n\tRResyvfWvtqOuPcfqRW5cGybS665jOOW2vRtE8o//d1jMn/qAY2KBTkQqMSR4Khp9gNE7K\n\tsP2ozrfP9Fz+mzSjhq6Aee+Cla8eYp4=", "X-MC-Unique": "4tN5TxgPNgW0DLT1l8MBxA-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v3 06/14] config: Look up log color configuration in\n\tconfiguration file", "Date": "Thu, 27 Jun 2024 16:51:43 +0200", "Message-ID": "<20240627145156.1094127-7-mzamazal@redhat.com>", "In-Reply-To": "<20240627145156.1094127-1-mzamazal@redhat.com>", "References": "<20240627145156.1094127-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.15", "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 | 27 ++++++++++++++++++-\n src/libcamera/base/global_configuration.cpp | 20 ++++----------\n src/libcamera/base/log.cpp | 2 ++\n 3 files changed, 33 insertions(+), 16 deletions(-)", "diff": "diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\nindex 7c39c969..42c60417 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,30 @@ public:\n \n \tstatic unsigned int version();\n \tstatic Configuration configuration();\n-\tstatic std::optional<std::string> option(const std::string &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 std::string &confPath)\n+\t{\n+\t\tYamlObject *c = &const_cast<YamlObject &>(configuration());\n+\t\tfor (auto part : utils::details::StringSplitter(confPath, \".\"))\n+\t\t\tif (c->contains(part))\n+\t\t\t\tc = &const_cast<YamlObject &>((*c)[part]);\n+\t\t\telse\n+\t\t\t\treturn std::optional<T>();\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 std::string &confPath);\n \ndiff --git a/src/libcamera/base/global_configuration.cpp b/src/libcamera/base/global_configuration.cpp\nindex b64bf28e..f18ca28b 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,23 +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 std::string &confPath)\n-{\n-\tYamlObject *c = &const_cast<YamlObject &>(configuration());\n-\tfor (auto part : utils::details::StringSplitter(confPath, \".\"))\n-\t\tif (c->contains(part))\n-\t\t\tc = &const_cast<YamlObject &>((*c)[part]);\n-\t\telse\n-\t\t\treturn std::optional<std::string>();\n-\treturn c->get<std::string>();\n-}\n \n /**\n * \\brief Return value of the configuration option from a file or environment\n@@ -188,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 07352f6c..d522e895 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": [ "v3", "06/14" ] }