From patchwork Fri Jul 14 09:59:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 107757 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp680203qge; Fri, 14 Jul 2017 03:01:05 -0700 (PDT) X-Received: by 10.55.69.66 with SMTP id s63mr10292278qka.229.1500026465745; Fri, 14 Jul 2017 03:01:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500026465; cv=none; d=google.com; s=arc-20160816; b=0NN7A5US6sa5H+zsugXcAMhex7DWcil/XNeralKHiizdUatDR/EBPAedDUaRUc6uN8 vyvWZ9jtnRizI4D0GuW19ZkizRbsPMzzJBengNol7zGy8Fhtcbyv8Biuo7KSItG6gfMo mOogkMJBraHhE7ty6hBZoykDfVQ/gP0TYsbm1FgDGuZ7d0PpWe/TmzTR7eRnxMN0sWoc 1vVVQJzBdH45+YMGAw3hxyTpJotOluHLT20Y586J1xqemmt2/EjRPMN8CufbcaHUOXts Az5mbgaqYNPVH/0C4TtxkpnN1nv3S7cGfo9k6x0DCyNsUvTr16zmQRRz/c/TJWa1c+oB dgmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=LIbt8f1wytO0cVeJ+Ja+S3mogfaAIKvE+fAhT7cdbjI=; b=LkLnfs3LBzyig7I798gtqpg6VMFk22LZ0HdkyYqcnfZMQdsTioPkmhSgVMMuTg1I0u n1Nb1WfYry3igS2rApPPZwF42y9bxNEQ5KDQSVbYgYe8rSrgFsXdgV6xQpjyheegXzcG udv9hLoiik8I6K9E8X7JjMpHIi3XT5wI+XJDWEZb4ldaIhofFNYuEpcif0BigfT4kVre F/wap/SSbvLTzUYSKSk4hQF1QYzHJO5QkvK2+FHsiPI21zUMkrUEVUv6IfwW3WMa4Sp+ qn51/F/02TINfst9gOaQM0vBHwgHeiJMFe5w0mkKcVKtb7pk734aJEBPNTT1gWUy7x1I H31Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j54si7420442qtc.20.2017.07.14.03.01.05; Fri, 14 Jul 2017 03:01:05 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 700E060805; Fri, 14 Jul 2017 10:01:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 055EA60870; Fri, 14 Jul 2017 10:00:29 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E225160663; Fri, 14 Jul 2017 10:00:24 +0000 (UTC) Received: from forward4j.cmail.yandex.net (forward4j.cmail.yandex.net [5.255.227.22]) by lists.linaro.org (Postfix) with ESMTPS id 63BED60663 for ; Fri, 14 Jul 2017 10:00:23 +0000 (UTC) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::27]) by forward4j.cmail.yandex.net (Yandex) with ESMTP id 8FCEB20F8C for ; Fri, 14 Jul 2017 13:00:21 +0300 (MSK) Received: from smtp3o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3o.mail.yandex.net (Yandex) with ESMTP id 929232940C4D for ; Fri, 14 Jul 2017 13:00:19 +0300 (MSK) Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id eQMe5PKgI5-0JoCCPC1; Fri, 14 Jul 2017 13:00:19 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 14 Jul 2017 12:59:57 +0300 Message-Id: <1500026405-14155-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> References: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 77 Subject: [lng-odp] [PATCH v1 1/9] bug: linux-generic: add syntax to allow newer clang to compile odp X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bill Fischofer Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2942 by adding casts needed to avoid compilation failures when using clang 4.0.0 included in Ubuntu 17.04, which is stricter than clang 3.8.1 which is in Ubuntu 16.10. Signed-off-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 77 (muvarov:monarch_lts) ** https://github.com/Linaro/odp/pull/77 ** Patch: https://github.com/Linaro/odp/pull/77.patch ** Base sha: 0c15c40db40834f1df217191c4b6a06303ab0872 ** Merge commit sha: f06a7319a03ad565ced026ddc76a66164aa93782 **/ helper/chksum.c | 6 +++--- platform/linux-generic/odp_packet_flags.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helper/chksum.c b/helper/chksum.c index 8f188814..772abcd2 100644 --- a/helper/chksum.c +++ b/helper/chksum.c @@ -122,7 +122,7 @@ static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, * should come from the udp header, unlike for TCP where is * derived. */ l4_len = odp_be_to_cpu_16(udp_hdr_ptr->length); - pkt_chksum_ptr = &udp_hdr_ptr->chksum; + pkt_chksum_ptr = (uint16_t *)(void *)&udp_hdr_ptr->chksum; pkt_chksum_offset = l4_offset + offsetof(odph_udphdr_t, chksum); } else if (odp_packet_has_tcp(odp_pkt)) { tcp_hdr_ptr = (odph_tcphdr_t *)l4_ptr; @@ -133,7 +133,7 @@ static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, tcp_hdr_ptr = &tcp_hdr; } - pkt_chksum_ptr = &tcp_hdr_ptr->cksm; + pkt_chksum_ptr = (uint16_t *)(void *)&tcp_hdr_ptr->cksm; pkt_chksum_offset = l4_offset + offsetof(odph_tcphdr_t, cksm); is_tcp = true; } else { @@ -197,7 +197,7 @@ static inline int odph_process_l3_hdr(odp_packet_t odp_pkt, ipv4_hdr_ptr = &ipv4_hdr; } - addrs_ptr = (uint16_t *)&ipv4_hdr_ptr->src_addr; + addrs_ptr = (uint16_t *)(void *)&ipv4_hdr_ptr->src_addr; addrs_len = 2 * ODPH_IPV4ADDR_LEN; protocol = ipv4_hdr_ptr->proto; l3_len = odp_be_to_cpu_16(ipv4_hdr_ptr->tot_len); diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index b88324c1..fc0bc1d2 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -18,7 +18,7 @@ odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \ if (packet_parse_not_complete(pkt_hdr)) \ packet_parse_full(pkt_hdr); \ - pkt_hdr->p.x = v & 1; \ + pkt_hdr->p.x = (v) & 1; \ } while (0) int odp_packet_has_error(odp_packet_t pkt) From patchwork Fri Jul 14 10:00:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 107758 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp683660qge; Fri, 14 Jul 2017 03:03:38 -0700 (PDT) X-Received: by 10.55.19.152 with SMTP id 24mr9888988qkt.78.1500026617988; Fri, 14 Jul 2017 03:03:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500026617; cv=none; d=google.com; s=arc-20160816; b=y8vl+NxED061tfB11N/O1FjoMXKqntdaQsbbrLCEcY/w5VemQhNc9ptHHHy0EmbSEM CcmAhv9mPdYnbolAvMGiIlUGeldNiT0o8nSLKZTp4ovIVx5kuGYWt6MkKVua9h1j0Nu0 WQsGgGteuvpdPK9lSmgjfEjBEp5CMScmNSSPC4RGACwWV9IK8E3FxqF3wH3KWQDklggf Du7rlkgBCwF+QdhmFVne7GV0SFkcgCAdSZBCNba8VJMH2f+bb6WC1S8GSPWRoFzYLHRt f2lv+GfcZvHprNFkzmU4Gl7y0/gDRw+zXaSlil2+nsuCi787vwKGbdkEKJ5s9u/rVXDr KRuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=sewthqITlriHXyAnQu5+A/kfbzQF72Y3hBIYfKvV/B8=; b=cxsEi04huplAu88zrU+9XnCsw8/W5LLHB3Adh9Qw7ZAacuMWWZYQh8UxohwxL9e9WR kIGiQnFe5Jj4JXglxVw/IVBRmGvHcCaP9opwF7/2UCoOXYzrKEqZc3tx7U4wZm/VXf53 oyCiDUjPDuidOgSNJFtwE4Qsq732AoccpdlW9xk3/o8fPgNjLz8K2kagQHfm/eg/4c7U 9XuA1JoSqQTL4d5MVI0nlLvR4bLozGFE/OG6Y1Dy+iijcMIjLZsD1dDXoASeiQjUvLFG LqbBGOyswNq11slbyMxpNYYk+fXHkwvfzjAPzZ5Ln05qZvEB8TBbIfNyfCsg38tFQ92T lDWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t12si7607085qti.95.2017.07.14.03.03.37; Fri, 14 Jul 2017 03:03:37 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id AC8806072E; Fri, 14 Jul 2017 10:03:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 1357060B05; Fri, 14 Jul 2017 10:00:51 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CAEF3609FF; Fri, 14 Jul 2017 10:00:37 +0000 (UTC) Received: from forward4j.cmail.yandex.net (forward4j.cmail.yandex.net [5.255.227.22]) by lists.linaro.org (Postfix) with ESMTPS id 9B06360663 for ; Fri, 14 Jul 2017 10:00:27 +0000 (UTC) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::27]) by forward4j.cmail.yandex.net (Yandex) with ESMTP id 9AC3E21017 for ; Fri, 14 Jul 2017 13:00:26 +0300 (MSK) Received: from smtp3o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3o.mail.yandex.net (Yandex) with ESMTP id 2A61C2940F05 for ; Fri, 14 Jul 2017 13:00:24 +0300 (MSK) Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id eQMe5PKgI5-0NoaVYpk; Fri, 14 Jul 2017 13:00:24 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 14 Jul 2017 13:00:00 +0300 Message-Id: <1500026405-14155-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> References: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 77 Subject: [lng-odp] [PATCH v1 4/9] configure: the version cannot use a script X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Mike Holmes Use of a script in the autotools breaks github CI Define the API version in configure and reuse it in the code Benefits: removes dependence on scripts to build removes scripts and the make file from odp/scripts removes generated .scmversion file places api versioning right next to lib versioning in the configure.ac allows github to auto build odp repos Signed-off-by: Mike Holmes Reviewed-by: Brian Brooks Signed-off-by: Maxim Uvarov --- /** Email created from pull request 77 (muvarov:monarch_lts) ** https://github.com/Linaro/odp/pull/77 ** Patch: https://github.com/Linaro/odp/pull/77.patch ** Base sha: 0c15c40db40834f1df217191c4b6a06303ab0872 ** Merge commit sha: f06a7319a03ad565ced026ddc76a66164aa93782 **/ .gitignore | 1 - .scmversion | 1 + Makefile.am | 5 ++--- configure.ac | 21 +++++++++++++++++++-- include/odp/api/spec/.gitignore | 1 + include/odp/api/spec/{version.h => version.h.in} | 6 +++--- platform/Makefile.inc | 3 +-- scripts/Makefile.am | 1 - scripts/get_impl_str.sh | 11 ----------- 9 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 .scmversion create mode 100644 include/odp/api/spec/.gitignore rename include/odp/api/spec/{version.h => version.h.in} (93%) delete mode 100644 scripts/Makefile.am delete mode 100755 scripts/get_impl_str.sh diff --git a/.gitignore b/.gitignore index d4e7d02e..fbc0eab9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ .deps/ .dirstamp .libs/ -.scmversion CUnit-Memory-Dump.xml ID Makefile diff --git a/.scmversion b/.scmversion new file mode 100644 index 00000000..dc7bf3df --- /dev/null +++ b/.scmversion @@ -0,0 +1 @@ +1.11.0.1_monarch.git10.g7106d8b0 \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 625748af..2a9a658d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,9 +11,8 @@ SUBDIRS = @platform_with_platform@ \ test \ helper/test \ doc \ - example \ - scripts + example @DX_RULES@ -EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README .scmversion +EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README diff --git a/configure.ac b/configure.ac index 08cc375d..efb9f7ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,23 @@ AC_PREREQ([2.5]) -AC_INIT([OpenDataPlane], m4_esyscmd_s(./scripts/git_hash.sh .), [lng-odp@lists.linaro.org]) +########################################################################## +# Set correct API version +########################################################################## +m4_define([odpapi_generation_version], [1]) +m4_define([odpapi_major_version], [11]) +m4_define([odpapi_minor_version], [0]) +m4_define([odpapi_point_version], [1]) +m4_define([odpapi_version], + [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) +AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp@lists.linaro.org]) + +ODP_VERSION_API_GENERATION=odpapi_generation_version +AC_SUBST(ODP_VERSION_API_GENERATION) +ODP_VERSION_API_MAJOR=odpapi_major_version +AC_SUBST(ODP_VERSION_API_MAJOR) +ODP_VERSION_API_MINOR=odpapi_minor_version +AC_SUBST(ODP_VERSION_API_MINOR) +AC_CONFIG_FILES([include/odp/api/spec/version.h]) + AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects]) AC_CONFIG_SRCDIR([helper/config.h.in]) AM_CONFIG_HEADER([helper/config.h]) @@ -267,7 +285,6 @@ AC_CONFIG_FILES([Makefile helper/test/Makefile pkgconfig/libodp-linux.pc pkgconfig/libodphelper-linux.pc - scripts/Makefile ]) AC_SEARCH_LIBS([timer_create],[rt posix4]) diff --git a/include/odp/api/spec/.gitignore b/include/odp/api/spec/.gitignore new file mode 100644 index 00000000..67020331 --- /dev/null +++ b/include/odp/api/spec/.gitignore @@ -0,0 +1 @@ +version.h diff --git a/include/odp/api/spec/version.h b/include/odp/api/spec/version.h.in similarity index 93% rename from include/odp/api/spec/version.h rename to include/odp/api/spec/version.h.in index 1ddb9cea..4b16dcc5 100644 --- a/include/odp/api/spec/version.h +++ b/include/odp/api/spec/version.h.in @@ -37,7 +37,7 @@ extern "C" { * very significant changes to the API. APIs with different * versions are likely not backward compatible. */ -#define ODP_VERSION_API_GENERATION 1 +#define ODP_VERSION_API_GENERATION @ODP_VERSION_API_GENERATION@ /** * ODP API major version @@ -45,7 +45,7 @@ extern "C" { * Introduction of major new features or changes. APIs with different major * versions are likely not backward compatible. */ -#define ODP_VERSION_API_MAJOR 11 +#define ODP_VERSION_API_MAJOR @ODP_VERSION_API_MAJOR@ /** * ODP API minor version @@ -54,7 +54,7 @@ extern "C" { * to the API. For an API with common generation and major version, but with * different minor numbers the two versions are backward compatible. */ -#define ODP_VERSION_API_MINOR 0 +#define ODP_VERSION_API_MINOR @ODP_VERSION_API_MINOR@ /** * ODP API version string diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 053bd121..4a0e68b7 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -10,8 +10,7 @@ lib_LTLIBRARIES = $(LIB)/libodp-linux.la AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' -GIT_DESC = `$(top_srcdir)/scripts/get_impl_str.sh $(top_srcdir)` -AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)" +AM_CFLAGS += "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) #The implementation will need to retain the deprecated implementation diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 189b3efc..00000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = get_impl_str.sh git_hash.sh diff --git a/scripts/get_impl_str.sh b/scripts/get_impl_str.sh deleted file mode 100755 index d765a531..00000000 --- a/scripts/get_impl_str.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [ -z ${1} ]; then - echo "should be called with a path" - exit -fi -ROOTDIR=${1} - -CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git} - -echo -n "'${CUSTOM_STR}' ($(cat ${ROOTDIR}/.scmversion))" From patchwork Fri Jul 14 10:00:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 107759 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp685574qge; Fri, 14 Jul 2017 03:05:18 -0700 (PDT) X-Received: by 10.237.42.226 with SMTP id t89mr11332508qtd.73.1500026718734; Fri, 14 Jul 2017 03:05:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500026718; cv=none; d=google.com; s=arc-20160816; b=KcpYN+R7H24wvKO2gCArEfeUGHv9YDG6iR+MpD9zwm2qMENK9S/o3zX8Szwh7eJ2EB OIlLhBsSGngFZKIDxTEtXhJpruzM4/TnC+tO7cqGGBTE0CZ3JvAZyozYCWbPMQEXGVjs WLfKCNa2p3AjzSRI9EUoj2SBZd58vg1ja13Dlk2HXj+SMphtPSmcOxkLVJGECJ0Ga8Fi T07ZCWP4DZvvhhaPbQvYhptO7l5CBoUp4oI2BMedNfRln0Ea+0zuVW4erIBM0i4ZypYk Q0XKTF1ZRF1B3vo2RMbqXigtlY0chqgTwBiJTQahlYlae8uI2XrP0axT2iwKMObzoX2k epkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=OUTGBg3r4/r5W2M5SlvK+4d043TQbI2wLLfK/XIyKIw=; b=Mb9Q/uR9+RMmwHc3zIQ18ImIFXoSFA8Wx6mQMy0K0QdAFTNMPXjSzCttuWkt3P8QU9 iZSut7DSCKfFs3v8qg99GOnrI2ZP/Hx/xVwkrPbEnG1H64dyM3q84+kIy5nOc6ncCL5L cMuOFYE6/fexAmFTrIyLxApYM98fXFThUN9Z4uQtjtv0Xn0NqXGikGvGtoE0BXS10h9Z 98ERc+DeHQoYwNWGUe/lOYhQNANz53maxdNlZGAoo9ry3BO4HW0N2y4s3aIYZYA6qCUJ AHOnHMUsVTUMvU40ZJA8+N+TYFkR2jDVFg03uIT632w5QYxsV+JMI9I7r41zZHVn38OK qdWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r5si7484900qte.192.2017.07.14.03.05.18; Fri, 14 Jul 2017 03:05:18 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 56418608BB; Fri, 14 Jul 2017 10:05:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9F13960805; Fri, 14 Jul 2017 10:01:11 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0439A65BE2; Fri, 14 Jul 2017 10:01:05 +0000 (UTC) Received: from forward4m.cmail.yandex.net (forward4m.cmail.yandex.net [5.255.216.22]) by lists.linaro.org (Postfix) with ESMTPS id 45A1260805 for ; Fri, 14 Jul 2017 10:00:28 +0000 (UTC) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::27]) by forward4m.cmail.yandex.net (Yandex) with ESMTP id E3B1120D41 for ; Fri, 14 Jul 2017 13:00:26 +0300 (MSK) Received: from smtp3o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3o.mail.yandex.net (Yandex) with ESMTP id 7FCCF2940E2C for ; Fri, 14 Jul 2017 13:00:25 +0300 (MSK) Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id eQMe5PKgI5-0PoCAJoM; Fri, 14 Jul 2017 13:00:25 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 14 Jul 2017 13:00:01 +0300 Message-Id: <1500026405-14155-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> References: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 77 Subject: [lng-odp] [PATCH v1 5/9] configure: remove dependency of autoconf-archive X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov autoconf-archive is not available on some build environment Number of projects simple have local copy of this file. Do the same thing. Signed-off-by: Maxim Uvarov Reviewed-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 77 (muvarov:monarch_lts) ** https://github.com/Linaro/odp/pull/77 ** Patch: https://github.com/Linaro/odp/pull/77.patch ** Base sha: 0c15c40db40834f1df217191c4b6a06303ab0872 ** Merge commit sha: f06a7319a03ad565ced026ddc76a66164aa93782 **/ DEPENDENCIES | 5 ++-- m4/ax_check_compile_flag.m4 | 72 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/DEPENDENCIES b/DEPENDENCIES index e344826e..a5266c9e 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -8,14 +8,13 @@ Prerequisites for building the OpenDataPlane (ODP) API automake autoconf - autoconf-archive libtool On Debian/Ubuntu systems: - $ sudo apt-get install automake autoconf autoconf-archive libtool + $ sudo apt-get install automake autoconf libtool On CentOS/RedHat/Fedora systems: - $ sudo yum install automake autoconf autoconf-archive libtool + $ sudo yum install automake autoconf libtool 3. Required libraries diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 00000000..c3a8d695 --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,72 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS From patchwork Fri Jul 14 10:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 107760 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp686428qge; Fri, 14 Jul 2017 03:06:11 -0700 (PDT) X-Received: by 10.237.53.164 with SMTP id c33mr11496479qte.191.1500026771422; Fri, 14 Jul 2017 03:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500026771; cv=none; d=google.com; s=arc-20160816; b=UZL8UwDPo2Y8M92TQ7Hwv20d4hO4ELIzOT4ftXhnjOCrCnlIp4y6runDOgl/gI1ZHG MTKuTCx4s7IloZimEIbcQxmI4Ja6kgs2JSYBLWVqNGQQLLOLla6psFAHPoa3uQZuu+iR HggNvW/4wpxfBVpkYoHSx5yMeDAOiQcSB53oL+D7jWWEg45JjcyGVN0jKCKPc3MRayO2 MuSo+Ro6TwOrzc7p/b3pw7fC3Do3mwfPCPCFMFoP88EyMrje7XYqWLqHPSeZ5IAzQyXU v2pk9NdBx0c6i5cyU8mwbmglSCpitbZdJAY7UF5/8VbWm9qPrgnAbztAzY9tIA8PY/Df da9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=3EnUzqkVOg+RiEFWEQJ3Q0mL4Q4t18Rilg3rPhhK6r4=; b=kzWtd3G0lQ0AhqxT2s93sodJjBUeR9CE/E8jWiL5cvXZgzFpPLSuFOTwG1bt6laF6i aYVpmqGbLV+w7w1a0cYh6u+nlrH0gELdYsVPovLPtvDJHjtMHJ7KvKdeS8YHfRetCB76 X0nTjJ+bt6ePVM8J51eZaPQhsMBGqV1nthiA6zvrwTktFH62yMv+kKW2nlMHdWUdAwNS WhXnq9hOPS92NvVLQmNRH1CiQN9LR3IDvdxudyMs28+3TGE+oATmommNE//xUd09ybQx hY8e3zMqw9pdBm1SnS26wfkveoe1+/YBJsmK9SuSJj+YltfEuBLW+qt8+QRbjMd+6w97 vneA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b45si7313230qtc.320.2017.07.14.03.06.11; Fri, 14 Jul 2017 03:06:11 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 1E1EC60A13; Fri, 14 Jul 2017 10:06:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0028465BE3; Fri, 14 Jul 2017 10:01:14 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5AA7660870; Fri, 14 Jul 2017 10:01:07 +0000 (UTC) Received: from forward4j.cmail.yandex.net (forward4j.cmail.yandex.net [5.255.227.22]) by lists.linaro.org (Postfix) with ESMTPS id EED776081D for ; Fri, 14 Jul 2017 10:00:28 +0000 (UTC) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::27]) by forward4j.cmail.yandex.net (Yandex) with ESMTP id 0056B20D18 for ; Fri, 14 Jul 2017 13:00:28 +0300 (MSK) Received: from smtp3o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3o.mail.yandex.net (Yandex) with ESMTP id BDF792940ED3 for ; Fri, 14 Jul 2017 13:00:27 +0300 (MSK) Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id eQMe5PKgI5-0QoCnJo3; Fri, 14 Jul 2017 13:00:26 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 14 Jul 2017 13:00:02 +0300 Message-Id: <1500026405-14155-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> References: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 77 Subject: [lng-odp] [PATCH v1 6/9] configure.ac: do not trap if libatomic is not found X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov Idea if check was to detect if libatomic is needed or not, not trap configure on not case Fixes Linaro CI compilation for: gcc-linaro-5.3-2016.02-x86_64_arm-linux-gnueabih Signed-off-by: Maxim Uvarov Reviewed-by: Bill Fischofer --- /** Email created from pull request 77 (muvarov:monarch_lts) ** https://github.com/Linaro/odp/pull/77 ** Patch: https://github.com/Linaro/odp/pull/77.patch ** Base sha: 0c15c40db40834f1df217191c4b6a06303ab0872 ** Merge commit sha: f06a7319a03ad565ced026ddc76a66164aa93782 **/ platform/linux-generic/m4/configure.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 98885f5f..efa29e5e 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -65,7 +65,7 @@ AC_LINK_IFELSE( AC_CHECK_LIB( [atomic], [__atomic_exchange_16], [use_libatomic=yes], - [AC_MSG_FAILURE([cannot detect support for 128-bit atomics])]) + [AC_MSG_CHECKING([cannot detect support for 128-bit atomics])]) ]) if test "x$use_libatomic" = "xyes"; then From patchwork Fri Jul 14 10:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 107761 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp687576qge; Fri, 14 Jul 2017 03:07:16 -0700 (PDT) X-Received: by 10.200.51.235 with SMTP id d40mr10374398qtb.151.1500026836692; Fri, 14 Jul 2017 03:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500026836; cv=none; d=google.com; s=arc-20160816; b=zBRiqOmFuTm+ACKp6vxvjOhF446/v6zUdVx1r40GXTjacKy5yvU4rAh+cm2XvJB9bM 3s8V8PCCqV/CWtBd7JNW03hUFo5UZRJV2EZ8gRVnO569LCfs175c8+o3e03pGzBbCxdC BeCy6SW4Z+vCVtashCB4bFyh65S+RAWo0EvVObwdm579oQHAXxSM6Zp7PcveRqqUcqPy 9H96Ua934b+HqOWL3/Swqjd3gLJmFYJfFWBszMukYL2q+UXEWqEsaTBNfIMtCWYTGqXz MfLQL4Jic5Kl93lFQQBuc6NADkOnQ6Gx4mL5H2YiYsTXtY+x4Rd0zmm9k4SDcOm3vyPc LIPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=5pd8pwt+yrXLUJq+4VuUj0tJ2ohU0ZVUGq3sx4vmTxk=; b=E6tYrBbTPrA9hwpR7HNE5T0siTiiyQM0JnZxhuktV5yVX/CN1q5PpSAMwIlx+8/EaR q7jr/yGmahdrOjvxAqBxQq6cvC5VOYe7F/piWWLJlkjnTKlAdZISaq09yVObRnW4rNco 1RHBp4FvZK2fWMU4ZBwP7KUsrW9OsQzC29VmVXoTdCr/wx1tryq+SqGz0Pxs+gPuN5Gi F9deElJ6XLhPbTcgSFT234bsxuhziCXCWSBI8fszKXpRNbaGX3CcFm9I0VbEgwPZCCvd TyOc9e2gxju+MufgTfkLOsJsfhaODP+v3EZnd5kQ/aJqojutJs87k7TcACjex61ukn/o q7iQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e81si4902022qkb.326.2017.07.14.03.07.16; Fri, 14 Jul 2017 03:07:16 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 5E122609E5; Fri, 14 Jul 2017 10:07:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E461265BEF; Fri, 14 Jul 2017 10:01:53 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 02DBF60679; Fri, 14 Jul 2017 10:01:41 +0000 (UTC) Received: from forward4h.cmail.yandex.net (forward4h.cmail.yandex.net [87.250.230.101]) by lists.linaro.org (Postfix) with ESMTPS id AD1B560679 for ; Fri, 14 Jul 2017 10:00:31 +0000 (UTC) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [37.140.190.28]) by forward4h.cmail.yandex.net (Yandex) with ESMTP id 6BBD320A83 for ; Fri, 14 Jul 2017 13:00:30 +0300 (MSK) Received: from smtp3o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3o.mail.yandex.net (Yandex) with ESMTP id 232402940E2E for ; Fri, 14 Jul 2017 13:00:29 +0300 (MSK) Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id eQMe5PKgI5-0TouVmn3; Fri, 14 Jul 2017 13:00:29 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 14 Jul 2017 13:00:04 +0300 Message-Id: <1500026405-14155-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> References: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 77 Subject: [lng-odp] [PATCH v1 8/9] test: skip pktio_perf tests on 1 and 2 cpus machines X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov Make check should skip the test instead of failing it. Test splits RX and TX cores for packet processing. Core 0 bind to control thread. So running machine should have at least 2 worker threads which is not enough on 1 and 2 cpus machine. CUnit uses special value 77 to mark test as SKIPPED and not fail on it. Signed-off-by: Maxim Uvarov Reviewed-by: Mike Holmes --- /** Email created from pull request 77 (muvarov:monarch_lts) ** https://github.com/Linaro/odp/pull/77 ** Patch: https://github.com/Linaro/odp/pull/77.patch ** Base sha: 0c15c40db40834f1df217191c4b6a06303ab0872 ** Merge commit sha: f06a7319a03ad565ced026ddc76a66164aa93782 **/ test/performance/odp_pktio_perf.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 18a1aa2a..988f298b 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -34,6 +34,8 @@ #include #include +#define TEST_SKIP 77 + #define PKT_BUF_NUM 8192 #define MAX_NUM_IFACES 2 #define TEST_HDR_MAGIC 0x92749451 @@ -558,7 +560,7 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx, gbl_args->args.cpu_count); if (num_workers < 2) { LOG_ERR("Need at least two cores\n"); - return -1; + return TEST_SKIP; } if (gbl_args->args.num_tx_workers) { @@ -659,7 +661,7 @@ static int run_test_single(odp_cpumask_t *thd_mask_tx, static int run_test(void) { - int ret = 1; + int ret; int i; odp_cpumask_t txmask, rxmask; test_status_t status = { @@ -669,8 +671,9 @@ static int run_test(void) .warmup = 1, }; - if (setup_txrx_masks(&txmask, &rxmask) != 0) - return -1; + ret = setup_txrx_masks(&txmask, &rxmask); + if (ret) + return ret; printf("Starting test with params:\n"); printf("\tTransmit workers: \t%d\n", odp_cpumask_count(&txmask)); @@ -691,8 +694,11 @@ static int run_test(void) run_test_single(&txmask, &rxmask, &status); status.warmup = 0; - while (ret > 0) + while (1) { ret = run_test_single(&txmask, &rxmask, &status); + if (ret <= 0) + break; + } return ret; } From patchwork Fri Jul 14 10:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 107762 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp688205qge; Fri, 14 Jul 2017 03:07:55 -0700 (PDT) X-Received: by 10.237.53.238 with SMTP id d43mr10398693qte.46.1500026875280; Fri, 14 Jul 2017 03:07:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500026875; cv=none; d=google.com; s=arc-20160816; b=zixC+mMCTLvf8Q5RFUj9oVThemI8BI3H9Ic/uiK7jR0M+C8elObHFr3DRB28p9JVOR 6ofgbcEvYj015xlNdo0R1JivxJLAn3FbrP3Ph897jwK9/2a58ivvHWj0dyUMRFUvkR31 Dwc7gvrcSrzbKalfeV7OoOwtoDCRA2OsIgyhkWj1aJceP1z3QtC02WpviOTp7FMq73bU RqJYHGDqY1jNrtyxkmcTvW1JTPyLp30avGs265lpxGTU5qWOouwn3D2vDXN8R/x4LCOq Qiy/wAaDwwGTMDOX2a+wCr1EmYwItKjV6FS3P/MPCLzEu26JvV7+KVWNYnnFBJpxpi8m 3IWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=BmNBkSwV+LjZuLNma1Rk7YTJNoTbTYASTpBCpUwNsA4=; b=IAcwcSebcPqwKP0CHGZBmgCrQoeeaa0U01PbJhIuuqfDX/rJ+PteSMWofWeA2Z6KTi 2OkVVm/lvdphivbxnlwVFNVHv+abaZC+T4OLdj6v8jHQjdGG3C8X8IxBVjBhO8iC4R+Q 3Vo/C5GhRkOSKnNIVoJ+wrS9F94yQP8q4Cj5qmp8ti6BxIZ6VRpEtmcCv+j1KFDa+3Wp 3lRMq0XsmDb7pPDenXId4lZ3uUkiEiMpia9OYrcE6/CfGGZVNaFIaIOksd7V2C3v6ZB1 Z6QZu020nauewLz08tVJvdQHlb4MOJqRHNmyboEjt8PKeub4UVP0dViCUEj4118DWSP2 GQ8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m6si7647901qkm.303.2017.07.14.03.07.55; Fri, 14 Jul 2017 03:07:55 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id F098C6081D; Fri, 14 Jul 2017 10:07:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6943160949; Fri, 14 Jul 2017 10:02:17 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E49E765BF2; Fri, 14 Jul 2017 10:02:04 +0000 (UTC) Received: from forward4o.cmail.yandex.net (forward4o.cmail.yandex.net [37.9.109.248]) by lists.linaro.org (Postfix) with ESMTPS id 8F2CF609F8 for ; Fri, 14 Jul 2017 10:00:32 +0000 (UTC) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [37.140.190.28]) by forward4o.cmail.yandex.net (Yandex) with ESMTP id 6A3EF210A2 for ; Fri, 14 Jul 2017 13:00:31 +0300 (MSK) Received: from smtp3o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3o.mail.yandex.net (Yandex) with ESMTP id 2E8512940C90 for ; Fri, 14 Jul 2017 13:00:30 +0300 (MSK) Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id eQMe5PKgI5-0UoWYJtq; Fri, 14 Jul 2017 13:00:30 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 14 Jul 2017 13:00:05 +0300 Message-Id: <1500026405-14155-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> References: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 77 Subject: [lng-odp] [PATCH v1 9/9] travis: port travis checks from master X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov Signed-off-by: Maxim Uvarov --- /** Email created from pull request 77 (muvarov:monarch_lts) ** https://github.com/Linaro/odp/pull/77 ** Patch: https://github.com/Linaro/odp/pull/77.patch ** Base sha: 0c15c40db40834f1df217191c4b6a06303ab0872 ** Merge commit sha: f06a7319a03ad565ced026ddc76a66164aa93782 **/ .travis.yml | 226 +++++++++++++++++++++++++++++++++++++++++++++ scripts/ci-checkpatches.sh | 17 ++++ 2 files changed, 243 insertions(+) create mode 100644 .travis.yml create mode 100755 scripts/ci-checkpatches.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..6a845e97 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,226 @@ +# Copyright (c) 2016, Linaro Limited +# All rights reserved. +# SPDX-License-Identifier: BSD-3-Clause +# +# Please update xxxx for your coverity token and notification email if required +# pushing to github/master will run make check +# pushing to github/coverity_scan will also launch a static analysis +# See https://scan.coverity.com/travis_ci + +language: c +sudo: required +dist: trusty +group: deprecated-2017Q2 +env: + global: + # COVERITY_SCAN_TOKEN + # ** specific to your project ** + # Note: + # You should have a github account and travis linked travis account. + # The secure key to be filled below is the 685 character long encrypted + # token you can find as follow from your coverity dashboard + # (at https://scan.coverity.com/dashboard): + # Click on the github project (/odp) + # Click on "submit build" + # Click on "Configure Travis CI" + # Look at the COVERITY_SCAN_TOKEN in the env: global: section + # of the configuration example. + # copy the secure: below + # + - secure: "xxxx" + # + # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see + # for individual commit validation. But you you want to track tests history + # you need generated new one at https://codecov.io specific for your repo. + - CODECOV_TOKEN=8e1c0fd8-62ff-411e-a79f-5839f6662c11 + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc + - clang-3.8 + - automake autoconf libtool libssl-dev graphviz mscgen doxygen + - libpcap-dev + - dpkg-cross equivs + - gcc-aarch64-linux-gnu pkg-config-aarch64-linux-gnu libc6-dev-arm64-cross + - gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross + - gcc-powerpc-linux-gnu pkg-config-powerpc-linux-gnu libc6-dev-powerpc-cross +# coverity_scan: +# project: +# name: "$TRAVIS_REPO_SLUG" +# notification_email: xxxx +# build_command_prepend: "./bootstrap && ./configure --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example" +# build_command: "make" +# branch_pattern: coverity_scan + +compiler: + - gcc + - clang-3.8 + +env: + - CONF="" + - CONF="--enable-schedule-sp" + +before_install: +# Install cunit for the validation tests because distro version is too old and fails C99 compile + - sudo apt-get remove libcunit1-dev libcunit1 + - export CUNIT_VERSION=2.1-3 + - curl -sSOL https://github.com/Linaro/libcunit/releases/download/${CUNIT_VERSION}/CUnit-${CUNIT_VERSION}.tar.bz2 + - tar -jxf *.bz2 + - pushd CUnit* + - libtoolize --force --copy + - aclocal + - autoheader + - automake --add-missing --include-deps --copy + - autoconf + - ./configure --enable-debug --enable-automated --enable-basic --enable-console --enable-examples --enable-test $CROSS || cat config.log + - make + - sudo make install + - popd + - export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" + +install: + - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages + - sudo mkdir -p /mnt/huge + - sudo mount -t hugetlbfs nodev /mnt/huge + + - sudo apt-get -qq update + - sudo apt-get install linux-headers-`uname -r` + - gem install asciidoctor + - PATH=${PATH//:\.\/node_modules\/\.bin/} + +# DPDK pktio + - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} + - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v16.04 http://dpdk.org/git/dpdk dpdk + - pushd dpdk + - git log --oneline --decorate + - make config T=${TARGET} O=${TARGET} + - pushd ${TARGET} + - sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config + - popd + - make install T=${TARGET} EXTRA_CFLAGS="-fPIC" + - popd + +# Netmap pktio + - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git + - pushd netmap/LINUX + - ./configure + - make + - sudo insmod ./netmap.ko + - popd + +script: + - ./bootstrap + - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap $CONF + - make -j $(nproc) + - make install + - echo "Checking linking and run from install..." + - pushd $HOME + - echo "Dynamic link.." + - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst -I${HOME}/odp-install/include -L${HOME}/odp-install/lib -lodp-linux -L${OLDPWD}/dpdk/x86_64-native-linuxapp-gcc/lib -lrt -ldpdk -lpthread -lcrypto -lpcap -ldl + - LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst + - echo "Static link.." + - ${CC} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst -I${HOME}/odp-install/include -L${HOME}/odp-install/lib -lodp-linux -L${OLDPWD}/dpdk/x86_64-native-linuxapp-gcc/lib -lrt -ldpdk -lpthread -lcrypto -lpcap -ldl -static + - ./odp_hello_inst + - popd + - sudo git clean -f -d -x + - ./bootstrap + - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example $CONF + - make -j $(nproc) + - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make check + +jobs: + include: + - stage: test + compiler: aarch64-linux-gnu-gcc + env: TEST="aarch64-linux-gnu" CROSS="--host=aarch64-linux-gnu --prefix=/usr/aarch64-linux-gnu" + install: true + script: + - mkdir cross + - pushd cross + # one can not include colon in the command or bad things will happen, so mimic it + - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy + - equivs-build -a arm64 dummy + - wget + http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_arm64.deb + http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_arm64.deb + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_arm64.deb + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_arm64.deb + - sudo dpkg-cross -i -M -A -a arm64 *.deb + - popd + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test + compiler: arm-linux-gnueabihf-gcc + env: TEST="arm-linux-gnueabihf" CROSS="--host=arm-linux-gnueabihf --prefix=/usr/arm-linux-gnueabihf" + install: true + script: + - mkdir cross + - pushd cross + # one can not include colon in the command or bad things will happen, so mimic it + - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy + - equivs-build -a armhf dummy + - wget + http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_armhf.deb + http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_armhf.deb + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_armhf.deb + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_armhf.deb + - sudo dpkg-cross -i -M -A -a armhf *.deb + - popd + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test + compiler: powerpc-linux-gnu-gcc + env: TEST="powerpc-linux-gnu" CROSS="--host=powerpc-linux-gnu --prefix=/usr/powerpc-linux-gnu" + install: true + script: + - mkdir cross + - pushd cross + # one can not include colon in the command or bad things will happen, so mimic it + - env echo -e 'Provides\x3a multiarch-support, debconf, debconf-2.0' > dummy + - equivs-build -a powerpc dummy + - wget + http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_powerpc.deb + http://ports.ubuntu.com/pool/main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_powerpc.deb + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_powerpc.deb + http://ports.ubuntu.com/pool/main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_powerpc.deb + - sudo dpkg-cross -i -M -A -a powerpc *.deb + - popd + - ./bootstrap + - ./configure --prefix=$HOME/odp-install $CROSS + --disable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-test-perf-proc --enable-test-example + - make -j $(nproc) + - stage: test + env: TEST=distcheck + compiler: gcc + script: + - ./bootstrap + - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example + - sudo PATH="$PATH" LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make distcheck + - stage: test + env: TEST=doxygen + compiler: gcc + script: + # doxygen does not trap on warnings, check for them here. + - ./bootstrap + - ./configure + - make doxygen-doc |tee doxygen.log + - fgrep -rvq warning ./doxygen.log + - stage: test + env: TEST=checkpatch + compiler: gcc + script: + - echo ${TRAVIS_COMMIT_RANGE}; + - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`; + - if [ -z "${ODP_PATCHES}" ]; then env; exit 1; fi; + - ./scripts/ci-checkpatches.sh ${ODP_PATCHES}; + +after_failure: + - cat config.log + - find . -name 'test-suite.log' -execdir grep -il "FAILED" {} \; -exec echo {} \; -exec cat {} \; diff --git a/scripts/ci-checkpatches.sh b/scripts/ci-checkpatches.sh new file mode 100755 index 00000000..cb1c4e65 --- /dev/null +++ b/scripts/ci-checkpatches.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +PATCHES=$1 +echo "Run checkpatch for ${PATCHES}" +# Generate patches provided with $1. +# In case of force push and range is broken +# validate only the latest commit if it's not merge commit. +git format-patch ${PATCHES} +if [ $? -ne 0 ]; then + git show --summary HEAD| grep -q '^Merge:'; + if [ $? -ne 0 ]; then + git format-patch HEAD^; + perl ./scripts/checkpatch.pl *.patch; + fi; +else + perl ./scripts/checkpatch.pl *.patch; +fi