eal: rename state values in rte_lcore_state
PATCH v4 1/1 eal: rename state values in rte_lcore_state
C language does not really treat enum's as first class symbols. The values in an enum live in a global namespace. That means if DPDK defines "RUNNING" it can't be used by another enum in an application using DPDK.
To solve this add a prefix "RTE_LCORE_" to the enum values, and make them grammatically consistent.
Also, simplify the inline thread_is_running() which is copied in softnic and ip_pipeline.
---
v4 - rebase (after lcore changes),fix FreeBSD typo
drivers/event/octeontx/ssovf_evdev_selftest.c | 2 +- drivers/event/sw/sw_evdev_selftest.c | 4 ++-- drivers/net/softnic/rte_eth_softnic_thread.c | 5 +---- examples/bond/main.c | 4 ++-- examples/ip_pipeline/thread.c | 5 +---- examples/l2fwd-keepalive/main.c | 2 +- lib/librte_eal/common/eal_common_launch.c | 12 ++++++------ lib/librte_eal/common/include/rte_launch.h | 6 +++--- lib/librte_eal/common/rte_service.c | 2 +- lib/librte_eal/freebsd/eal/eal.c | 2 +- lib/librte_eal/freebsd/eal/eal_thread.c | 6 +++--- lib/librte_eal/linux/eal/eal.c | 2 +- lib/librte_eal/linux/eal/eal_thread.c | 8 ++++---- 13 files changed, 27 insertions(+), 33 deletions(-)
drivers/event/octeontx/ssovf_evdev_selftest.c +1 -1
@@ -577,7 +577,7 @@ wait_workers_to_join(int lcore, const rte_atomic32_t *count)RTE_SET_USED (count); print_cycles = cycles =rte_get_timer_cycles (); -while (rte_eal_get_lcore_state (lcore) !=FINISHED ) { +while (rte_eal_get_lcore_state (lcore) !=RTE_LCORE_FINISHED ) {uint64_t new_cycles =rte_get_timer_cycles ();if (new_cycles - print_cycles >rte_get_timer_hz ()) {
drivers/event/sw/sw_evdev_selftest.c +2 -2
@@ -3116,8 +3116,8 @@ worker_loopback(struct test *t, uint8_t disable_implicit_release)rte_eal_remote_launch (worker_loopback_worker_fn, t, w_lcore); print_cycles = cycles =rte_get_timer_cycles (); -while (rte_eal_get_lcore_state (p_lcore) !=FINISHED || -rte_eal_get_lcore_state (w_lcore) !=FINISHED ) { +while (rte_eal_get_lcore_state (p_lcore) !=RTE_LCORE_FINISHED || +rte_eal_get_lcore_state (w_lcore) !=RTE_LCORE_FINISHED ) {rte_service_run_iter_on_app_lcore (t->service_id,1 );
drivers/net/softnic/rte_eth_softnic_thread.c +1 -4
@@ -113,10 +113,7 @@ thread_is_valid(struct pmd_internals *softnic, uint32_t thread_id)static inline int thread_is_running (uint32_t thread_id) { -enum rte_lcore_state_t thread_state; - - thread_state =rte_eal_get_lcore_state (thread_id); -return (thread_state ==RUNNING )?1 :0 ; +return rte_eal_get_lcore_state (thread_id) ==RTE_LCORE_RUNNING ; } static int32_t
examples/bond/main.c +2 -2
@@ -533,7 +533,7 @@ static void cmd_start_parsed(__attribute__((unused)) void *parsed_result,rte_spinlock_trylock (&global_flag_stru_p->lock);if (global_flag_stru_p->LcoreMainIsRunning ==0 ) {if (rte_eal_get_lcore_state (global_flag_stru_p->LcoreMainCore) - !=WAIT ) { + !=RTE_LCORE_WAITING ) {rte_spinlock_unlock (&global_flag_stru_p->lock);return ; }
@@ -801,7 +801,7 @@ main(int argc, char *argv[])/* check state of lcores */ RTE_LCORE_FOREACH_SLAVE (slave_core_id) { -if (rte_eal_get_lcore_state (slave_core_id) !=WAIT ) +if (rte_eal_get_lcore_state (slave_core_id) !=RTE_LCORE_WAITING )return -EBUSY ; }
examples/ip_pipeline/thread.c +1 -4
@@ -158,10 +158,7 @@ thread_init(void)static inline int thread_is_running (uint32_t thread_id) { -enum rte_lcore_state_t thread_state; - - thread_state =rte_eal_get_lcore_state (thread_id); -return (thread_state ==RUNNING ) ?1 :0 ; +return rte_eal_get_lcore_state (thread_id) ==RTE_LCORE_RUNNING ; }/**
examples/l2fwd-keepalive/main.c +1 -1
@@ -502,7 +502,7 @@ dead_core(__rte_unused void *ptr_data, const int id_core)if (terminate_signal_received)return ;printf ("Dead core %i - restarting..\n" , id_core); -if (rte_eal_get_lcore_state (id_core) ==FINISHED ) { +if (rte_eal_get_lcore_state (id_core) ==RTE_LCORE_FINISHED ) {rte_eal_wait_lcore (id_core);rte_eal_remote_launch (l2fwd_launch_one_lcore,NULL , id_core); }else {
lib/librte_eal/common/eal_common_launch.c +6 -6
@@ -21,17 +21,17 @@int rte_eal_wait_lcore (unsigned slave_id) { -if (lcore_config[slave_id].state ==WAIT ) +if (lcore_config[slave_id].state ==RTE_LCORE_WAITING )return 0 ; -while (lcore_config[slave_id].state !=WAIT && - lcore_config[slave_id].state !=FINISHED ) +while (lcore_config[slave_id].state !=RTE_LCORE_WAITING && + lcore_config[slave_id].state !=RTE_LCORE_FINISHED )rte_pause ();rte_rmb ();/* we are in finished state, go to wait state */ - lcore_config[slave_id].state =WAIT ; + lcore_config[slave_id].state =RTE_LCORE_WAITING ;return lcore_config[slave_id].ret; }
@@ -49,7 +49,7 @@ rte_eal_mp_remote_launch(int (*f)(void *), void *arg,/* check state of lcores */ RTE_LCORE_FOREACH_SLAVE (lcore_id) { -if (lcore_config[lcore_id].state !=WAIT ) +if (lcore_config[lcore_id].state !=RTE_LCORE_WAITING )return -EBUSY ; }
@@ -60,7 +60,7 @@ rte_eal_mp_remote_launch(int (*f)(void *), void *arg,if (call_master ==CALL_MASTER ) { lcore_config[master].ret =f (arg); - lcore_config[master].state =FINISHED ; + lcore_config[master].state =RTE_LCORE_FINISHED ; }return 0 ;
lib/librte_eal/common/include/rte_launch.h +3 -3
@@ -19,9 +19,9 @@ extern "C" {* State of an lcore. */ enum rte_lcore_state_t { -WAIT ,/**< waiting a new command */ -RUNNING ,/**< executing command */ -FINISHED ,/**< command executed */ +RTE_LCORE_WAITING ,/**< waiting a new command */ +RTE_LCORE_RUNNING ,/**< executing command */ +RTE_LCORE_FINISHED ,/**< command executed */ };/**
lib/librte_eal/common/rte_service.c +1 -1
@@ -450,7 +450,7 @@ rte_service_runner_func(void *arg)rte_smp_rmb (); } - lcore_config[lcore].state =WAIT ; + lcore_config[lcore].state =RTE_LCORE_WAITING ;return 0 ; }
lib/librte_eal/freebsd/eal/eal.c +1 -1
@@ -784,7 +784,7 @@ rte_eal_init(int argc, char **argv)if (pipe (lcore_config[i].pipe_slave2master) <0 )rte_panic ("Cannot create pipe\n" ); - lcore_config[i].state =WAIT ; + lcore_config[i].state =RTE_LCORE_WAITING ;/* create a thread for each lcore */ ret = pthread_create(&lcore_config[i].thread_id, NULL,
lib/librte_eal/freebsd/eal/eal_thread.c +3 -3
@@ -41,7 +41,7 @@ rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)int m2s = lcore_config[slave_id].pipe_master2slave[1 ];int s2m = lcore_config[slave_id].pipe_slave2master[0 ]; -if (lcore_config[slave_id].state !=WAIT ) +if (lcore_config[slave_id].state !=RTE_LCORE_WAITING )return -EBUSY ; lcore_config[slave_id].f = f;
@@ -136,7 +136,7 @@ eal_thread_loop(__attribute__((unused)) void *arg)if (n <=0 )rte_panic ("cannot read on configuration pipe\n" ); - lcore_config[lcore_id].state =RUNNING ; + lcore_config[lcore_id].state =RTE_LCORE_RUNNING ;/* send ack */ n =0 ;
@@ -153,7 +153,7 @@ eal_thread_loop(__attribute__((unused)) void *arg) ret = lcore_config[lcore_id].f (fct_arg); lcore_config[lcore_id].ret = ret;rte_wmb (); - lcore_config[lcore_id].state =FINISHED ; + lcore_config[lcore_id].state =RTE_LCORE_FINISHED ; }/* never reached */
lib/librte_eal/linux/eal/eal.c +1 -1
@@ -1158,7 +1158,7 @@ rte_eal_init(int argc, char **argv)if (pipe (lcore_config[i].pipe_slave2master) <0 )rte_panic ("Cannot create pipe\n" ); - lcore_config[i].state =WAIT ; + lcore_config[i].state =RTE_LCORE_WAITING ;/* create a thread for each lcore */ ret = pthread_create(&lcore_config[i].thread_id, NULL,
lib/librte_eal/linux/eal/eal_thread.c +4 -4
@@ -41,7 +41,7 @@ rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)int m2s = lcore_config[slave_id].pipe_master2slave[1 ];int s2m = lcore_config[slave_id].pipe_slave2master[0 ]; -if (lcore_config[slave_id].state !=WAIT ) +if (lcore_config[slave_id].state !=RTE_LCORE_WAITING )return -EBUSY ; lcore_config[slave_id].f = f;
@@ -136,7 +136,7 @@ eal_thread_loop(__attribute__((unused)) void *arg)if (n <=0 )rte_panic ("cannot read on configuration pipe\n" ); - lcore_config[lcore_id].state =RUNNING ; + lcore_config[lcore_id].state =RTE_LCORE_RUNNING ;/* send ack */ n =0 ;
@@ -158,9 +158,9 @@ eal_thread_loop(__attribute__((unused)) void *arg)* state, because the application will not lcore_wait() for it. */ if (lcore_config[lcore_id].core_role ==ROLE_SERVICE ) - lcore_config[lcore_id].state =WAIT ; + lcore_config[lcore_id].state =RTE_LCORE_WAITING ;else - lcore_config[lcore_id].state =FINISHED ; + lcore_config[lcore_id].state =RTE_LCORE_FINISHED ; }/* never reached */
Signature · 1 line
2.20.1
Quoted 8 lines · Stephen Hemminger
C language does not really treat enum's as first class symbols. The values in an enum live in a global namespace. That means if DPDK defines "RUNNING" it can't be used by another enum in an application using DPDK.
To solve this add a prefix "
RTE_LCORE_" to the enum values, and make them grammatically consistent.
Quoted 8 lines
Also, simplify the inline
thread_is_running()which is copied in softnic andip_pipeline.Signed-off-by Stephen Hemminger <[email protected]>---
v4 - rebase (after lcore changes),fix FreeBSD typo
Did an extra pass, you missed the windows eal and the api descriptions:
https://github.com/david-marchand/dpdk/commit/0084114455a82f90b783bdf1659a4af6f76c89f2
My only objection to this patch is that we are breaking a public API by removing those enums.
We need to maintain those and send a deprecation notice for their future removal.
Signature · 1 line
David Marchand