From patchwork Fri Jun 5 22:57:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70897 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 8C8DDA0350; Sat, 6 Jun 2020 01:00:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 417211D603; Sat, 6 Jun 2020 00:59:13 +0200 (CEST) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by dpdk.org (Postfix) with ESMTP id A7F601D5D0 for ; Sat, 6 Jun 2020 00:59:09 +0200 (CEST) Received: by mail-pg1-f170.google.com with SMTP id e9so5826476pgo.9 for ; Fri, 05 Jun 2020 15:59:09 -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=pjxDnZnxBztMAlObVmOF1zVLV+886R2szRIk9ShPmX3RlYSHYFy1dRRKB45c0tB9cs 6fwEC79NPYE9F6Fm7gKyQYoHYGhC69DzvGgQ7DuueVUJYEz/tC2JYyQYeCCoRDkXl3RM nHnRu+WMzG38/8wMHv6GBbKzN+lMWX42CHxV2+DxFbhwr8jcEiAU+fMB8JDLGWUrQeFv mKMh+yorsCmnxK8BaCmFpmp26PYyOVv5YpYsIrkVEBU67j4+6sU8cw2q3SUZnSAwra0s nWDPQPaZxrCARuqgkgnGiXMhuPEv81sgh2gx7MNGAfX4+Y2Hb4kED7KMqvsUZPYvDTO1 n16w== 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=QsT5Q+67D+LZUw835ePTZb8C8z0OqXuDR87MP+BZ/ExOzwhptpH4P/C8DYiyuFqPBP m/4CG6xY492odqWIUTii17yZMV7cgkAUCdW8/pakrfUtAmdx/qzdnVWRQFVHlzcS/y71 RJPeJp3BZWdUGX2CEqAUAqNPygntkgaYAC1xbscaJwLgN4guyBDzBS7a8A8az/5mkWKO JfPda9Fp8CugoKJyjfz91TzV+kE0iReCLELVMZAeJ2OrYrvSyOshhje4xAuiX1EVdGA2 AXizTfr+PjHuBjW3HMCf/5VXVVGH58GbvBTcDDKoGBAWKIB8HCxVC8uJZTudWrevs02d oVZw== X-Gm-Message-State: AOAM531ZMzOY6FrbjwjvkTNdmFyFX2E8GXJl+3N8WfGnO5JzsH1CYP1P wwqCQQSYwEJu5CQGv4lfrV9g2SwQ+Zk= X-Google-Smtp-Source: ABdhPJyJ1ccajFilDeE9Ctm47K7QRc0g5vEw0cbiJdaLK6IfDM4bCtvvwl089L+1WQTVQ7l7AK3hzw== X-Received: by 2002:a63:747:: with SMTP id 68mr10994645pgh.273.1591397948273; Fri, 05 Jun 2020 15:59:08 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j186sm543121pfb.220.2020.06.05.15.59.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 15:59:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 5 Jun 2020 15:57:54 -0700 Message-Id: <20200605225811.26342-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605225811.26342-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200605225811.26342-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC v2 09/26] 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 --- 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)