From 075e86f1cacd5fb29f9d954e61792e623169bdca Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczerbik Date: Wed, 8 Feb 2017 14:28:09 +0000 Subject: [PATCH] dpdkstat: Fix metrics' types This patch fixes parsing of metrics' types. Some statistics, such as rx_q0errors, rx_q0bytes or rx_q0packet, don't contain suffix _errors, _bytes or _packets. This has caused them to use generic type 'derive', rather than more specific one, for instance 'if_rx_errors'. Additionally, some statistics contain string 'error', rather than 'errors'. Change-Id: I51dfa9c4d98346a654adbc4041b64ebd3897278c Signed-off-by: Przemyslaw Szczerbik --- src/dpdkstat.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/dpdkstat.c b/src/dpdkstat.c index d1383458..6d0aabf7 100644 --- a/src/dpdkstat.c +++ b/src/dpdkstat.c @@ -620,17 +620,17 @@ static void dpdk_submit_xstats(const char *dev_name, int count, if ((type_end != NULL) && (strncmp(counter_name, "rx_", strlen("rx_")) == 0)) { - if (strncmp(type_end, "_errors", strlen("_errors")) == 0) { + if (strstr(type_end, "bytes") != NULL) { + sstrncpy(vl.type, "if_rx_octets", sizeof(vl.type)); + } else if (strstr(type_end, "error") != NULL) { sstrncpy(vl.type, "if_rx_errors", sizeof(vl.type)); - } else if (strncmp(type_end, "_dropped", strlen("_dropped")) == 0) { + } else if (strstr(type_end, "dropped") != NULL) { sstrncpy(vl.type, "if_rx_dropped", sizeof(vl.type)); - } else if (strncmp(type_end, "_bytes", strlen("_bytes")) == 0) { - sstrncpy(vl.type, "if_rx_octets", sizeof(vl.type)); - } else if (strncmp(type_end, "_packets", strlen("_packets")) == 0) { + } else if (strstr(type_end, "packets") != NULL) { sstrncpy(vl.type, "if_rx_packets", sizeof(vl.type)); - } else if (strncmp(type_end, "_placement", strlen("_placement")) == 0) { + } else if (strstr(type_end, "_placement") != NULL) { sstrncpy(vl.type, "if_rx_errors", sizeof(vl.type)); - } else if (strncmp(type_end, "_buff", strlen("_buff")) == 0) { + } else if (strstr(type_end, "_buff") != NULL) { sstrncpy(vl.type, "if_rx_errors", sizeof(vl.type)); } else { /* Does not fit obvious type: use a more generic one */ @@ -639,13 +639,13 @@ static void dpdk_submit_xstats(const char *dev_name, int count, } else if ((type_end != NULL) && (strncmp(counter_name, "tx_", strlen("tx_"))) == 0) { - if (strncmp(type_end, "_errors", strlen("_errors")) == 0) { + if (strstr(type_end, "bytes") != NULL) { + sstrncpy(vl.type, "if_tx_octets", sizeof(vl.type)); + } else if (strstr(type_end, "error") != NULL) { sstrncpy(vl.type, "if_tx_errors", sizeof(vl.type)); - } else if (strncmp(type_end, "_dropped", strlen("_dropped")) == 0) { + } else if (strstr(type_end, "dropped") != NULL) { sstrncpy(vl.type, "if_tx_dropped", sizeof(vl.type)); - } else if (strncmp(type_end, "_bytes", strlen("_bytes")) == 0) { - sstrncpy(vl.type, "if_tx_octets", sizeof(vl.type)); - } else if (strncmp(type_end, "_packets", strlen("_packets")) == 0) { + } else if (strstr(type_end, "packets") != NULL) { sstrncpy(vl.type, "if_tx_packets", sizeof(vl.type)); } else { /* Does not fit obvious type: use a more generic one */ @@ -654,16 +654,14 @@ static void dpdk_submit_xstats(const char *dev_name, int count, } else if ((type_end != NULL) && (strncmp(counter_name, "flow_", strlen("flow_"))) == 0) { - if (strncmp(type_end, "_filters", strlen("_filters")) == 0) { + if (strstr(type_end, "_filters") != NULL) { sstrncpy(vl.type, "operations", sizeof(vl.type)); - } else if (strncmp(type_end, "_errors", strlen("_errors")) == 0) { + } else if (strstr(type_end, "error") != NULL) sstrncpy(vl.type, "errors", sizeof(vl.type)); - } else if (strncmp(type_end, "_filters", strlen("_filters")) == 0) { - sstrncpy(vl.type, "filter_result", sizeof(vl.type)); - } + } else if ((type_end != NULL) && (strncmp(counter_name, "mac_", strlen("mac_"))) == 0) { - if (strncmp(type_end, "_errors", strlen("_errors")) == 0) { + if (strstr(type_end, "error") != NULL) { sstrncpy(vl.type, "errors", sizeof(vl.type)); } } else { -- 2.11.0