Patch Detail
Show a patch.
GET /api/1.1/patches/21611/?format=api
{ "id": 21611, "url": "https://patchwork.libcamera.org/api/1.1/patches/21611/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21611/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20241014081738.772258-3-chenghaoyang@chromium.org>", "date": "2024-10-14T08:13:55", "name": "[2/2] libcamera: log: add logTargetCros for ChromeOS logs", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f00d9ab018fd11a8d46fbc35dffa5db9b243f90e", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21611/mbox/", "series": [ { "id": 4694, "url": "https://patchwork.libcamera.org/api/1.1/series/4694/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4694", "date": "2024-10-14T08:13:53", "name": "Add CrOS into enum LoggingTarget", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4694/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21611/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21611/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 BD0F8C32F4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 14 Oct 2024 08:17:53 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4598E65381;\n\tMon, 14 Oct 2024 10:17:53 +0200 (CEST)", "from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com\n\t[IPv6:2607:f8b0:4864:20::62f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0F9BF65369\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 14 Oct 2024 10:17:47 +0200 (CEST)", "by mail-pl1-x62f.google.com with SMTP id\n\td9443c01a7336-20cd76c513cso7498225ad.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 14 Oct 2024 01:17:47 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(199.211.81.34.bc.googleusercontent.com. [34.81.211.199])\n\tby smtp.gmail.com with ESMTPSA id\n\td9443c01a7336-20c8c21da63sm61077735ad.235.2024.10.14.01.17.44\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 14 Oct 2024 01:17:45 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"AB1Ac9aY\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1728893866; x=1729498666;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=BEoLH5qkWhGczJGaMIosPtFECkIOlbkqBdYQmdDgFGg=;\n\tb=AB1Ac9aYC/qOl4G0Ylgxrx7ULS1liXcjF5EuIb9kg3MyNYrsp/QVUoVsrac37J+aG4\n\tTgvuCcqEZZJRhbFsZZG5ew09OEuw7z7j2YzK/yfe6rK5+wyHIkH2qXRaO5tJ4XsOJLsM\n\tfb8eXOs3WzU0rEEuDzyzKuX7R6VnYrdOdsXDw=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1728893866; x=1729498666;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=BEoLH5qkWhGczJGaMIosPtFECkIOlbkqBdYQmdDgFGg=;\n\tb=F9gQSCs9iH139p1ddteaCZqWBqCiaPbROXnPNXBKsvq1nRmrFkwmrecn20IOFJQENO\n\tbPrD17asi3LyBLAxDNtmaKif7VSEe+kr9+3VGVTePkLHEnRSVB6S1e0TjkdEje3dADp+\n\tssB7JqdiYhMWKrBJOSTPOlMgOC4EY+O7K7mRaPUfd5WIeDN1ZD0949pc985IOv91uSwr\n\t/Iyj1A21kogJQFOqPQ3y9gIkozQDTApEhhqXQm4wFxH7zGyUPlo3WPExndFllKyrPB0K\n\t+6Rtih4+Gd9+OeiPxdRFtlM/2EfUpKUfUDGuViF0asY5wWa4azTqt0byxYZoKi0N3xWv\n\te9Kw==", "X-Gm-Message-State": "AOJu0Yx/RfzPa+TSZqWQRWgxMu7SpifRZTWEyCLenHLGxD4BszJQ9TgV\n\t/qEuGIoRBZGSEMufBZ1Dg0ScholbQZLKJg9kSdPqhrlgZ9m3kLmem7EoU64XZKGrew03dHxzVSs\n\t=", "X-Google-Smtp-Source": "AGHT+IGvhw4RZ7TEyfcOYAGpHnvC7CbuIXnEjTe/yQHhLOQfh6MktrVUablF2tg0BIbFlq7B+16c7Q==", "X-Received": "by 2002:a17:902:ea11:b0:20c:da98:d752 with SMTP id\n\td9443c01a7336-20cda98da15mr58335505ad.16.1728893865988; \n\tMon, 14 Oct 2024 01:17:45 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Han-Lin Chen <hanlinchen@chromium.org>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH 2/2] libcamera: log: add logTargetCros for ChromeOS logs", "Date": "Mon, 14 Oct 2024 08:13:55 +0000", "Message-ID": "<20241014081738.772258-3-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.47.0.rc1.288.g06298d1525-goog", "In-Reply-To": "<20241014081738.772258-1-chenghaoyang@chromium.org>", "References": "<20241014081738.772258-1-chenghaoyang@chromium.org>", "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": "From: Han-Lin Chen <hanlinchen@chromium.org>\n\nChromeOS logging requires that the logs export to both syslog and\nstd::cerr. Add a logTargetCros for the specific case.\n\nSigned-off-by: Han-Lin Chen <hanlinchen@chromium.org>\nCo-developed-by: Harvey Yang <chenghaoyang@chromium.org>\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n include/libcamera/logging.h | 1 +\n src/libcamera/base/log.cpp | 61 +++++++++++++++++++++++++++++++------\n 2 files changed, 53 insertions(+), 9 deletions(-)", "diff": "diff --git a/include/libcamera/logging.h b/include/libcamera/logging.h\nindex e1c6341ce..b88acf23b 100644\n--- a/include/libcamera/logging.h\n+++ b/include/libcamera/logging.h\n@@ -16,6 +16,7 @@ enum LoggingTarget {\n \tLoggingTargetSyslog,\n \tLoggingTargetFile,\n \tLoggingTargetStream,\n+\tLoggingTargetCros,\n };\n \n int logSetFile(const char *path, bool color = false);\ndiff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp\nindex 3a656b8f0..930e2329e 100644\n--- a/src/libcamera/base/log.cpp\n+++ b/src/libcamera/base/log.cpp\n@@ -107,6 +107,7 @@ class LogOutput\n public:\n \tLogOutput(const char *path, bool color);\n \tLogOutput(std::ostream *stream, bool color);\n+\tLogOutput(bool color);\n \tLogOutput();\n \t~LogOutput();\n \n@@ -144,6 +145,19 @@ LogOutput::LogOutput(std::ostream *stream, bool color)\n {\n }\n \n+/**\n+ * \\brief Construct a log output to both std:err and syslog\n+ * \\param[in] color True to output colored messages\n+ *\n+ * Currently this is only needed for CrOS. Therefore, the target is set to\n+ * `LoggingTargetCros`.\n+ */\n+LogOutput::LogOutput(bool color)\n+\t: stream_(&std::cerr), target_(LoggingTargetCros), color_(color)\n+{\n+\topenlog(\"libcamera\", LOG_PID, 0);\n+}\n+\n /**\n * \\brief Construct a log output to syslog\n */\n@@ -160,6 +174,7 @@ LogOutput::~LogOutput()\n \t\tdelete stream_;\n \t\tbreak;\n \tcase LoggingTargetSyslog:\n+\tcase LoggingTargetCros:\n \t\tcloselog();\n \t\tbreak;\n \tdefault:\n@@ -230,17 +245,26 @@ void LogOutput::write(const LogMessage &msg)\n \t\t\tseverityColor = kColorBrightWhite;\n \t}\n \n+\tbool toStream = false;\n+\tbool toSyslog = false;\n+\n \tswitch (target_) {\n \tcase LoggingTargetSyslog:\n-\t\tstr = std::string(log_severity_name(severity)) + \" \"\n-\t\t + msg.category().name() + \" \" + msg.fileInfo() + \" \";\n-\t\tif (!msg.prefix().empty())\n-\t\t\tstr += msg.prefix() + \": \";\n-\t\tstr += msg.msg();\n-\t\twriteSyslog(severity, str);\n+\t\ttoSyslog = true;\n \t\tbreak;\n \tcase LoggingTargetStream:\n \tcase LoggingTargetFile:\n+\t\ttoStream = true;\n+\t\tbreak;\n+\tcase LoggingTargetCros:\n+\t\ttoSyslog = true;\n+\t\ttoStream = true;\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\n+\tif (toStream) {\n \t\tstr = \"[\" + utils::time_point_to_string(msg.timestamp()) + \"] [\"\n \t\t + std::to_string(Thread::currentId()) + \"] \"\n \t\t + severityColor + log_severity_name(severity) + \" \"\n@@ -250,9 +274,15 @@ void LogOutput::write(const LogMessage &msg)\n \t\t\tstr += prefixColor + msg.prefix() + \": \";\n \t\tstr += resetColor + msg.msg();\n \t\twriteStream(str);\n-\t\tbreak;\n-\tdefault:\n-\t\tbreak;\n+\t}\n+\n+\tif (toSyslog) {\n+\t\tstr = std::string(log_severity_name(severity)) + \" \"\n+\t\t + msg.category().name() + \" \" + msg.fileInfo() + \" \";\n+\t\tif (!msg.prefix().empty())\n+\t\t\tstr += msg.prefix() + \": \";\n+\t\tstr += msg.msg();\n+\t\twriteSyslog(severity, str);\n \t}\n }\n \n@@ -270,6 +300,10 @@ void LogOutput::write(const std::string &str)\n \tcase LoggingTargetFile:\n \t\twriteStream(str);\n \t\tbreak;\n+\tcase LoggingTargetCros:\n+\t\twriteSyslog(LogDebug, str);\n+\t\twriteStream(str);\n+\t\tbreak;\n \tdefault:\n \t\tbreak;\n \t}\n@@ -549,6 +583,9 @@ int Logger::logSetTarget(enum LoggingTarget target)\n \tcase LoggingTargetNone:\n \t\tstd::atomic_store(&output_, std::shared_ptr<LogOutput>());\n \t\tbreak;\n+\tcase LoggingTargetCros:\n+\t\tstd::atomic_store(&output_, std::make_shared<LogOutput>(true));\n+\t\tbreak;\n \tdefault:\n \t\treturn -EINVAL;\n \t}\n@@ -586,6 +623,12 @@ void Logger::logSetLevel(const char *category, const char *level)\n */\n Logger::Logger()\n {\n+#if defined(OS_CHROMEOS)\n+\tlogSetTarget(LoggingTargetCros);\n+\tparseLogLevels();\n+\treturn;\n+#endif\n+\n \tbool color = !utils::secure_getenv(\"LIBCAMERA_LOG_NO_COLOR\");\n \tlogSetStream(&std::cerr, color);\n \n", "prefixes": [ "2/2" ] }