Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/12085/?format=api
{ "id": 12085, "url": "https://patches.dpdk.org/api/patches/12085/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1460658834-10737-1-git-send-email-thomas.monjalon@6wind.com/", "project": { "id": 1, "url": "https://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": "<1460658834-10737-1-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1460658834-10737-1-git-send-email-thomas.monjalon@6wind.com", "date": "2016-04-14T18:33:54", "name": "[dpdk-dev] port: bump ABI for pcap file support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4461785e1c229b9b74236ac8ec1848f939bdf0f2", "submitter": { "id": 1, "url": "https://patches.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1460658834-10737-1-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/12085/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/12085/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 5CF21475E;\n\tThu, 14 Apr 2016 20:34:07 +0200 (CEST)", "from mail-wm0-f45.google.com (mail-wm0-f45.google.com\n\t[74.125.82.45]) by dpdk.org (Postfix) with ESMTP id 340AB475D\n\tfor <dev@dpdk.org>; Thu, 14 Apr 2016 20:34:06 +0200 (CEST)", "by mail-wm0-f45.google.com with SMTP id v188so708966wme.1\n\tfor <dev@dpdk.org>; Thu, 14 Apr 2016 11:34:06 -0700 (PDT)", "from XPS13.localdomain (245.111.75.86.rev.sfr.net. [86.75.111.245])\n\tby smtp.gmail.com with ESMTPSA id\n\t20sm7821143wmv.4.2016.04.14.11.34.04\n\t(version=TLSv1/SSLv3 cipher=OTHER);\n\tThu, 14 Apr 2016 11:34:05 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id;\n\tbh=+ZsP48+gR11tOdrjFDz8fE2ZO+WMfkucDeYaqb1fmXA=;\n\tb=VSRZoes9+CwM5RECqaCURE/Qi4A7H6L9hRhZyvT6zf6vb7InBPRfBPBHnlDX0iDzLu\n\tKjg8/A1dpHcu03WvXc+TECIEbLtDe286DmEtGTKpvfexSOnNk6KjXPEnVShY5XLH/em9\n\t2glaLCFIghTyOas87HDUonozpSeRnkKZ23OIVxtiOTBv1iGSIVou305qZYHjNuvOOeOH\n\tfIDuKwa2xYe9PNisb3v4eC3WlKFoZv+QjqeOGDdJbsfv7By6MIh8PIDWy20LstI956OH\n\tMngTYodu04NoMamogxqhs6UD7uIl5vQSb7yQkmQYTSoBvO0ZStwcK2lbOYwI4D89cUQk\n\tlHJg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=+ZsP48+gR11tOdrjFDz8fE2ZO+WMfkucDeYaqb1fmXA=;\n\tb=NdjkOqNviiHtNpuj5vcqrHrko7EblVszwxVrr0n4mwGBpU87I//lyFCBPCa8CVOycQ\n\taJtLQcAYWHVYRPLdurs64EocDaOq2Z1/QKFrpfL8xZeacnvVLItUIpjWxwEZ0L/JFepw\n\t4pJUaT7WxxZCncksTf9HokMp6Re8Z9yFg4sRIfllomXPpY8C0SS+C81riCpCrgrN1bO8\n\tG8IA2OEQLq8CiYo5oeWek302FFnr9n8aLTUtfmhlcXhnxEUvEI6bssOo76NWzLRgmCyy\n\toPEBll0MbhPCB8At6PTaFXEvIs+jTy57TqiqTKAkRgVD4VfEjd76Obnq3J65D2YP/0bg\n\trNOA==", "X-Gm-Message-State": "AOPr4FUCSDfU4orV2yOljcXGFBo6Z4IHnF+FuXLPVw+yPoKcfBGZGPqMT04K6Ayq+WsfOxRI", "X-Received": "by 10.194.227.1 with SMTP id rw1mr17194113wjc.62.1460658845967; \n\tThu, 14 Apr 2016 11:34:05 -0700 (PDT)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "roy.fan.zhang@intel.com", "Cc": "dev@dpdk.org, cristian.dumitrescu@intel.com, jasvinder.singh@intel.com", "Date": "Thu, 14 Apr 2016 20:33:54 +0200", "Message-Id": "<1460658834-10737-1-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.7.0", "Subject": "[dpdk-dev] [PATCH] port: bump ABI for pcap file support", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Support of PCAP file has been added to rte_port in release 16.04\nas NEXT_ABI. It is in the standard ABI of the release 16.07.\n\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n doc/guides/rel_notes/deprecation.rst | 5 -----\n doc/guides/rel_notes/release_16_07.rst | 5 ++++-\n examples/ip_pipeline/init.c | 4 ----\n lib/librte_port/Makefile | 2 +-\n lib/librte_port/rte_port_source_sink.c | 14 --------------\n lib/librte_port/rte_port_source_sink.h | 3 ---\n 6 files changed, 5 insertions(+), 28 deletions(-)", "diff": "diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst\nindex 327fc2b..a3fdbb1 100644\n--- a/doc/guides/rel_notes/deprecation.rst\n+++ b/doc/guides/rel_notes/deprecation.rst\n@@ -79,11 +79,6 @@ Deprecation Notices\n modification of the API of rte_mempool_obj_iter(), implying a breakage\n of the ABI.\n \n-* ABI changes are planned for struct rte_port_source_params in order to\n- support PCAP file reading feature. The release 16.04 contains this ABI\n- change wrapped by RTE_NEXT_ABI macro. Release 16.07 will contain this\n- change, and no backwards compatibility is planned.\n-\n * A librte_vhost public structures refactor is planned for DPDK 16.07\n that requires both ABI and API change.\n The proposed refactor would expose DPDK vhost dev to applications as\ndiff --git a/doc/guides/rel_notes/release_16_07.rst b/doc/guides/rel_notes/release_16_07.rst\nindex 701e827..001888f 100644\n--- a/doc/guides/rel_notes/release_16_07.rst\n+++ b/doc/guides/rel_notes/release_16_07.rst\n@@ -94,6 +94,9 @@ ABI Changes\n the previous releases and made in this release. Use fixed width quotes for\n ``rte_function_names`` or ``rte_struct_names``. Use the past tense.\n \n+* The ``rte_port_source_params`` structure has new fields to support PCAP file.\n+ It was already in release 16.04 with ``RTE_NEXT_ABI`` flag.\n+\n \n Shared Library Versions\n -----------------------\n@@ -123,7 +126,7 @@ The libraries prepended with a plus sign were incremented in this version.\n librte_pipeline.so.3\n librte_pmd_bond.so.1\n librte_pmd_ring.so.2\n- librte_port.so.2\n+ + librte_port.so.3\n librte_power.so.1\n librte_reorder.so.1\n librte_ring.so.1\ndiff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c\nindex 83422e8..02351f6 100644\n--- a/examples/ip_pipeline/init.c\n+++ b/examples/ip_pipeline/init.c\n@@ -1221,8 +1221,6 @@ static void app_pipeline_params_get(struct app_params *app,\n \t\t\tout->type = PIPELINE_PORT_IN_SOURCE;\n \t\t\tout->params.source.mempool = app->mempool[mempool_id];\n \t\t\tout->burst_size = app->source_params[in->id].burst;\n-\n-#ifdef RTE_NEXT_ABI\n \t\t\tif (app->source_params[in->id].file_name\n \t\t\t\t!= NULL) {\n \t\t\t\tout->params.source.file_name = strdup(\n@@ -1237,8 +1235,6 @@ static void app_pipeline_params_get(struct app_params *app,\n \t\t\t\t\tapp->source_params[in->id].\n \t\t\t\t\tn_bytes_per_pkt;\n \t\t\t}\n-#endif\n-\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tbreak;\ndiff --git a/lib/librte_port/Makefile b/lib/librte_port/Makefile\nindex 2c0ccbe..d4de5af 100644\n--- a/lib/librte_port/Makefile\n+++ b/lib/librte_port/Makefile\n@@ -44,7 +44,7 @@ CFLAGS += $(WERROR_FLAGS)\n \n EXPORT_MAP := rte_port_version.map\n \n-LIBABIVER := 2\n+LIBABIVER := 3\n \n #\n # all source are stored in SRCS-y\ndiff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c\nindex 056c975..4cad710 100644\n--- a/lib/librte_port/rte_port_source_sink.c\n+++ b/lib/librte_port/rte_port_source_sink.c\n@@ -38,17 +38,11 @@\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n \n-#ifdef RTE_NEXT_ABI\n-\n #ifdef RTE_PORT_PCAP\n #include <rte_ether.h>\n #include <pcap.h>\n #endif\n \n-#else\n-#undef RTE_PORT_PCAP\n-#endif\n-\n #include \"rte_port_source_sink.h\"\n \n /*\n@@ -81,8 +75,6 @@ struct rte_port_source {\n \tuint32_t pkt_index;\n };\n \n-#ifdef RTE_NEXT_ABI\n-\n #ifdef RTE_PORT_PCAP\n \n static int\n@@ -232,8 +224,6 @@ error_exit:\n \n #endif /* RTE_PORT_PCAP */\n \n-#endif /* RTE_NEXT_ABI */\n-\n static void *\n rte_port_source_create(void *params, int socket_id)\n {\n@@ -258,8 +248,6 @@ rte_port_source_create(void *params, int socket_id)\n \t/* Initialization */\n \tport->mempool = (struct rte_mempool *) p->mempool;\n \n-#ifdef RTE_NEXT_ABI\n-\n \tif (p->file_name) {\n \t\tint status = PCAP_SOURCE_LOAD(port, p->file_name,\n \t\t\tp->n_bytes_per_pkt, socket_id);\n@@ -270,8 +258,6 @@ rte_port_source_create(void *params, int socket_id)\n \t\t}\n \t}\n \n-#endif\n-\n \treturn port;\n }\n \ndiff --git a/lib/librte_port/rte_port_source_sink.h b/lib/librte_port/rte_port_source_sink.h\nindex 917abe4..4db8a8a 100644\n--- a/lib/librte_port/rte_port_source_sink.h\n+++ b/lib/librte_port/rte_port_source_sink.h\n@@ -53,7 +53,6 @@ extern \"C\" {\n struct rte_port_source_params {\n \t/** Pre-initialized buffer pool */\n \tstruct rte_mempool *mempool;\n-#ifdef RTE_NEXT_ABI\n \n \t/** The full path of the pcap file to read packets from */\n \tchar *file_name;\n@@ -62,8 +61,6 @@ struct rte_port_source_params {\n \t * if it is bigger than packet size, the generated packets\n \t * will contain the whole packet */\n \tuint32_t n_bytes_per_pkt;\n-\n-#endif\n };\n \n /** source port operations */\n", "prefixes": [ "dpdk-dev" ] }