From 055c52583a2794da8ba1e85a48cce3832372b12f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 8 Nov 2017 14:15:11 +0000 Subject: New upstream version 17.11-rc3 Change-Id: I6a5baa40612fe0c20f30b5fa773a6cbbac63a685 Signed-off-by: Luca Boccassi --- app/proc_info/main.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'app/proc_info/main.c') diff --git a/app/proc_info/main.c b/app/proc_info/main.c index 8b753a2e..64fbbd0f 100644 --- a/app/proc_info/main.c +++ b/app/proc_info/main.c @@ -310,7 +310,7 @@ meminfo_display(void) } static void -nic_stats_display(uint8_t port_id) +nic_stats_display(uint16_t port_id) { struct rte_eth_stats stats; uint8_t i; @@ -349,7 +349,7 @@ nic_stats_display(uint8_t port_id) } static void -nic_stats_clear(uint8_t port_id) +nic_stats_clear(uint16_t port_id) { printf("\n Clearing NIC stats for port %d\n", port_id); rte_eth_stats_reset(port_id); @@ -411,7 +411,7 @@ static void collectd_resolve_cnt_type(char *cnt_type, size_t cnt_type_len, } static void -nic_xstats_by_name_display(uint8_t port_id, char *name) +nic_xstats_by_name_display(uint16_t port_id, char *name) { uint64_t id; @@ -426,7 +426,7 @@ nic_xstats_by_name_display(uint8_t port_id, char *name) } static void -nic_xstats_by_ids_display(uint8_t port_id, uint64_t *ids, int len) +nic_xstats_by_ids_display(uint16_t port_id, uint64_t *ids, int len) { struct rte_eth_xstat_name *xstats_names; uint64_t *values; @@ -473,7 +473,7 @@ err: } static void -nic_xstats_display(uint8_t port_id) +nic_xstats_display(uint16_t port_id) { struct rte_eth_xstat_name *xstats_names; uint64_t *values; @@ -524,7 +524,9 @@ nic_xstats_display(uint8_t port_id) sprintf(buf, "PUTVAL %s/dpdkstat-port.%u/%s-%s N:%" PRIu64"\n", host_id, port_id, counter_type, xstats_names[i].name, values[i]); - write(stdout_fd, buf, strlen(buf)); + ret = write(stdout_fd, buf, strlen(buf)); + if (ret < 0) + goto err; } else { printf("%s: %"PRIu64"\n", xstats_names[i].name, values[i]); @@ -539,7 +541,7 @@ err: } static void -nic_xstats_clear(uint8_t port_id) +nic_xstats_clear(uint16_t port_id) { printf("\n Clearing NIC xstats for port %d\n", port_id); rte_eth_xstats_reset(port_id); @@ -616,7 +618,7 @@ main(int argc, char **argv) char n_flag[] = "-n4"; char mp_flag[] = "--proc-type=secondary"; char *argp[argc + 3]; - uint8_t nb_ports; + uint16_t nb_ports; /* preparse app arguments */ ret = proc_info_preparse_args(argc, argv); -- cgit 1.2.3-korg