58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From 83f7052a8d8c9641809611d9485256d8ed843c31 Mon Sep 17 00:00:00 2001
|
|
From: caixiaomeng 00662745 <caixiaomeng2@huawei.com>
|
|
Date: Wed, 6 Mar 2024 14:21:41 +0800
|
|
Subject: [PATCH] huawei-fix-rasdaemon-print-loading-config-logs-multi
|
|
|
|
---
|
|
rasdaemon.c | 12 +++++++-----
|
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/rasdaemon.c b/rasdaemon.c
|
|
index 0437662..7ece6c1 100644
|
|
--- a/rasdaemon.c
|
|
+++ b/rasdaemon.c
|
|
@@ -47,7 +47,7 @@ struct arguments {
|
|
int foreground;
|
|
};
|
|
|
|
-static void parse_disabled_choices() {
|
|
+static void parse_disabled_choices(int enable_ras) {
|
|
char disabled_tracepoints_str[MAX_DISABLED_TRACEPOINTS_STR_LENGTH];
|
|
const char* sep = ";";
|
|
char* tracepoint_str;
|
|
@@ -57,16 +57,18 @@ static void parse_disabled_choices() {
|
|
}
|
|
|
|
if (strlen(config_disabled_tracepoints) >= MAX_DISABLED_TRACEPOINTS_STR_LENGTH) {
|
|
- log(ALL, LOG_WARNING, "Failed to read disabled events config string, length exceeds %d characters.\n", MAX_DISABLED_TRACEPOINTS_STR_LENGTH);
|
|
+ if (enable_ras) {
|
|
+ log(ALL, LOG_WARNING, "Failed to read disabled events config string, length exceeds %d characters.\n", MAX_DISABLED_TRACEPOINTS_STR_LENGTH);
|
|
+ }
|
|
return;
|
|
}
|
|
strcpy(disabled_tracepoints_str, config_disabled_tracepoints);
|
|
-
|
|
+
|
|
tracepoint_str = strtok(disabled_tracepoints_str, sep);
|
|
int index = 0;
|
|
|
|
while(tracepoint_str != NULL && index < MAX_DISABLED_TRACEPOINTS_NUM) {
|
|
- if (strlen(tracepoint_str) >= MAX_TRACEPOINTS_STR_LENGTH) {
|
|
+ if (enable_ras && strlen(tracepoint_str) >= MAX_TRACEPOINTS_STR_LENGTH) {
|
|
log(ALL, LOG_WARNING, "Failed to read disabled events config item %s string, length exceeds %d characters, skipped.\n", tracepoint_str, MAX_TRACEPOINTS_STR_LENGTH);
|
|
}
|
|
else {
|
|
@@ -136,7 +138,7 @@ int main(int argc, char *argv[])
|
|
return -1;
|
|
}
|
|
|
|
- parse_disabled_choices();
|
|
+ parse_disabled_choices(args.enable_ras);
|
|
|
|
if (args.enable_ras) {
|
|
int enable;
|
|
--
|
|
2.33.0
|
|
|
|
|