From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8D17DA3168 for ; Wed, 16 Oct 2019 14:44:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2226C1E989; Wed, 16 Oct 2019 14:43:44 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id C100F1E96C for ; Wed, 16 Oct 2019 14:43:40 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Oct 2019 05:43:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,303,1566889200"; d="scan'208";a="370788303" Received: from silpixa00399498.ir.intel.com (HELO silpixa00399498.ger.corp.intel.com) ([10.237.223.151]) by orsmga005.jf.intel.com with ESMTP; 16 Oct 2019 05:43:38 -0700 From: Anatoly Burakov To: dev@dpdk.org Cc: Marcin Baran , David Hunt , john.mcnamara@intel.com, bruce.richardson@intel.com, thomas@monjalon.net, david.marchand@redhat.com Date: Wed, 16 Oct 2019 13:43:21 +0100 Message-Id: <142d134bf684f5443a0bbdae3b9e6be2bfc9f0ab.1571229052.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: <20190930092139.2440-1-marcinx.baran@intel.com> Subject: [dpdk-dev] [PATCH v2 06/10] distributor: remove deprecated code 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" From: Marcin Baran Remove code for old ABI versions ahead of ABI version bump. Signed-off-by: Marcin Baran Signed-off-by: Anatoly Burakov --- Notes: v2: - Moved this to before ABI version bump to avoid compile breakage lib/librte_distributor/rte_distributor.c | 56 +++-------------- .../rte_distributor_v1705.h | 61 ------------------- 2 files changed, 9 insertions(+), 108 deletions(-) delete mode 100644 lib/librte_distributor/rte_distributor_v1705.h diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c index 21eb1fb0a1..ca3f21b833 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -19,7 +19,6 @@ #include "rte_distributor_private.h" #include "rte_distributor.h" #include "rte_distributor_v20.h" -#include "rte_distributor_v1705.h" TAILQ_HEAD(rte_dist_burst_list, rte_distributor); @@ -33,7 +32,7 @@ EAL_REGISTER_TAILQ(rte_dist_burst_tailq) /**** Burst Packet APIs called by workers ****/ void -rte_distributor_request_pkt_v1705(struct rte_distributor *d, +rte_distributor_request_pkt(struct rte_distributor *d, unsigned int worker_id, struct rte_mbuf **oldpkt, unsigned int count) { @@ -78,14 +77,9 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d, */ *retptr64 |= RTE_DISTRIB_GET_BUF; } -BIND_DEFAULT_SYMBOL(rte_distributor_request_pkt, _v1705, 17.05); -MAP_STATIC_SYMBOL(void rte_distributor_request_pkt(struct rte_distributor *d, - unsigned int worker_id, struct rte_mbuf **oldpkt, - unsigned int count), - rte_distributor_request_pkt_v1705); int -rte_distributor_poll_pkt_v1705(struct rte_distributor *d, +rte_distributor_poll_pkt(struct rte_distributor *d, unsigned int worker_id, struct rte_mbuf **pkts) { struct rte_distributor_buffer *buf = &d->bufs[worker_id]; @@ -119,13 +113,9 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d, return count; } -BIND_DEFAULT_SYMBOL(rte_distributor_poll_pkt, _v1705, 17.05); -MAP_STATIC_SYMBOL(int rte_distributor_poll_pkt(struct rte_distributor *d, - unsigned int worker_id, struct rte_mbuf **pkts), - rte_distributor_poll_pkt_v1705); int -rte_distributor_get_pkt_v1705(struct rte_distributor *d, +rte_distributor_get_pkt(struct rte_distributor *d, unsigned int worker_id, struct rte_mbuf **pkts, struct rte_mbuf **oldpkt, unsigned int return_count) { @@ -153,14 +143,9 @@ rte_distributor_get_pkt_v1705(struct rte_distributor *d, } return count; } -BIND_DEFAULT_SYMBOL(rte_distributor_get_pkt, _v1705, 17.05); -MAP_STATIC_SYMBOL(int rte_distributor_get_pkt(struct rte_distributor *d, - unsigned int worker_id, struct rte_mbuf **pkts, - struct rte_mbuf **oldpkt, unsigned int return_count), - rte_distributor_get_pkt_v1705); int -rte_distributor_return_pkt_v1705(struct rte_distributor *d, +rte_distributor_return_pkt(struct rte_distributor *d, unsigned int worker_id, struct rte_mbuf **oldpkt, int num) { struct rte_distributor_buffer *buf = &d->bufs[worker_id]; @@ -187,10 +172,6 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d, return 0; } -BIND_DEFAULT_SYMBOL(rte_distributor_return_pkt, _v1705, 17.05); -MAP_STATIC_SYMBOL(int rte_distributor_return_pkt(struct rte_distributor *d, - unsigned int worker_id, struct rte_mbuf **oldpkt, int num), - rte_distributor_return_pkt_v1705); /**** APIs called on distributor core ***/ @@ -336,7 +317,7 @@ release(struct rte_distributor *d, unsigned int wkr) /* process a set of packets to distribute them to workers */ int -rte_distributor_process_v1705(struct rte_distributor *d, +rte_distributor_process(struct rte_distributor *d, struct rte_mbuf **mbufs, unsigned int num_mbufs) { unsigned int next_idx = 0; @@ -470,14 +451,10 @@ rte_distributor_process_v1705(struct rte_distributor *d, return num_mbufs; } -BIND_DEFAULT_SYMBOL(rte_distributor_process, _v1705, 17.05); -MAP_STATIC_SYMBOL(int rte_distributor_process(struct rte_distributor *d, - struct rte_mbuf **mbufs, unsigned int num_mbufs), - rte_distributor_process_v1705); /* return to the caller, packets returned from workers */ int -rte_distributor_returned_pkts_v1705(struct rte_distributor *d, +rte_distributor_returned_pkts(struct rte_distributor *d, struct rte_mbuf **mbufs, unsigned int max_mbufs) { struct rte_distributor_returned_pkts *returns = &d->returns; @@ -502,10 +479,6 @@ rte_distributor_returned_pkts_v1705(struct rte_distributor *d, return retval; } -BIND_DEFAULT_SYMBOL(rte_distributor_returned_pkts, _v1705, 17.05); -MAP_STATIC_SYMBOL(int rte_distributor_returned_pkts(struct rte_distributor *d, - struct rte_mbuf **mbufs, unsigned int max_mbufs), - rte_distributor_returned_pkts_v1705); /* * Return the number of packets in-flight in a distributor, i.e. packets @@ -527,7 +500,7 @@ total_outstanding(const struct rte_distributor *d) * queued up. */ int -rte_distributor_flush_v1705(struct rte_distributor *d) +rte_distributor_flush(struct rte_distributor *d) { unsigned int flushed; unsigned int wkr; @@ -556,13 +529,10 @@ rte_distributor_flush_v1705(struct rte_distributor *d) return flushed; } -BIND_DEFAULT_SYMBOL(rte_distributor_flush, _v1705, 17.05); -MAP_STATIC_SYMBOL(int rte_distributor_flush(struct rte_distributor *d), - rte_distributor_flush_v1705); /* clears the internal returns array in the distributor */ void -rte_distributor_clear_returns_v1705(struct rte_distributor *d) +rte_distributor_clear_returns(struct rte_distributor *d) { unsigned int wkr; @@ -576,13 +546,10 @@ rte_distributor_clear_returns_v1705(struct rte_distributor *d) for (wkr = 0; wkr < d->num_workers; wkr++) d->bufs[wkr].retptr64[0] = 0; } -BIND_DEFAULT_SYMBOL(rte_distributor_clear_returns, _v1705, 17.05); -MAP_STATIC_SYMBOL(void rte_distributor_clear_returns(struct rte_distributor *d), - rte_distributor_clear_returns_v1705); /* creates a distributor instance */ struct rte_distributor * -rte_distributor_create_v1705(const char *name, +rte_distributor_create(const char *name, unsigned int socket_id, unsigned int num_workers, unsigned int alg_type) @@ -656,8 +623,3 @@ rte_distributor_create_v1705(const char *name, return d; } -BIND_DEFAULT_SYMBOL(rte_distributor_create, _v1705, 17.05); -MAP_STATIC_SYMBOL(struct rte_distributor *rte_distributor_create( - const char *name, unsigned int socket_id, - unsigned int num_workers, unsigned int alg_type), - rte_distributor_create_v1705); diff --git a/lib/librte_distributor/rte_distributor_v1705.h b/lib/librte_distributor/rte_distributor_v1705.h deleted file mode 100644 index df4d9e8150..0000000000 --- a/lib/librte_distributor/rte_distributor_v1705.h +++ /dev/null @@ -1,61 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2017 Intel Corporation - */ - -#ifndef _RTE_DISTRIB_V1705_H_ -#define _RTE_DISTRIB_V1705_H_ - -/** - * @file - * RTE distributor - * - * The distributor is a component which is designed to pass packets - * one-at-a-time to workers, with dynamic load balancing. - */ - -#ifdef __cplusplus -extern "C" { -#endif - -struct rte_distributor * -rte_distributor_create_v1705(const char *name, unsigned int socket_id, - unsigned int num_workers, - unsigned int alg_type); - -int -rte_distributor_process_v1705(struct rte_distributor *d, - struct rte_mbuf **mbufs, unsigned int num_mbufs); - -int -rte_distributor_returned_pkts_v1705(struct rte_distributor *d, - struct rte_mbuf **mbufs, unsigned int max_mbufs); - -int -rte_distributor_flush_v1705(struct rte_distributor *d); - -void -rte_distributor_clear_returns_v1705(struct rte_distributor *d); - -int -rte_distributor_get_pkt_v1705(struct rte_distributor *d, - unsigned int worker_id, struct rte_mbuf **pkts, - struct rte_mbuf **oldpkt, unsigned int retcount); - -int -rte_distributor_return_pkt_v1705(struct rte_distributor *d, - unsigned int worker_id, struct rte_mbuf **oldpkt, int num); - -void -rte_distributor_request_pkt_v1705(struct rte_distributor *d, - unsigned int worker_id, struct rte_mbuf **oldpkt, - unsigned int count); - -int -rte_distributor_poll_pkt_v1705(struct rte_distributor *d, - unsigned int worker_id, struct rte_mbuf **mbufs); - -#ifdef __cplusplus -} -#endif - -#endif -- 2.17.1