net: add rte prefix to ether structures

[dpdk.git] / examples / vm_power_manager / main.c

diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index 613a40a..f8cab11 100644 (file)
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -29,10 +29,17 @@
 #include "channel_monitor.h"
 #include "power_manager.h"
 #include "vm_power_cli.h"
+#include "oob_monitor.h"
 #include "parse.h"
+#ifdef RTE_LIBRTE_IXGBE_PMD
 #include <rte_pmd_ixgbe.h>
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
 #include <rte_pmd_i40e.h>
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
 #include <rte_pmd_bnxt.h>
+#endif
 
 #define RX_RING_SIZE 1024
 #define TX_RING_SIZE 1024
@@ -98,7 +105,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
                return retval;
 
        /* Display the port MAC address. */
-       struct ether_addr addr;
+       struct rte_ether_addr addr;
        rte_eth_macaddr_get(port, &addr);
        printf("Port %u MAC: %02" PRIx8 " %02" PRIx8 " %02" PRIx8
                           " %02" PRIx8 " %02" PRIx8 " %02" PRIx8 "\n",
@@ -140,16 +147,19 @@ parse_args(int argc, char **argv)
        int option_index;
        char *prgname = argv[0];
        struct core_info *ci;
+       float branch_ratio;
        static struct option lgopts[] = {
                { "mac-updating", no_argument, 0, 1},
                { "no-mac-updating", no_argument, 0, 0},
                { "core-list", optional_argument, 0, 'l'},
+               { "port-list", optional_argument, 0, 'p'},
+               { "branch-ratio", optional_argument, 0, 'b'},
                {NULL, 0, 0, 0}
        };
        argvopt = argv;
        ci = get_core_info();
 
-       while ((opt = getopt_long(argc, argvopt, "l:p:q:T:",
+       while ((opt = getopt_long(argc, argvopt, "l:p:q:T:b:",
                                  lgopts, &option_index)) != EOF) {
 
                switch (opt) {
@@ -171,6 +181,7 @@ parse_args(int argc, char **argv)
                        if (cnt < 0) {
                                printf("Invalid core-list - [%s]\n",
                                                optarg);
+                               free(oob_enable);
                                break;
                        }
                        for (i = 0; i < ci->core_count; i++) {
@@ -182,6 +193,18 @@ parse_args(int argc, char **argv)
                        }
                        free(oob_enable);
                        break;
+               case 'b':
+                       branch_ratio = 0.0;
+                       if (strlen(optarg))
+                               branch_ratio = atof(optarg);
+                       if (branch_ratio <= 0.0) {
+                               printf("invalid branch ratio specified\n");
+                               return -1;
+                       }
+                       ci->branch_ratio_threshold = branch_ratio;
+                       printf("***Setting branch ratio to %f\n",
+                                       branch_ratio);
+                       break;
                /* long options */
                case 0:
                        break;
@@ -267,6 +290,17 @@ run_monitor(__attribute__((unused)) void *arg)
        return 0;
 }
 
+static int
+run_core_monitor(__attribute__((unused)) void *arg)
+{
+       if (branch_monitor_init() < 0) {
+               printf("Unable to initialize core monitor\n");
+               return -1;
+       }
+       run_branch_monitor();
+       return 0;
+}
+
 static void
 sig_handler(int signo)
 {
@@ -285,12 +319,15 @@ main(int argc, char **argv)
        unsigned int nb_ports;
        struct rte_mempool *mbuf_pool;
        uint16_t portid;
+       struct core_info *ci;
 
 
        ret = core_info_init();
        if (ret < 0)
                rte_panic("Cannot allocate core info\n");
 
+       ci = get_core_info();
+
        ret = rte_eal_init(argc, argv);
        if (ret < 0)
                rte_panic("Cannot init EAL\n");
@@ -318,7 +355,7 @@ main(int argc, char **argv)
 
                /* Initialize ports. */
                RTE_ETH_FOREACH_DEV(portid) {
-                       struct ether_addr eth;
+                       struct rte_ether_addr eth;
                        int w, j;
                        int ret;
 
@@ -339,14 +376,21 @@ main(int argc, char **argv)
                        for (w = 0; w < MAX_VFS; w++) {
                                eth.addr_bytes[5] = w + 0xf0;
 
+                               ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_IXGBE_PMD
                                ret = rte_pmd_ixgbe_set_vf_mac_addr(portid,
                                                        w, &eth);
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
                                if (ret == -ENOTSUP)
                                        ret = rte_pmd_i40e_set_vf_mac_addr(
                                                        portid, w, &eth);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
                                if (ret == -ENOTSUP)
                                        ret = rte_pmd_bnxt_set_vf_mac_addr(
                                                        portid, w, &eth);
+#endif
 
                                switch (ret) {
                                case 0:
@@ -360,21 +404,27 @@ main(int argc, char **argv)
                                        break;
                                }
                                printf("\n");
-                               break;
                        }
                }
        }
 
+       check_all_ports_link_status(enabled_port_mask);
+
        lcore_id = rte_get_next_lcore(-1, 1, 0);
        if (lcore_id == RTE_MAX_LCORE) {
-               RTE_LOG(ERR, EAL, "A minimum of two cores are required to run "
+               RTE_LOG(ERR, EAL, "A minimum of three cores are required to run "
                                "application\n");
                return 0;
        }
-
-       check_all_ports_link_status(enabled_port_mask);
+       printf("Running channel monitor on lcore id %d\n", lcore_id);
        rte_eal_remote_launch(run_monitor, NULL, lcore_id);
 
+       lcore_id = rte_get_next_lcore(lcore_id, 1, 0);
+       if (lcore_id == RTE_MAX_LCORE) {
+               RTE_LOG(ERR, EAL, "A minimum of three cores are required to run "
+                               "application\n");
+               return 0;
+       }
        if (power_manager_init() < 0) {
                printf("Unable to initialize power manager\n");
                return -1;
@@ -383,8 +433,19 @@ main(int argc, char **argv)
                printf("Unable to initialize channel manager\n");
                return -1;
        }
+
+       add_host_channel();
+
+       printf("Running core monitor on lcore id %d\n", lcore_id);
+       rte_eal_remote_launch(run_core_monitor, NULL, lcore_id);
+
        run_cli(NULL);
 
+       branch_monitor_exit();
+
        rte_eal_mp_wait_lcore();
+
+       free(ci->cd);
+
        return 0;
 }