From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 4F743A0471 for ; Wed, 19 Jun 2019 21:22:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D256B1D167; Wed, 19 Jun 2019 21:22:29 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id C43AD1D164 for ; Wed, 19 Jun 2019 21:22:28 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id v11so204490pgl.5 for ; Wed, 19 Jun 2019 12:22:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dXx9c4UZzMFzhujU8z0PP5bwfHyKxdv0m4DgX92L028=; b=yutegDHhAH9EH6gAktLSHpKiMxY/e+qMG+J/lYgu4uRyClyugWU84WxLMEOGgbV4Hc Fhxm9VunXTB+uJPUnIkK31GNXKCOtigUbTdBHzsfBW9o/a5vebXSxo/a26ZrwKl7n2oa dUtcM6L5cRlPCBPknD/2EIACeYTpEX5a40Zt+Xn00/twq+sAXpsD2clYdVN+UDn3zDyo +A0soAz+Uku0l8dALH/nd5V9eSQItNrWWnpj79QM8wzpc1y414qOZAx7dFZ04qL1TEPl LCCPReSCp3hLe0a+A+IlcQjLpDaQvA/MAXL7jOFwzy9ZOaohwUynKP1pqKm66yJmbOzO FfFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dXx9c4UZzMFzhujU8z0PP5bwfHyKxdv0m4DgX92L028=; b=n8ZaCwyWxAcSVcxk9Ojv58I4SG1bnTfZtkRTzDx/D3EXoGsQbI9gD9mqOJvFbmH2zN tgn+GEuC6wa77CmxAHYOIbywgAAwyYIbThFy9sMVCZ/jt5lg1UcltmLnptFA6vGyWQ8e eC5wlFofWR2/liIdMv7as0S2Rndi9dvwcaTIZiV2Bx2Bf+3EX1G6l9f1NieBJf3PFLzd OMYfU+cHbDftUOaaLUpG+p8cTeF5PP25vf3cK8+Ok+JbzhDz7yaOXDKXy5cJHi9eMCJL K+fW+9RRAXYmwKXLM3pD4E23q1AoHkR4Xyu7jdfBPN7/65II6iQz8Xi0I/Tdo5uQsb34 3dRA== X-Gm-Message-State: APjAAAW+cJagVTm9n33d3MbVT/qdoYtI2XVNJguVFdy/8hBqco2nZbRd wkjK028zIOuVYAEFLsd6lpRa7DxSYl8= X-Google-Smtp-Source: APXvYqxxSQQOJMJaWkNBuXkUau0EcK32w1FJNG4Hp/c6DdP8+OI4l3H4f9khXQyWwlNpOdqFTp67wA== X-Received: by 2002:a63:5065:: with SMTP id q37mr9166326pgl.32.1560972147513; Wed, 19 Jun 2019 12:22:27 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id t11sm16286209pgp.1.2019.06.19.12.22.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 12:22:26 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 19 Jun 2019 12:22:15 -0700 Message-Id: <20190619192215.25923-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4] eal: rename state values in rte_lcore_state X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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. Signed-off-by: Stephen Hemminger --- 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(-) diff --git a/drivers/event/octeontx/ssovf_evdev_selftest.c b/drivers/event/octeontx/ssovf_evdev_selftest.c index 239362fcf549..06370840ba36 100644 --- a/drivers/event/octeontx/ssovf_evdev_selftest.c +++ b/drivers/event/octeontx/ssovf_evdev_selftest.c @@ -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()) { diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c index 38c21fa0fa3d..af5724aa348a 100644 --- a/drivers/event/sw/sw_evdev_selftest.c +++ b/drivers/event/sw/sw_evdev_selftest.c @@ -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); diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c index d610b1617e77..ddff2b81c169 100644 --- a/drivers/net/softnic/rte_eth_softnic_thread.c +++ b/drivers/net/softnic/rte_eth_softnic_thread.c @@ -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 diff --git a/examples/bond/main.c b/examples/bond/main.c index 1c0df9d46797..42af07aa0227 100644 --- a/examples/bond/main.c +++ b/examples/bond/main.c @@ -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; } diff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c index 272fbbeed1bc..3a62a0aee8bc 100644 --- a/examples/ip_pipeline/thread.c +++ b/examples/ip_pipeline/thread.c @@ -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; } /** diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c index 9831a4323785..f56e35cba519 100644 --- a/examples/l2fwd-keepalive/main.c +++ b/examples/l2fwd-keepalive/main.c @@ -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 { diff --git a/lib/librte_eal/common/eal_common_launch.c b/lib/librte_eal/common/eal_common_launch.c index fe0ba3f0d617..74a3f1a28432 100644 --- a/lib/librte_eal/common/eal_common_launch.c +++ b/lib/librte_eal/common/eal_common_launch.c @@ -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; diff --git a/lib/librte_eal/common/include/rte_launch.h b/lib/librte_eal/common/include/rte_launch.h index 06a671752ace..286ca31c98ab 100644 --- a/lib/librte_eal/common/include/rte_launch.h +++ b/lib/librte_eal/common/include/rte_launch.h @@ -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 */ }; /** diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c index 5f75e5a53fbf..8dd7586027ff 100644 --- a/lib/librte_eal/common/rte_service.c +++ b/lib/librte_eal/common/rte_service.c @@ -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; } diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c index 4eaa53195e04..50a858c88405 100644 --- a/lib/librte_eal/freebsd/eal/eal.c +++ b/lib/librte_eal/freebsd/eal/eal.c @@ -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, diff --git a/lib/librte_eal/freebsd/eal/eal_thread.c b/lib/librte_eal/freebsd/eal/eal_thread.c index 309b5872666b..f25e84fa312b 100644 --- a/lib/librte_eal/freebsd/eal/eal_thread.c +++ b/lib/librte_eal/freebsd/eal/eal_thread.c @@ -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 */ diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c index 3e1d6eb6a1f3..92d7d652b905 100644 --- a/lib/librte_eal/linux/eal/eal.c +++ b/lib/librte_eal/linux/eal/eal.c @@ -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, diff --git a/lib/librte_eal/linux/eal/eal_thread.c b/lib/librte_eal/linux/eal/eal_thread.c index 379773b683e8..058692a45412 100644 --- a/lib/librte_eal/linux/eal/eal_thread.c +++ b/lib/librte_eal/linux/eal/eal_thread.c @@ -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 */ -- 2.20.1