From patchwork Mon Sep 13 16:44:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 98772 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6AD92A0C45; Mon, 13 Sep 2021 18:44:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 78BA1410E8; Mon, 13 Sep 2021 18:44:50 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 713FB40151 for ; Mon, 13 Sep 2021 18:44:48 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10106"; a="201239097" X-IronPort-AV: E=Sophos;i="5.85,290,1624345200"; d="scan'208";a="201239097" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2021 09:44:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,290,1624345200"; d="scan'208";a="507429075" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com) ([10.237.223.107]) by fmsmga008.fm.intel.com with ESMTP; 13 Sep 2021 09:44:46 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Date: Mon, 13 Sep 2021 17:44:21 +0100 Message-Id: <20210913164443.16875-2-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210913164443.16875-1-cristian.dumitrescu@intel.com> References: <20210910133713.93103-1-cristian.dumitrescu@intel.com> <20210913164443.16875-1-cristian.dumitrescu@intel.com> Subject: [dpdk-dev] [PATCH V3 02/24] pipeline: move thread inline functions to header file X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Move the thread inline functions to the internal header file. Signed-off-by: Cristian Dumitrescu --- lib/pipeline/rte_swx_pipeline.c | 56 ---------------------- lib/pipeline/rte_swx_pipeline_internal.h | 59 ++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 56 deletions(-) diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index ae9b2056db..7e01453c27 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -1492,62 +1492,6 @@ struct_field_parse(struct rte_swx_pipeline *p, } } -static inline void -pipeline_port_inc(struct rte_swx_pipeline *p) -{ - p->port_id = (p->port_id + 1) & (p->n_ports_in - 1); -} - -static inline void -thread_ip_reset(struct rte_swx_pipeline *p, struct thread *t) -{ - t->ip = p->instructions; -} - -static inline void -thread_ip_set(struct thread *t, struct instruction *ip) -{ - t->ip = ip; -} - -static inline void -thread_ip_action_call(struct rte_swx_pipeline *p, - struct thread *t, - uint32_t action_id) -{ - t->ret = t->ip + 1; - t->ip = p->action_instructions[action_id]; -} - -static inline void -thread_ip_inc(struct rte_swx_pipeline *p); - -static inline void -thread_ip_inc(struct rte_swx_pipeline *p) -{ - struct thread *t = &p->threads[p->thread_id]; - - t->ip++; -} - -static inline void -thread_ip_inc_cond(struct thread *t, int cond) -{ - t->ip += cond; -} - -static inline void -thread_yield(struct rte_swx_pipeline *p) -{ - p->thread_id = (p->thread_id + 1) & (RTE_SWX_PIPELINE_THREADS_MAX - 1); -} - -static inline void -thread_yield_cond(struct rte_swx_pipeline *p, int cond) -{ - p->thread_id = (p->thread_id + cond) & (RTE_SWX_PIPELINE_THREADS_MAX - 1); -} - /* * rx. */ diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index 5d80dd8451..682f4c86a0 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -1380,4 +1380,63 @@ struct rte_swx_pipeline { int numa_node; }; +/* + * Instruction. + */ +static inline void +pipeline_port_inc(struct rte_swx_pipeline *p) +{ + p->port_id = (p->port_id + 1) & (p->n_ports_in - 1); +} + +static inline void +thread_ip_reset(struct rte_swx_pipeline *p, struct thread *t) +{ + t->ip = p->instructions; +} + +static inline void +thread_ip_set(struct thread *t, struct instruction *ip) +{ + t->ip = ip; +} + +static inline void +thread_ip_action_call(struct rte_swx_pipeline *p, + struct thread *t, + uint32_t action_id) +{ + t->ret = t->ip + 1; + t->ip = p->action_instructions[action_id]; +} + +static inline void +thread_ip_inc(struct rte_swx_pipeline *p); + +static inline void +thread_ip_inc(struct rte_swx_pipeline *p) +{ + struct thread *t = &p->threads[p->thread_id]; + + t->ip++; +} + +static inline void +thread_ip_inc_cond(struct thread *t, int cond) +{ + t->ip += cond; +} + +static inline void +thread_yield(struct rte_swx_pipeline *p) +{ + p->thread_id = (p->thread_id + 1) & (RTE_SWX_PIPELINE_THREADS_MAX - 1); +} + +static inline void +thread_yield_cond(struct rte_swx_pipeline *p, int cond) +{ + p->thread_id = (p->thread_id + cond) & (RTE_SWX_PIPELINE_THREADS_MAX - 1); +} + #endif