app/procinfo: call EAL cleanup before exit

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

diff --git a/app/proc_info/main.c b/app/proc_info/main.c
index 8b753a2..2f53e3c 100644 (file)
--- a/app/proc_info/main.c
+++ b/app/proc_info/main.c
@@ -1,34 +1,5 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <stdio.h>
@@ -310,7 +281,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 +320,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 +382,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 +397,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 +444,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 +495,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 +512,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 +589,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);
@@ -687,5 +660,9 @@ main(int argc, char **argv)
        if (enable_metrics)
                metrics_display(RTE_METRICS_GLOBAL);
 
+       ret = rte_eal_cleanup();
+       if (ret)
+               printf("Error from rte_eal_cleanup(), %d\n", ret);
+
        return 0;
 }