d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

port: bump ABI for pcap file support

Browse Source 
Support of PCAP file has been added to rte_port in release 16.04
as NEXT_ABI. It is in the standard ABI of the release 16.07.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
This commit is contained in:
Thomas Monjalon 2016-04-14 19:15:13 +02:00
parent e888dffdcb
commit 76653f3e11
6 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/guides/rel_notes/deprecation.rst
View File

@ -79,11 +79,6 @@ Deprecation Notices
modification of the API of rte_mempool_obj_iter(), implying a breakage
of the ABI.
* ABI changes are planned for struct rte_port_source_params in order to
support PCAP file reading feature. The release 16.04 contains this ABI
change wrapped by RTE_NEXT_ABI macro. Release 16.07 will contain this
change, and no backwards compatibility is planned.
* A librte_vhost public structures refactor is planned for DPDK 16.07
that requires both ABI and API change.
The proposed refactor would expose DPDK vhost dev to applications as

5
doc/guides/rel_notes/release_16_07.rst
View File

@ -94,6 +94,9 @@ ABI Changes
the previous releases and made in this release. Use fixed width quotes for
``rte_function_names`` or ``rte_struct_names``. Use the past tense.
* The ``rte_port_source_params`` structure has new fields to support PCAP file.
It was already in release 16.04 with ``RTE_NEXT_ABI`` flag.
Shared Library Versions
-----------------------
@ -123,7 +126,7 @@ The libraries prepended with a plus sign were incremented in this version.
librte_pipeline.so.3
librte_pmd_bond.so.1
librte_pmd_ring.so.2
librte_port.so.2
+ librte_port.so.3
librte_power.so.1
librte_reorder.so.1
librte_ring.so.1

4
examples/ip_pipeline/init.c
View File

@ -1221,8 +1221,6 @@ static void app_pipeline_params_get(struct app_params *app,
out->type = PIPELINE_PORT_IN_SOURCE;
out->params.source.mempool = app->mempool[mempool_id];
out->burst_size = app->source_params[in->id].burst;
#ifdef RTE_NEXT_ABI
if (app->source_params[in->id].file_name
!= NULL) {
out->params.source.file_name = strdup(
@ -1237,8 +1235,6 @@ static void app_pipeline_params_get(struct app_params *app,
app->source_params[in->id].
n_bytes_per_pkt;
}
#endif
break;
default:
break;

2
lib/librte_port/Makefile
View File

@ -44,7 +44,7 @@ CFLAGS += $(WERROR_FLAGS)
EXPORT_MAP := rte_port_version.map
LIBABIVER := 2
LIBABIVER := 3
#
# all source are stored in SRCS-y

14
lib/librte_port/rte_port_source_sink.c
View File

@ -38,17 +38,11 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#ifdef RTE_NEXT_ABI
#ifdef RTE_PORT_PCAP
#include <rte_ether.h>
#include <pcap.h>
#endif
#else
#undef RTE_PORT_PCAP
#endif
#include "rte_port_source_sink.h"
/*
@ -81,8 +75,6 @@ struct rte_port_source {
uint32_t pkt_index;
};
#ifdef RTE_NEXT_ABI
#ifdef RTE_PORT_PCAP
static int
@ -232,8 +224,6 @@ error_exit:
#endif /* RTE_PORT_PCAP */
#endif /* RTE_NEXT_ABI */
static void *
rte_port_source_create(void *params, int socket_id)
{
@ -258,8 +248,6 @@ rte_port_source_create(void *params, int socket_id)
/* Initialization */
port->mempool = (struct rte_mempool *) p->mempool;
#ifdef RTE_NEXT_ABI
if (p->file_name) {
int status = PCAP_SOURCE_LOAD(port, p->file_name,
p->n_bytes_per_pkt, socket_id);
@ -270,8 +258,6 @@ rte_port_source_create(void *params, int socket_id)
}
}
#endif
return port;
}

3
lib/librte_port/rte_port_source_sink.h
View File

@ -53,7 +53,6 @@ extern "C" {
struct rte_port_source_params {
/** Pre-initialized buffer pool */
struct rte_mempool *mempool;
#ifdef RTE_NEXT_ABI
/** The full path of the pcap file to read packets from */
char *file_name;
@ -62,8 +61,6 @@ struct rte_port_source_params {
* if it is bigger than packet size, the generated packets
* will contain the whole packet */
uint32_t n_bytes_per_pkt;
#endif
};
/** source port operations */