From: Pawel Zak Date: Thu, 5 Nov 2020 16:39:04 +0000 (+0100) Subject: New input plugin for RAS (Reliability, Availability and Serviceability) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3772%2Fhead;p=thirdparty%2Fcollectd.git New input plugin for RAS (Reliability, Availability and Serviceability) --- diff --git a/src/ras.c b/src/ras.c index bb81ac802..49f524f1f 100644 --- a/src/ras.c +++ b/src/ras.c @@ -145,7 +145,7 @@ static void ras_submit(const char *dev, const char *type, const char *type_inst, unsigned long long value) { value_list_t vl = VALUE_LIST_INIT; - vl.values = &(value_t) {.counter = value}; + vl.values = &(value_t){.counter = value}; vl.values_len = 1; sstrncpy(vl.plugin, RAS_PLUGIN, sizeof(vl.plugin)); sstrncpy(vl.plugin_instance, dev, sizeof(vl.plugin_instance)); @@ -193,7 +193,7 @@ static void classify_entries(int cpu, char *error_msg, char *mcistatus_msg) { if (strstr(error_msg, "SMM Handler Code Access Violation")) { safe_incremented_counter( &ras_metrics_server.per_CPU[cpu] - .ras_smm_handler_code_access_violation_errors); + .ras_smm_handler_code_access_violation_errors); safe_incremented_counter( &ras_metrics_server.per_CPU[cpu].ras_processor_base_errors); } @@ -210,7 +210,7 @@ static void classify_entries(int cpu, char *error_msg, char *mcistatus_msg) { if (strstr(error_msg, "Memory read error")) { if (strstr(mcistatus_msg, "Uncorrected_error")) { safe_incremented_counter(&ras_metrics_server.per_CPU[cpu] - .ras_memory_read_uncorrectable_errors); + .ras_memory_read_uncorrectable_errors); } else { if (strstr(mcistatus_msg, "Corrected_error")) { safe_incremented_counter( @@ -221,7 +221,7 @@ static void classify_entries(int cpu, char *error_msg, char *mcistatus_msg) { if (strstr(error_msg, "Memory write error")) { if (strstr(mcistatus_msg, "Uncorrected_error")) { safe_incremented_counter(&ras_metrics_server.per_CPU[cpu] - .ras_memory_write_uncorrectable_errors); + .ras_memory_write_uncorrectable_errors); } else { if (strstr(mcistatus_msg, "Corrected_error")) { safe_incremented_counter( @@ -385,7 +385,7 @@ static int ras_init(void) { } nprocs = get_nprocs_conf(); - ras_metrics_server.per_CPU = (struct ras_metrics_per_CPU *) calloc( + ras_metrics_server.per_CPU = (struct ras_metrics_per_CPU *)calloc( nprocs, sizeof(struct ras_metrics_per_CPU)); if (ras_metrics_server.per_CPU == NULL) { ERROR("Fail allocated memory"); diff --git a/src/ras_test.c b/src/ras_test.c index c3e219a42..7737f6a9f 100644 --- a/src/ras_test.c +++ b/src/ras_test.c @@ -39,7 +39,7 @@ void clear_ras_metrics_server() { ras_metrics_server.ras_cache_l2_errors = 0; ras_metrics_server.ras_upi_errors = 0; - ras_metrics_server.per_CPU = (struct ras_metrics_per_CPU *) calloc( + ras_metrics_server.per_CPU = (struct ras_metrics_per_CPU *)calloc( nprocs, sizeof(struct ras_metrics_per_CPU)); } @@ -225,22 +225,22 @@ DEF_TEST(convert_to_number) { EXPECT_EQ_INT(2147483647, number); switch (sizeof(long int)) { - case 4: - // convert over max long int - ret = convert_to_number("2147483648", &number); - EXPECT_EQ_INT(0, ret ? 1 : 0); - break; - - case 8: - // convert max long int - ret = convert_to_number("9223372036854775807", &number); - EXPECT_EQ_INT(1, ret ? 1 : 0); - EXPECT_EQ_INT(1, (number == LONG_MAX) ? 1 : 0); - // convert over max long int - ret = convert_to_number("9223372036854775809", &number); - EXPECT_EQ_INT(0, ret ? 1 : 0); - - break; + case 4: + // convert over max long int + ret = convert_to_number("2147483648", &number); + EXPECT_EQ_INT(0, ret ? 1 : 0); + break; + + case 8: + // convert max long int + ret = convert_to_number("9223372036854775807", &number); + EXPECT_EQ_INT(1, ret ? 1 : 0); + EXPECT_EQ_INT(1, (number == LONG_MAX) ? 1 : 0); + // convert over max long int + ret = convert_to_number("9223372036854775809", &number); + EXPECT_EQ_INT(0, ret ? 1 : 0); + + break; } // convert max int ret = convert_to_number("foo", &number);