This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, api-next has been updated via ced550922123b8fd8151d98490a78766a0bcf847 (commit) via 6881620135a179911a5839d4be97423a8d80e5ab (commit) via e118bc6c2084c306968cb5d947649eca4a8029ba (commit) via f55bd7c695d142cfb2306b5f156bc401ba11473b (commit) via 6e09adf147ad3ccb4df1cc988d20d31c3246d2aa (commit) via 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 (commit) via 37b4da286aeff3321084e62045d0b3ab10c07399 (commit) via e02d9f43ea8675db5ad5202ef605e6dd8014abb5 (commit) via 442638dd1514f8dda882d48fbb1ebc88ef9af430 (commit) via c6573eb58dcf0d0316ada1e91ae1993100c4d559 (commit) via aab8ff7237c117e9ed63a8b7d595aca7f5665ff9 (commit) via c15a810b7a47f2e07200f83aa534163ca06e2b16 (commit) via aef79483e3d3e517b4cf2d71b3c22985326532c0 (commit) via f49d7bad7316ed0be807f37984908fc37da68004 (commit) via 811281a22b6274b7f41b926a9cfbe09e48a366bd (commit) from 630d8422564ebf4991b468cb38a29e9483fc2ec2 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit ced550922123b8fd8151d98490a78766a0bcf847 Merge: 630d8422 68816201 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Mon Dec 11 18:30:10 2017 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --cc .travis.yml index e0eaf5de,25c2d0a5..564f7b74 --- a/.travis.yml +++ b/.travis.yml @@@ -70,9 -69,9 +70,10 @@@ cache env: - CONF="" - CONF="--disable-abi-compat" + - CONF="--enable-deprecated" - CONF="--enable-schedule-sp" - CONF="--enable-schedule-iquery" + - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" diff --cc example/generator/odp_generator.c index 81d95466,861e9836..b1827e9c --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@@ -32,8 -33,10 +33,11 @@@ #define APPL_MODE_UDP 0 /**< UDP mode */ #define APPL_MODE_PING 1 /**< ping mode */ #define APPL_MODE_RCV 2 /**< receive mode */ +#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+ #define PING_THR_TX 0 + #define PING_THR_RX 1 + /** print appl mode */ #define PRINT_APPL_MODE(x) printf("%s(%i)\n", #x, (x))
@@@ -517,18 -532,26 +534,32 @@@ static int create_pktio(const char *dev return -1; } odp_pktio_config_init(&itf->config); - itf->config.pktin.bit.ipv4_chksum = capa.config.pktin.bit.ipv4_chksum; - itf->config.pktin.bit.udp_chksum = capa.config.pktin.bit.udp_chksum; - itf->config.pktin.bit.drop_ipv4_err = - capa.config.pktin.bit.drop_ipv4_err; - itf->config.pktin.bit.drop_udp_err = capa.config.pktin.bit.drop_udp_err; - - itf->config.pktout.bit.ipv4_chksum_ena = - capa.config.pktout.bit.ipv4_chksum_ena; - itf->config.pktout.bit.udp_chksum_ena = - capa.config.pktout.bit.udp_chksum_ena; - itf->config.pktout.bit.ipv4_chksum = capa.config.pktout.bit.ipv4_chksum; - itf->config.pktout.bit.udp_chksum = capa.config.pktout.bit.udp_chksum; + if (args->appl.csum) { + itf->config.pktin.bit.ipv4_chksum = + capa.config.pktin.bit.ipv4_chksum; + itf->config.pktin.bit.udp_chksum = + capa.config.pktin.bit.udp_chksum; + itf->config.pktin.bit.drop_ipv4_err = + capa.config.pktin.bit.drop_ipv4_err; + itf->config.pktin.bit.drop_udp_err = + capa.config.pktin.bit.drop_udp_err; + ++ itf->config.pktout.bit.ipv4_chksum_ena = ++ capa.config.pktout.bit.ipv4_chksum_ena; ++ itf->config.pktout.bit.udp_chksum_ena = ++ capa.config.pktout.bit.udp_chksum_ena; + itf->config.pktout.bit.ipv4_chksum = + capa.config.pktout.bit.ipv4_chksum; + itf->config.pktout.bit.udp_chksum = + capa.config.pktout.bit.udp_chksum; + } else { /* explicit disable */ + itf->config.pktin.bit.ipv4_chksum = 0; + itf->config.pktin.bit.udp_chksum = 0; ++ itf->config.pktout.bit.ipv4_chksum_ena = 0; ++ itf->config.pktout.bit.udp_chksum_ena = 0; + itf->config.pktout.bit.ipv4_chksum = 0; + itf->config.pktout.bit.udp_chksum = 0; + }
if (odp_pktio_config(itf->pktio, &itf->config)) { EXAMPLE_ERR("Error: Failed to set interface configuration %s\n", @@@ -792,10 -819,11 +827,11 @@@ static int gen_recv_thread(void *arg odp_packet_t pkts[MAX_RX_BURST], pkt; odp_event_t events[MAX_RX_BURST]; int pkt_cnt, ev_cnt, i; - interface_t *itfs, *itf; + odp_packet_chksum_status_t csum_status;
+ (void)arg; thr = odp_thread_id(); + thr_args = (thread_args_t *)arg; - itfs = thr_args->rx.ifs;
printf(" [%02i] created mode: RECEIVE\n", thr); odp_barrier_wait(&barrier); diff --cc platform/linux-generic/Makefile.am index 8f783463,bbe6a21c..4371e7a9 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -16,8 -13,13 +16,14 @@@ AM_CPPFLAGS += -DSYSCONFDIR="@sysconf AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) +AM_CPPFLAGS += $(LIBCONFIG_CFLAGS)
+ if PKTIO_DPDK + if ARCH_IS_X86 + AM_CFLAGS += -msse4.2 + endif + endif + odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ include/odp/visibility_begin.h \
-----------------------------------------------------------------------
Summary of changes: .gitignore | 1 + .travis.yml | 60 +++++-- example/generator/odp_generator.c | 322 ++++++++++++++++++++++------------ m4/odp_dpdk.m4 | 76 ++++++++ platform/linux-generic/Makefile.am | 6 + platform/linux-generic/m4/odp_dpdk.m4 | 57 +++--- platform/linux-generic/pktio/dpdk.c | 30 +++- 7 files changed, 388 insertions(+), 164 deletions(-) create mode 100644 m4/odp_dpdk.m4
hooks/post-receive
-
git＠git-us.linaro.org