Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62576/?format=api
{ "id": 62576, "url": "http://patches.dpdk.org/api/patches/62576/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/60321f3bcc0a41ba445112302c9dad9e04c94644.1573059201.git.anatoly.burakov@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<60321f3bcc0a41ba445112302c9dad9e04c94644.1573059201.git.anatoly.burakov@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/60321f3bcc0a41ba445112302c9dad9e04c94644.1573059201.git.anatoly.burakov@intel.com", "date": "2019-11-06T16:54:26", "name": "[v6,07/10] distributor: rename v2.0 ABI to _single suffix", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "aba1474635a048266d0b3e42f0a42ff2dfa6f42c", "submitter": { "id": 4, "url": "http://patches.dpdk.org/api/people/4/?format=api", "name": "Anatoly Burakov", "email": "anatoly.burakov@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/60321f3bcc0a41ba445112302c9dad9e04c94644.1573059201.git.anatoly.burakov@intel.com/mbox/", "series": [ { "id": 7299, "url": "http://patches.dpdk.org/api/series/7299/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7299", "date": "2019-11-06T16:54:19", "name": "Implement the new ABI policy and add helper scripts", "version": 6, "mbox": "http://patches.dpdk.org/series/7299/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62576/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62576/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 04081A04AC;\n\tWed, 6 Nov 2019 17:55:46 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0FDBC1D44C;\n\tWed, 6 Nov 2019 17:54:52 +0100 (CET)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n by dpdk.org (Postfix) with ESMTP id 92F7E1D415\n for <dev@dpdk.org>; Wed, 6 Nov 2019 17:54:49 +0100 (CET)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 06 Nov 2019 08:54:49 -0800", "from silpixa00399498.ir.intel.com (HELO\n silpixa00399498.ger.corp.intel.com) ([10.237.223.151])\n by fmsmga008.fm.intel.com with ESMTP; 06 Nov 2019 08:54:47 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.68,275,1569308400\"; d=\"scan'208\";a=\"200764084\"", "From": "Anatoly Burakov <anatoly.burakov@intel.com>", "To": "dev@dpdk.org", "Cc": "Marcin Baran <marcinx.baran@intel.com>, David Hunt <david.hunt@intel.com>,\n john.mcnamara@intel.com, ray.kinsella@intel.com,\n bruce.richardson@intel.com, thomas@monjalon.net, david.marchand@redhat.com", "Date": "Wed, 6 Nov 2019 16:54:26 +0000", "Message-Id": "\n <60321f3bcc0a41ba445112302c9dad9e04c94644.1573059201.git.anatoly.burakov@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": [ "<cover.1573059201.git.anatoly.burakov@intel.com>", "<cover.1573059201.git.anatoly.burakov@intel.com>" ], "References": [ "<cover.1573059201.git.anatoly.burakov@intel.com>", "<cover.1571910363.git.anatoly.burakov@intel.com>\n <cover.1573059201.git.anatoly.burakov@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v6 07/10] distributor: rename v2.0 ABI to _single\n\tsuffix", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Marcin Baran <marcinx.baran@intel.com>\n\nThe original ABI versioning was slightly misleading in that the\nDPDK 2.0 ABI was really a single mode for the distributor, and is\nused as such throughout the distributor code.\n\nFix this by renaming all _v20 API's to _single API's, and remove\nsymbol versioning.\n\nSigned-off-by: Marcin Baran <marcinx.baran@intel.com>\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\nAcked-by: David Hunt <david.hunt@intel.com>\n---\n\nNotes:\n v4:\n - Changed it back to how it was with v2\n - Removed remaining v2.0 symbols\n \n v3:\n - Removed single mode from distributor as per Dave's comments\n \n v2:\n - Moved this to before ABI version bump to avoid compile breakage\n\n lib/librte_distributor/Makefile | 2 +-\n lib/librte_distributor/distributor_private.h | 10 ++--\n lib/librte_distributor/meson.build | 2 +-\n lib/librte_distributor/rte_distributor.c | 24 +++++-----\n ...ributor_v20.c => rte_distributor_single.c} | 48 +++++++++----------\n ...ributor_v20.h => rte_distributor_single.h} | 26 +++++-----\n .../rte_distributor_version.map | 18 +------\n 7 files changed, 58 insertions(+), 72 deletions(-)\n rename lib/librte_distributor/{rte_distributor_v20.c => rte_distributor_single.c} (88%)\n rename lib/librte_distributor/{rte_distributor_v20.h => rte_distributor_single.h} (89%)", "diff": "diff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile\nindex 0ef80dcff4..d9d0089166 100644\n--- a/lib/librte_distributor/Makefile\n+++ b/lib/librte_distributor/Makefile\n@@ -15,7 +15,7 @@ EXPORT_MAP := rte_distributor_version.map\n LIBABIVER := 1\n \n # all source are stored in SRCS-y\n-SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_v20.c\n+SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_single.c\n SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c\n ifeq ($(CONFIG_RTE_ARCH_X86),y)\n SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c\ndiff --git a/lib/librte_distributor/distributor_private.h b/lib/librte_distributor/distributor_private.h\nindex c89371123e..489aef2acb 100644\n--- a/lib/librte_distributor/distributor_private.h\n+++ b/lib/librte_distributor/distributor_private.h\n@@ -55,7 +55,7 @@ extern \"C\" {\n * the next cache line to worker 0, we pad this out to three cache lines.\n * Only 64-bits of the memory is actually used though.\n */\n-union rte_distributor_buffer_v20 {\n+union rte_distributor_buffer_single {\n \tvolatile int64_t bufptr64;\n \tchar pad[RTE_CACHE_LINE_SIZE*3];\n } __rte_cache_aligned;\n@@ -80,8 +80,8 @@ struct rte_distributor_returned_pkts {\n \tstruct rte_mbuf *mbufs[RTE_DISTRIB_MAX_RETURNS];\n };\n \n-struct rte_distributor_v20 {\n-\tTAILQ_ENTRY(rte_distributor_v20) next; /**< Next in list. */\n+struct rte_distributor_single {\n+\tTAILQ_ENTRY(rte_distributor_single) next; /**< Next in list. */\n \n \tchar name[RTE_DISTRIBUTOR_NAMESIZE]; /**< Name of the ring. */\n \tunsigned int num_workers; /**< Number of workers polling */\n@@ -96,7 +96,7 @@ struct rte_distributor_v20 {\n \n \tstruct rte_distributor_backlog backlog[RTE_DISTRIB_MAX_WORKERS];\n \n-\tunion rte_distributor_buffer_v20 bufs[RTE_DISTRIB_MAX_WORKERS];\n+\tunion rte_distributor_buffer_single bufs[RTE_DISTRIB_MAX_WORKERS];\n \n \tstruct rte_distributor_returned_pkts returns;\n };\n@@ -154,7 +154,7 @@ struct rte_distributor {\n \n \tenum rte_distributor_match_function dist_match_fn;\n \n-\tstruct rte_distributor_v20 *d_v20;\n+\tstruct rte_distributor_single *d_single;\n };\n \n void\ndiff --git a/lib/librte_distributor/meson.build b/lib/librte_distributor/meson.build\nindex c9617d7b14..50b91887b5 100644\n--- a/lib/librte_distributor/meson.build\n+++ b/lib/librte_distributor/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2017 Intel Corporation\n \n-sources = files('rte_distributor.c', 'rte_distributor_v20.c')\n+sources = files('rte_distributor.c', 'rte_distributor_single.c')\n if arch_subdir == 'x86'\n \tsources += files('rte_distributor_match_sse.c')\n else\ndiff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c\nindex a4c8ff6a96..6c5b0c86e8 100644\n--- a/lib/librte_distributor/rte_distributor.c\n+++ b/lib/librte_distributor/rte_distributor.c\n@@ -17,7 +17,7 @@\n #include <rte_tailq.h>\n \n #include \"rte_distributor.h\"\n-#include \"rte_distributor_v20.h\"\n+#include \"rte_distributor_single.h\"\n #include \"distributor_private.h\"\n \n TAILQ_HEAD(rte_dist_burst_list, rte_distributor);\n@@ -42,7 +42,7 @@ rte_distributor_request_pkt(struct rte_distributor *d,\n \tvolatile int64_t *retptr64;\n \n \tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n-\t\trte_distributor_request_pkt_v20(d->d_v20,\n+\t\trte_distributor_request_pkt_single(d->d_single,\n \t\t\tworker_id, oldpkt[0]);\n \t\treturn;\n \t}\n@@ -93,7 +93,8 @@ rte_distributor_poll_pkt(struct rte_distributor *d,\n \tunsigned int i;\n \n \tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n-\t\tpkts[0] = rte_distributor_poll_pkt_v20(d->d_v20, worker_id);\n+\t\tpkts[0] = rte_distributor_poll_pkt_single(d->d_single,\n+\t\t\tworker_id);\n \t\treturn (pkts[0]) ? 1 : 0;\n \t}\n \n@@ -133,7 +134,7 @@ rte_distributor_get_pkt(struct rte_distributor *d,\n \n \tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n \t\tif (return_count <= 1) {\n-\t\t\tpkts[0] = rte_distributor_get_pkt_v20(d->d_v20,\n+\t\t\tpkts[0] = rte_distributor_get_pkt_single(d->d_single,\n \t\t\t\tworker_id, oldpkt[0]);\n \t\t\treturn (pkts[0]) ? 1 : 0;\n \t\t} else\n@@ -163,7 +164,7 @@ rte_distributor_return_pkt(struct rte_distributor *d,\n \n \tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n \t\tif (num == 1)\n-\t\t\treturn rte_distributor_return_pkt_v20(d->d_v20,\n+\t\t\treturn rte_distributor_return_pkt_single(d->d_single,\n \t\t\t\tworker_id, oldpkt[0]);\n \t\telse\n \t\t\treturn -EINVAL;\n@@ -354,7 +355,8 @@ rte_distributor_process(struct rte_distributor *d,\n \n \tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n \t\t/* Call the old API */\n-\t\treturn rte_distributor_process_v20(d->d_v20, mbufs, num_mbufs);\n+\t\treturn rte_distributor_process_single(d->d_single,\n+\t\t\tmbufs, num_mbufs);\n \t}\n \n \tif (unlikely(num_mbufs == 0)) {\n@@ -494,7 +496,7 @@ rte_distributor_returned_pkts(struct rte_distributor *d,\n \n \tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n \t\t/* Call the old API */\n-\t\treturn rte_distributor_returned_pkts_v20(d->d_v20,\n+\t\treturn rte_distributor_returned_pkts_single(d->d_single,\n \t\t\t\tmbufs, max_mbufs);\n \t}\n \n@@ -537,7 +539,7 @@ rte_distributor_flush(struct rte_distributor *d)\n \n \tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n \t\t/* Call the old API */\n-\t\treturn rte_distributor_flush_v20(d->d_v20);\n+\t\treturn rte_distributor_flush_single(d->d_single);\n \t}\n \n \tflushed = total_outstanding(d);\n@@ -568,7 +570,7 @@ rte_distributor_clear_returns(struct rte_distributor *d)\n \n \tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n \t\t/* Call the old API */\n-\t\trte_distributor_clear_returns_v20(d->d_v20);\n+\t\trte_distributor_clear_returns_single(d->d_single);\n \t\treturn;\n \t}\n \n@@ -610,9 +612,9 @@ rte_distributor_create(const char *name,\n \t\t\trte_errno = ENOMEM;\n \t\t\treturn NULL;\n \t\t}\n-\t\td->d_v20 = rte_distributor_create_v20(name,\n+\t\td->d_single = rte_distributor_create_single(name,\n \t\t\t\tsocket_id, num_workers);\n-\t\tif (d->d_v20 == NULL) {\n+\t\tif (d->d_single == NULL) {\n \t\t\tfree(d);\n \t\t\t/* rte_errno will have been set */\n \t\t\treturn NULL;\ndiff --git a/lib/librte_distributor/rte_distributor_v20.c b/lib/librte_distributor/rte_distributor_single.c\nsimilarity index 88%\nrename from lib/librte_distributor/rte_distributor_v20.c\nrename to lib/librte_distributor/rte_distributor_single.c\nindex 53fa16d27d..91d8824c64 100644\n--- a/lib/librte_distributor/rte_distributor_v20.c\n+++ b/lib/librte_distributor/rte_distributor_single.c\n@@ -15,10 +15,10 @@\n #include <rte_pause.h>\n #include <rte_tailq.h>\n \n-#include \"rte_distributor_v20.h\"\n+#include \"rte_distributor_single.h\"\n #include \"distributor_private.h\"\n \n-TAILQ_HEAD(rte_distributor_list, rte_distributor_v20);\n+TAILQ_HEAD(rte_distributor_list, rte_distributor_single);\n \n static struct rte_tailq_elem rte_distributor_tailq = {\n \t.name = \"RTE_DISTRIBUTOR\",\n@@ -28,10 +28,10 @@ EAL_REGISTER_TAILQ(rte_distributor_tailq)\n /**** APIs called by workers ****/\n \n void\n-rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,\n+rte_distributor_request_pkt_single(struct rte_distributor_single *d,\n \t\tunsigned worker_id, struct rte_mbuf *oldpkt)\n {\n-\tunion rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];\n+\tunion rte_distributor_buffer_single *buf = &d->bufs[worker_id];\n \tint64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)\n \t\t\t| RTE_DISTRIB_GET_BUF;\n \twhile (unlikely(__atomic_load_n(&buf->bufptr64, __ATOMIC_RELAXED)\n@@ -43,10 +43,10 @@ rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,\n }\n \n struct rte_mbuf *\n-rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,\n+rte_distributor_poll_pkt_single(struct rte_distributor_single *d,\n \t\tunsigned worker_id)\n {\n-\tunion rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];\n+\tunion rte_distributor_buffer_single *buf = &d->bufs[worker_id];\n \t/* Sync with distributor. Acquire bufptr64. */\n \tif (__atomic_load_n(&buf->bufptr64, __ATOMIC_ACQUIRE)\n \t\t& RTE_DISTRIB_GET_BUF)\n@@ -58,21 +58,21 @@ rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,\n }\n \n struct rte_mbuf *\n-rte_distributor_get_pkt_v20(struct rte_distributor_v20 *d,\n+rte_distributor_get_pkt_single(struct rte_distributor_single *d,\n \t\tunsigned worker_id, struct rte_mbuf *oldpkt)\n {\n \tstruct rte_mbuf *ret;\n-\trte_distributor_request_pkt_v20(d, worker_id, oldpkt);\n-\twhile ((ret = rte_distributor_poll_pkt_v20(d, worker_id)) == NULL)\n+\trte_distributor_request_pkt_single(d, worker_id, oldpkt);\n+\twhile ((ret = rte_distributor_poll_pkt_single(d, worker_id)) == NULL)\n \t\trte_pause();\n \treturn ret;\n }\n \n int\n-rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,\n+rte_distributor_return_pkt_single(struct rte_distributor_single *d,\n \t\tunsigned worker_id, struct rte_mbuf *oldpkt)\n {\n-\tunion rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];\n+\tunion rte_distributor_buffer_single *buf = &d->bufs[worker_id];\n \tuint64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)\n \t\t\t| RTE_DISTRIB_RETURN_BUF;\n \t/* Sync with distributor on RETURN_BUF flag. */\n@@ -104,7 +104,7 @@ backlog_pop(struct rte_distributor_backlog *bl)\n \n /* stores a packet returned from a worker inside the returns array */\n static inline void\n-store_return(uintptr_t oldbuf, struct rte_distributor_v20 *d,\n+store_return(uintptr_t oldbuf, struct rte_distributor_single *d,\n \t\tunsigned *ret_start, unsigned *ret_count)\n {\n \t/* store returns in a circular buffer - code is branch-free */\n@@ -115,7 +115,7 @@ store_return(uintptr_t oldbuf, struct rte_distributor_v20 *d,\n }\n \n static inline void\n-handle_worker_shutdown(struct rte_distributor_v20 *d, unsigned int wkr)\n+handle_worker_shutdown(struct rte_distributor_single *d, unsigned int wkr)\n {\n \td->in_flight_tags[wkr] = 0;\n \td->in_flight_bitmask &= ~(1UL << wkr);\n@@ -146,7 +146,7 @@ handle_worker_shutdown(struct rte_distributor_v20 *d, unsigned int wkr)\n \t\t * Note that the tags were set before first level call\n \t\t * to rte_distributor_process.\n \t\t */\n-\t\trte_distributor_process_v20(d, pkts, i);\n+\t\trte_distributor_process_single(d, pkts, i);\n \t\tbl->count = bl->start = 0;\n \t}\n }\n@@ -156,7 +156,7 @@ handle_worker_shutdown(struct rte_distributor_v20 *d, unsigned int wkr)\n * to do a partial flush.\n */\n static int\n-process_returns(struct rte_distributor_v20 *d)\n+process_returns(struct rte_distributor_single *d)\n {\n \tunsigned wkr;\n \tunsigned flushed = 0;\n@@ -201,7 +201,7 @@ process_returns(struct rte_distributor_v20 *d)\n \n /* process a set of packets to distribute them to workers */\n int\n-rte_distributor_process_v20(struct rte_distributor_v20 *d,\n+rte_distributor_process_single(struct rte_distributor_single *d,\n \t\tstruct rte_mbuf **mbufs, unsigned num_mbufs)\n {\n \tunsigned next_idx = 0;\n@@ -317,7 +317,7 @@ rte_distributor_process_v20(struct rte_distributor_v20 *d,\n \n /* return to the caller, packets returned from workers */\n int\n-rte_distributor_returned_pkts_v20(struct rte_distributor_v20 *d,\n+rte_distributor_returned_pkts_single(struct rte_distributor_single *d,\n \t\tstruct rte_mbuf **mbufs, unsigned max_mbufs)\n {\n \tstruct rte_distributor_returned_pkts *returns = &d->returns;\n@@ -339,7 +339,7 @@ rte_distributor_returned_pkts_v20(struct rte_distributor_v20 *d,\n * being worked on or queued up in a backlog.\n */\n static inline unsigned\n-total_outstanding(const struct rte_distributor_v20 *d)\n+total_outstanding(const struct rte_distributor_single *d)\n {\n \tunsigned wkr, total_outstanding;\n \n@@ -354,19 +354,19 @@ total_outstanding(const struct rte_distributor_v20 *d)\n /* flush the distributor, so that there are no outstanding packets in flight or\n * queued up. */\n int\n-rte_distributor_flush_v20(struct rte_distributor_v20 *d)\n+rte_distributor_flush_single(struct rte_distributor_single *d)\n {\n \tconst unsigned flushed = total_outstanding(d);\n \n \twhile (total_outstanding(d) > 0)\n-\t\trte_distributor_process_v20(d, NULL, 0);\n+\t\trte_distributor_process_single(d, NULL, 0);\n \n \treturn flushed;\n }\n \n /* clears the internal returns array in the distributor */\n void\n-rte_distributor_clear_returns_v20(struct rte_distributor_v20 *d)\n+rte_distributor_clear_returns_single(struct rte_distributor_single *d)\n {\n \td->returns.start = d->returns.count = 0;\n #ifndef __OPTIMIZE__\n@@ -375,12 +375,12 @@ rte_distributor_clear_returns_v20(struct rte_distributor_v20 *d)\n }\n \n /* creates a distributor instance */\n-struct rte_distributor_v20 *\n-rte_distributor_create_v20(const char *name,\n+struct rte_distributor_single *\n+rte_distributor_create_single(const char *name,\n \t\tunsigned socket_id,\n \t\tunsigned num_workers)\n {\n-\tstruct rte_distributor_v20 *d;\n+\tstruct rte_distributor_single *d;\n \tstruct rte_distributor_list *distributor_list;\n \tchar mz_name[RTE_MEMZONE_NAMESIZE];\n \tconst struct rte_memzone *mz;\ndiff --git a/lib/librte_distributor/rte_distributor_v20.h b/lib/librte_distributor/rte_distributor_single.h\nsimilarity index 89%\nrename from lib/librte_distributor/rte_distributor_v20.h\nrename to lib/librte_distributor/rte_distributor_single.h\nindex 12865658ba..2f80aa43d1 100644\n--- a/lib/librte_distributor/rte_distributor_v20.h\n+++ b/lib/librte_distributor/rte_distributor_single.h\n@@ -2,8 +2,8 @@\n * Copyright(c) 2010-2014 Intel Corporation\n */\n \n-#ifndef _RTE_DISTRIB_V20_H_\n-#define _RTE_DISTRIB_V20_H_\n+#ifndef _RTE_DISTRIB_SINGLE_H_\n+#define _RTE_DISTRIB_SINGLE_H_\n \n /**\n * @file\n@@ -19,7 +19,7 @@ extern \"C\" {\n \n #define RTE_DISTRIBUTOR_NAMESIZE 32 /**< Length of name for instance */\n \n-struct rte_distributor_v20;\n+struct rte_distributor_single;\n struct rte_mbuf;\n \n /**\n@@ -38,8 +38,8 @@ struct rte_mbuf;\n * @return\n * The newly created distributor instance\n */\n-struct rte_distributor_v20 *\n-rte_distributor_create_v20(const char *name, unsigned int socket_id,\n+struct rte_distributor_single *\n+rte_distributor_create_single(const char *name, unsigned int socket_id,\n \t\tunsigned int num_workers);\n \n /* *** APIS to be called on the distributor lcore *** */\n@@ -74,7 +74,7 @@ rte_distributor_create_v20(const char *name, unsigned int socket_id,\n * The number of mbufs processed.\n */\n int\n-rte_distributor_process_v20(struct rte_distributor_v20 *d,\n+rte_distributor_process_single(struct rte_distributor_single *d,\n \t\tstruct rte_mbuf **mbufs, unsigned int num_mbufs);\n \n /**\n@@ -92,7 +92,7 @@ rte_distributor_process_v20(struct rte_distributor_v20 *d,\n * The number of mbufs returned in the mbufs array.\n */\n int\n-rte_distributor_returned_pkts_v20(struct rte_distributor_v20 *d,\n+rte_distributor_returned_pkts_single(struct rte_distributor_single *d,\n \t\tstruct rte_mbuf **mbufs, unsigned int max_mbufs);\n \n /**\n@@ -107,7 +107,7 @@ rte_distributor_returned_pkts_v20(struct rte_distributor_v20 *d,\n * The number of queued/in-flight packets that were completed by this call.\n */\n int\n-rte_distributor_flush_v20(struct rte_distributor_v20 *d);\n+rte_distributor_flush_single(struct rte_distributor_single *d);\n \n /**\n * Clears the array of returned packets used as the source for the\n@@ -119,7 +119,7 @@ rte_distributor_flush_v20(struct rte_distributor_v20 *d);\n * The distributor instance to be used\n */\n void\n-rte_distributor_clear_returns_v20(struct rte_distributor_v20 *d);\n+rte_distributor_clear_returns_single(struct rte_distributor_single *d);\n \n /* *** APIS to be called on the worker lcores *** */\n /*\n@@ -148,7 +148,7 @@ rte_distributor_clear_returns_v20(struct rte_distributor_v20 *d);\n * A new packet to be processed by the worker thread.\n */\n struct rte_mbuf *\n-rte_distributor_get_pkt_v20(struct rte_distributor_v20 *d,\n+rte_distributor_get_pkt_single(struct rte_distributor_single *d,\n \t\tunsigned int worker_id, struct rte_mbuf *oldpkt);\n \n /**\n@@ -164,7 +164,7 @@ rte_distributor_get_pkt_v20(struct rte_distributor_v20 *d,\n * The previous packet being processed by the worker\n */\n int\n-rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,\n+rte_distributor_return_pkt_single(struct rte_distributor_single *d,\n \t\tunsigned int worker_id, struct rte_mbuf *mbuf);\n \n /**\n@@ -188,7 +188,7 @@ rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,\n * The previous packet, if any, being processed by the worker\n */\n void\n-rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,\n+rte_distributor_request_pkt_single(struct rte_distributor_single *d,\n \t\tunsigned int worker_id, struct rte_mbuf *oldpkt);\n \n /**\n@@ -208,7 +208,7 @@ rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,\n * packet is yet available.\n */\n struct rte_mbuf *\n-rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,\n+rte_distributor_poll_pkt_single(struct rte_distributor_single *d,\n \t\tunsigned int worker_id);\n \n #ifdef __cplusplus\ndiff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/rte_distributor_version.map\nindex 3a285b394e..00e26b4804 100644\n--- a/lib/librte_distributor/rte_distributor_version.map\n+++ b/lib/librte_distributor/rte_distributor_version.map\n@@ -1,19 +1,3 @@\n-DPDK_2.0 {\n-\tglobal:\n-\n-\trte_distributor_clear_returns;\n-\trte_distributor_create;\n-\trte_distributor_flush;\n-\trte_distributor_get_pkt;\n-\trte_distributor_poll_pkt;\n-\trte_distributor_process;\n-\trte_distributor_request_pkt;\n-\trte_distributor_return_pkt;\n-\trte_distributor_returned_pkts;\n-\n-\tlocal: *;\n-};\n-\n DPDK_17.05 {\n \tglobal:\n \n@@ -26,4 +10,4 @@ DPDK_17.05 {\n \trte_distributor_request_pkt;\n \trte_distributor_return_pkt;\n \trte_distributor_returned_pkts;\n-} DPDK_2.0;\n+};\n", "prefixes": [ "v6", "07/10" ] }