examples/vm_power: add thread for oob core monitor

Change the app to now require three cores, as the third core
will be used to run the oob montoring thread.

Signed-off-by: David Hunt <david.hunt@intel.com>
Acked-by: Radu Nicolau <radu.nicolau@intel.com>
This commit is contained in:
David Hunt 2018-07-13 15:22:58 +01:00 committed by Thomas Monjalon
parent 6453b9284b
commit d42b1300ad

View File

@ -29,6 +29,7 @@
#include "channel_monitor.h"
#include "power_manager.h"
#include "vm_power_cli.h"
#include "oob_monitor.h"
#include "parse.h"
#include <rte_pmd_ixgbe.h>
#include <rte_pmd_i40e.h>
@ -267,6 +268,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 +297,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");
@ -365,16 +380,23 @@ main(int argc, char **argv)
}
}
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 +405,17 @@ main(int argc, char **argv)
printf("Unable to initialize channel manager\n");
return -1;
}
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;
}