From patchwork Wed Jul 1 20:23:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 72674 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1E3FAA0350; Wed, 1 Jul 2020 22:25:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 336091D15A; Wed, 1 Jul 2020 22:24:23 +0200 (CEST) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by dpdk.org (Postfix) with ESMTP id CE7901C1B3 for ; Wed, 1 Jul 2020 22:24:20 +0200 (CEST) Received: by mail-pj1-f51.google.com with SMTP id k71so7916787pje.0 for ; Wed, 01 Jul 2020 13:24:20 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=VkvR/tJszlILjuUfOY6/qEntVb2eFhf5fZ8BA6J80P4=; b=OWXWJdWHxsvyK8f9wizxNfwu0WaHfzOkUCw5E4MnW/LgtjgPfK8bMLqJWaPZjb2lPT HgtarNkg4YzVhxPDdYNfZbR5M/PMQgSHN4o5xMKgd4gF5yvkW7G7GZ23JZLK+Wgju6ve hvkozvrVw2VFIL9uwCaLEoMS2/5dzsMlmFepLjr4PI4Cudasv+2b66ZcX1C6sLOBgOge Lrb9Tn3RDwCmx8G4UB4uQOXmCY8PaPIN38US7SbVA89yO3v2C8MpgMFAV+uYayBmelxR HFQ0NnpJZyPzv45ubAK5RZAL3PAKNJOzcfGE1sVpCJqg3+OE3OjqYSDf+01IZBeyEPIK R/dQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=VkvR/tJszlILjuUfOY6/qEntVb2eFhf5fZ8BA6J80P4=; b=uaNQqP2+wpatDmfttPQbVniQ4oF4uMjMzxUInzEsmqGf5GmUVs8CYx7VTIhct3ePcN 92wvXuJwQGJ8614QuyfG9NPdNpH3kz3YIvHut3LHGvs7ZvmtDBJX9Oy4lk4wm4hQaJuz haF7OsMI3bCkE1QTpMBPCyWtbow+1wLTQ+o5N3s/4dKaza2FH1d4WV242QVG5QdtvYqb 7gCr9yMJ1cX01HKvtKLt0gLmLgVitrZ0pNORIbcvr4lD5SYKzw/u1JAk3/he0ixyyuP+ Is3e2t+kZYny5qS3+PTIt73kA9uaIAM4nIR05v5cR2fGx7wQNtrgjgOT/Vley3hnPnG1 iDeQ== X-Gm-Message-State: AOAM532uApcdxsxU9+PnS4Pm+sep1tui+tWC/glHxcVL48sxgC7hf0C6 z+++EUPFTG+Jf5G0GlLFVe3a502GkTM= X-Google-Smtp-Source: ABdhPJwrD1wxzw7O0iRktMCakZCvnr2v9/6u25j2+7yEaxH8R5xkpe6QdMzKmO3Cu9YWB7jN1s9MgA== X-Received: by 2002:a17:90b:102:: with SMTP id p2mr30642448pjz.227.1593635059660; Wed, 01 Jul 2020 13:24:19 -0700 (PDT) Received: from hermes.corp.microsoft.com (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id g8sm6584803pgr.70.2020.07.01.13.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 13:24:18 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 1 Jul 2020 13:23:41 -0700 Message-Id: <20200701202359.17006-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701202359.17006-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200701202359.17006-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 09/27] examples/ip_pipeline: replace references to master_lcore 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" Use initial lcore instead of primary lcore Signed-off-by: Stephen Hemminger Acked-by: Anatoly Burakov --- examples/ip_pipeline/main.c | 2 +- examples/ip_pipeline/thread.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/ip_pipeline/main.c b/examples/ip_pipeline/main.c index 97d1e91c2b4b..060c6311ddc6 100644 --- a/examples/ip_pipeline/main.c +++ b/examples/ip_pipeline/main.c @@ -250,7 +250,7 @@ main(int argc, char **argv) rte_eal_mp_remote_launch( thread_main, NULL, - SKIP_MASTER); + SKIP_INITIAL); /* Script */ if (app.script_name) diff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c index adb83167cd84..feefdca4eba2 100644 --- a/examples/ip_pipeline/thread.c +++ b/examples/ip_pipeline/thread.c @@ -32,7 +32,7 @@ #endif /** - * Master thead: data plane thread context + * Initial thread: data plane thread context */ struct thread { struct rte_ring *msgq_req; @@ -78,7 +78,7 @@ struct thread_data { static struct thread_data thread_data[RTE_MAX_LCORE]; /** - * Master thread: data plane thread init + * Initial thread: data plane thread init */ static void thread_free(void) @@ -105,7 +105,7 @@ thread_init(void) { uint32_t i; - RTE_LCORE_FOREACH_SLAVE(i) { + RTE_LCORE_FOREACH_WORKER(i) { char name[NAME_MAX]; struct rte_ring *msgq_req, *msgq_rsp; struct thread *t = &thread[i]; @@ -137,7 +137,7 @@ thread_init(void) return -1; } - /* Master thread records */ + /* Initial thread records */ t->msgq_req = msgq_req; t->msgq_rsp = msgq_rsp; t->enabled = 1; @@ -179,7 +179,7 @@ pipeline_is_running(struct pipeline *p) } /** - * Master thread & data plane threads: message passing + * Initial thread & data plane threads: message passing */ enum thread_req_type { THREAD_REQ_PIPELINE_ENABLE = 0, @@ -213,7 +213,7 @@ struct thread_msg_rsp { }; /** - * Master thread + * Initial thread */ static struct thread_msg_req * thread_msg_alloc(void) @@ -556,7 +556,7 @@ thread_msg_handle(struct thread_data *t) } /** - * Master thread & data plane threads: message passing + * Initial thread & data plane threads: message passing */ enum pipeline_req_type { /* Port IN */ @@ -730,7 +730,7 @@ struct pipeline_msg_rsp { }; /** - * Master thread + * Initial thread */ static struct pipeline_msg_req * pipeline_msg_alloc(void)