From a6407104f7355ea40017c1bb13ea3e46e3a75e7f Mon Sep 17 00:00:00 2001 From: Vincen Date: Wed, 31 Aug 2022 15:06:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?kmsg=E5=BC=80=E5=85=B3=E7=94=9F=E6=95=88=20?= =?UTF-8?q?https://gitee.com/openharmony/hiviewdfx=5Fhilog/issues/I5O5ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/hilogd/kmsg_parser.cpp | 2 +- services/hilogd/log_kmsg.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/hilogd/kmsg_parser.cpp b/services/hilogd/kmsg_parser.cpp index 1022ec6..eefe7c5 100644 --- a/services/hilogd/kmsg_parser.cpp +++ b/services/hilogd/kmsg_parser.cpp @@ -170,7 +170,7 @@ std::optional KmsgParser::ParseKmsg(const std::vector& km msg.len = msgLen; msg.tag_len = tagLen + 1; msg.type = LOG_KMSG; - msg.domain = 0xdfffffff; + msg.domain = 0xD002600; msg.level = KmsgLevelMap(mLevel); time_point logtime = BootTime() + microseconds{timestamp}; struct timespec logts = TimepointToTimespec(logtime); diff --git a/services/hilogd/log_kmsg.cpp b/services/hilogd/log_kmsg.cpp index 32fed47..d2b179f 100644 --- a/services/hilogd/log_kmsg.cpp +++ b/services/hilogd/log_kmsg.cpp @@ -14,6 +14,7 @@ */ #include "log_kmsg.h" +#include #include #include #include @@ -25,7 +26,6 @@ #include #include #include - #include #include #include @@ -41,7 +41,8 @@ ssize_t LogKmsg::LinuxReadOneKmsg(KmsgParser& parser) do { size = read(kmsgCtl, kmsgBuffer.data(), BUFSIZ - 1); } while (size < 0 && errno == EPIPE); - if (size > 0) { + bool kmsgEnable = IsKmsgSwitchOn(); + if (size > 0 && kmsgEnable) { std::optional msgWrap = parser.ParseKmsg(kmsgBuffer); if (msgWrap.has_value()) { size_t result = hilogBuffer.Insert(msgWrap->GetHilogMsg()); -- Gitee From 1a889a99d387b08e02980df79902b439c89d050b Mon Sep 17 00:00:00 2001 From: Vincen Date: Wed, 31 Aug 2022 15:11:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?kmsg=E5=BC=80=E5=85=B3=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/hilogd/.kmsg_parser.cpp.swp | Bin 0 -> 16384 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 services/hilogd/.kmsg_parser.cpp.swp diff --git a/services/hilogd/.kmsg_parser.cpp.swp b/services/hilogd/.kmsg_parser.cpp.swp new file mode 100644 index 0000000000000000000000000000000000000000..b05e7bed0b02c82f4f311b0ca9e6b1e8317fd599 GIT binary patch literal 16384 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 literal 0 HcmV?d00001 -- Gitee From b04bbfd4ddd6b07ae237d9da546f90dc31ab8395 Mon Sep 17 00:00:00 2001 From: Vincen Date: Wed, 31 Aug 2022 15:25:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/hilogd/.kmsg_parser.cpp.swp | Bin 16384 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 services/hilogd/.kmsg_parser.cpp.swp diff --git a/services/hilogd/.kmsg_parser.cpp.swp b/services/hilogd/.kmsg_parser.cpp.swp deleted file mode 100644 index b05e7bed0b02c82f4f311b0ca9e6b1e8317fd599..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 -- Gitee