From patchwork Tue Mar 26 19:25:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 51752 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0DAE61B494; Tue, 26 Mar 2019 20:26:03 +0100 (CET) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 49E111B490 for ; Tue, 26 Mar 2019 20:26:01 +0100 (CET) Received: by mail-pf1-f195.google.com with SMTP id 188so3082868pfd.8 for ; Tue, 26 Mar 2019 12:26:01 -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; bh=SMFuvzai3O4JHq6NkZAttaXmqrvCQzGbNe0wQwij7c0=; b=DIREPTD3LvLc0b9zmPH4lunpl1/bwRFwlm6oaPXgoP8TqHrU9yIf7IS1jh5HVbotpu xzzDxItCMzWrrIirN+kKPgopzEPE8eMtLNmlHyyF+bXapNO4QE3oMiftBkKvopQKedk5 6+VLfHmsN9UFBXbhukTyu8ZXaQKpUjL4wZMdqdTwH6kr1iYipKhS34OuTc9G+45i7PbP 08igWWPIl/HatQwgHBXiSnVEsRJCS4zQeGSZ9UIkQx4VzWYY1Z3ihG4zOlb096GGlNum HK2gThKgWQjPT0B5+VCnXvRmZuqYSl2p01LJ7FAzeyM+OvrdznYzK7w3P16zLik+JyVv GeyQ== 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; bh=SMFuvzai3O4JHq6NkZAttaXmqrvCQzGbNe0wQwij7c0=; b=Uj6tKfv87SiSWbVISeRv/RPaymtRSKNYZauyQZpNEmQHYlwxrig0xKeqHyPYZVnSYL UB3C4kFsIzvOEfR2+jz8W1hAZr2ElCUvPiqg3vnmJ23cqfJyVvRdCRFBpgm3kbpgF7WX kSoAKK5S0uP4nZusErrorhRgtlHmXRNGjs93/G2beYZM9tVkPLL05Xqt6XDFGbjn1M0V 8vi9yfsjmGoC4dJCg9Et+tr6j0Do2XFU6Z+8xWnwVsCAYlEaIHEWWGaF5DpHj2tKLKSe sYLrf1zs9eSB8TV/JyBqEe4r0udXzyaqfvUmL19AC8NBGUZ+4PVNN7sM132QtSdgO/Gx SZ2w== X-Gm-Message-State: APjAAAU/dyw7bCdIvqbJXKXRKGGKntDb7SMigZPWt94L9ZJAA/k6RnBQ sdnQ38dB3rjVs5QZxs2ck/lLguKy/dH+tw== X-Google-Smtp-Source: APXvYqwEwM66siD74m390u5K6j7ZeESb9Uf/4qGbzl5+0bGZzLrum2rXPcAgD/n+aFjd2lnjPDn5ww== X-Received: by 2002:a63:f80f:: with SMTP id n15mr30554410pgh.283.1553628360225; Tue, 26 Mar 2019 12:26:00 -0700 (PDT) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j28sm1882339pgb.46.2019.03.26.12.25.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 12:25:58 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 26 Mar 2019 12:25:56 -0700 Message-Id: <20190326192556.19934-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [RFC] 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 "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 --- 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/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_thread.c | 6 +++--- lib/librte_eal/linux/eal/eal.c | 2 +- lib/librte_eal/linux/eal/eal_thread.c | 8 ++++---- 11 files changed, 24 insertions(+), 30 deletions(-) diff --git a/drivers/event/octeontx/ssovf_evdev_selftest.c b/drivers/event/octeontx/ssovf_evdev_selftest.c index 239362fcf549..55d8ac35c190 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) != 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 d00d5de613d7..7deb70918fc4 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) != LCORE_FINISHED || + rte_eal_get_lcore_state(w_lcore) != 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 57989a5aac54..6a06a19bcd3e 100644 --- a/drivers/net/softnic/rte_eth_softnic_thread.c +++ b/drivers/net/softnic/rte_eth_softnic_thread.c @@ -118,10 +118,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) == LCORE_RUNNING; } static int32_t diff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c index 272fbbeed1bc..6819dd5323e9 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) == LCORE_RUNNING; } /** diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c index 0bf2b533648a..8c56f4aa5ebf 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) == 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..febf9c7b0c40 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 == LCORE_WAITING) return 0; - while (lcore_config[slave_id].state != WAIT && - lcore_config[slave_id].state != FINISHED) + while (lcore_config[slave_id].state != LCORE_WAITING && + lcore_config[slave_id].state != 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 = 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 != 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 = 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..45704e37eedf 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 */ + LCORE_WAITING, /**< waiting a new command */ + LCORE_RUNNING, /**< executing command */ + LCORE_FINISHED, /**< command executed */ }; /** diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c index 03fde97a9c89..4468b33a377d 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 = LCORE_WAITING; return 0; } diff --git a/lib/librte_eal/freebsd/eal/eal_thread.c b/lib/librte_eal/freebsd/eal/eal_thread.c index 309b5872666b..c0a26c65bc27 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 != 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 = 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 = LCORE_FINISHED; } /* never reached */ diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c index 13f40168415d..8b93a7b929a9 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 = 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..63f3e66110e7 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 != 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 = 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 = LCORE_WAITING; else - lcore_config[lcore_id].state = FINISHED; + lcore_config[lcore_id].state = LCORE_FINISHED; } /* never reached */