New upstream version 17.11.3

[deb_dpdk.git] / app / proc_info / main.c

diff --git a/app/proc_info/main.c b/app/proc_info/main.c
index d4f6a82..875d91e 100644 (file)
--- a/app/proc_info/main.c
+++ b/app/proc_info/main.c
@@ -53,7 +53,6 @@
 #include <rte_tailq.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
-#include <rte_debug.h>
 #include <rte_log.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
@@ -189,7 +188,7 @@ proc_info_preparse_args(int argc, char **argv)
                                proc_info_usage(prgname);
                                return -1;
                        }
-                       strncpy(host_id, argv[i+1], sizeof(host_id));
+                       snprintf(host_id, sizeof(host_id), "%s", argv[i+1]);
                }
        }
 
@@ -311,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;
@@ -350,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);
@@ -412,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;
 
@@ -427,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;
@@ -474,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;
@@ -525,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]);
@@ -540,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);
@@ -617,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);