From patchwork Mon Oct 23 11:10:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116676 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4517093qgn; Mon, 23 Oct 2017 04:11:13 -0700 (PDT) X-Received: by 10.55.69.84 with SMTP id s81mr17273828qka.77.1508757073535; Mon, 23 Oct 2017 04:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757073; cv=none; d=google.com; s=arc-20160816; b=cc6UC8/0fqiTCdKnEjHHQ66WwdUqW9yVdg+w+aI7YQVcPdvCxuk0cL5JAUx/qsUTyz sHrA8j95TPJablAbphb6Axv95IydPJYa+wDxtY5ZbD/lv70y1X39VCfZqvng9JI1LM1Q 7Zu0LTa3WGTXF81NSpDXDOZ3ymDr4vqWsArShDdI+403kd4Lx4bRDpZlnSIRFRcNGobl S2aKz6fBV2zIoO5EpGkLmhGd6p/BUNUl403Myz3Oc+fE/v0WEgvyX9r4mTZOIav/1EJy hFi8FnlGWVYvQ2dkJKT8TDild/O49D8rC1+skmtMRNfXJT9ZpS9wt59ix4KhAMVd6O9L erPg== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=vRRQETHbO+4lHsTlQVi3qOejRvHGPGlCN5KoRozGGFQ=; b=p85Pba1eVXI+HPo8QEmBO33rbnBs5SOQocYpPPF+5Z4F/vN6dNROshmBVeqGIK2I+/ gGnD1rRQfzrEPukb9yismu63U1hDyeHiMVTFk8gCamtf/RM0RvT5d6H3CT7JvHWKZxyY +gBKLvG5H4mqXr7voI0KHWRBJggHjBGnkgxiBlvsaPlXh5WDPA4fipfilcq+3TLhJlud S7i7sN61SU+W+BhxfrOloBTs2kd6Lii4dtQkbVulEGtwUC+WSMqHKY2Pu9CSL4weRw82 1AdJYRSg9cPe2zoG6TRF6uILtIc5tSCfkKDl7nIMPKbcWL+r4/yjG0Gg5VnVeLgu2iLc x9/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id f66si5804232qkc.47.2017.10.23.04.11.13; Mon, 23 Oct 2017 04:11:13 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 01AA261D00; Mon, 23 Oct 2017 11:11:12 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 3825D6162D; Mon, 23 Oct 2017 11:11:08 +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 E311C6162D; Mon, 23 Oct 2017 11:11:04 +0000 (UTC) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.linaro.org (Postfix) with ESMTPS id E050B6104F for ; Mon, 23 Oct 2017 11:11:03 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id w21so19687749lfc.6 for ; Mon, 23 Oct 2017 04:11:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=vRRQETHbO+4lHsTlQVi3qOejRvHGPGlCN5KoRozGGFQ=; b=hEHKZi8XZYjmTotzt5b6rMpBYWspDLJrKb/FZLwBsWpdVKT/fVs840ElcKTOhL2nYv fNMENQAZ5m/PbM4XNRH6IY0qFpksnXAgmNxKzJEg1BLeknYGU719LjcxM7OTKSGh7bHe sqrAf55oqqbYa8JCpt65Nj15nK/y2iuzXCcWoAM+SP7KmtNfaupcJqLpg4fftl+vGA9w qcv/Kyo5TEzyRy976cqj4eBAt1wkR87wIdohUIcPLY+dde/bfl9J9KYDgFrD+EvsaEvY ydpMHXtXbDbSXrv+cQQbMOFQdqLxQasXiZxmNNBFE7XD43WCeTwRCSELT8mYu8DwRUcz Kntw== X-Gm-Message-State: AMCzsaVyha9DWwmvr98BtY2YvA3JpGlDtbhSQlRl8BZZN3OCoKBcolF3 +AoT8WxjQGGKgleas9xOCYGQ6d0hn7E3gg== X-Google-Smtp-Source: ABhQp+R/hb8zks2FDiZ9VgR/Vvq6KM4F2/4/isOb+ZewEJubqaF/x5MkWALsqAOfgFJIqfYLmD0ZLw== X-Received: by 10.46.85.69 with SMTP id j66mr4995585ljb.137.1508757062382; Mon, 23 Oct 2017 04:11:02 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:01 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:29 +0300 Message-Id: <20171023111057.6328-2-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 01/29] travis: also run make distcheck in non-ABI-compat mode 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" Signed-off-by: Dmitry Eremin-Solenikov --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.14.2 diff --git a/.travis.yml b/.travis.yml index 49b922e3cdba..fdeeefd113ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -244,6 +244,14 @@ jobs: - ./configure --prefix=$HOME/odp-install --enable-user-guides - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck + - stage: test + env: TEST=distcheck-non-abi + compiler: gcc + script: + - ./bootstrap + - ./configure --prefix=$HOME/odp-install + --enable-user-guides + - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK__CONFIGURE_FLAGS=--disable-abi-compat - stage: test env: TEST=doxygen compiler: gcc From patchwork Mon Oct 23 11:10:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116677 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4517582qgn; Mon, 23 Oct 2017 04:11:43 -0700 (PDT) X-Received: by 10.200.23.220 with SMTP id r28mr18998681qtk.247.1508757103123; Mon, 23 Oct 2017 04:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757103; cv=none; d=google.com; s=arc-20160816; b=Sclr4A4iVP8KsrZKmniiQmBGjVktad1QpTIxa79/UoeCLId2Q2hEk6u2U7HjwqcEeX cc/i7pmcL/X1KeSXAnWCpmHCwLj2mUEDw6vYAVH0rZ8jHY6XvLIglPx5dCA6DTlJxZG7 D1HH8KSyDL554wmRpvAhMveCp+CavlkxqTFsiAfh7kFyKipyECAvl4+CeifBtnl6JUp8 3eGdjDzqnyMrCGMZ0lAiYa1h0S7oLfs4B+7EFrVCEduD6sHNDrGJIiOJy3m1/+0A23CV QEVgz1HxZ4+84AYhfs8nXh2Lm7yiOUK7yJBiv6WHoOVnYyIf4t8PgGVJO8s7vEnmNVTk 2ugQ== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=ZSBMqOlno8c9HbITWMGxu6bzqYea8kKYDaKzFvgd/oc=; b=pELgrHCjYPMC25Uwv3uRl8BP1Co14eYR2jt2tX9Xd2K60mZ3qkj5K2q8vgqFD4Bq86 htj8O5cs26uodSvp53iM2huY6WYdLaBWCj/6y2BFJNIiRLka65WESAjSms41zMUvf948 iejTya/7eXCN5GXpxDZsGOSIrg8OkR1ToLM3d3qnBvb2n8R3DtzMgfTOvoM1SLvgqL69 Ix29XFgrDvRuy2yIencFzQ3MRNN5jFDY7dmzWc8tFWUF0rmhbw0avRhDHgs1FTiQxexw 8Txb5kMniq4mA0Iqkm6RHv0AtUTTmhrQDdvEFAcSRlKuqq7wlGtbdkQFmftCWEdGQgou nxUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id s62si775282qks.132.2017.10.23.04.11.42; Mon, 23 Oct 2017 04:11:43 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CDF78622A5; Mon, 23 Oct 2017 11:11:42 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 8F5C761613; Mon, 23 Oct 2017 11:11:10 +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 3450B6162D; Mon, 23 Oct 2017 11:11:06 +0000 (UTC) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.linaro.org (Postfix) with ESMTPS id D4D8C61613 for ; Mon, 23 Oct 2017 11:11:04 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id 75so19657124lfx.1 for ; Mon, 23 Oct 2017 04:11:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZSBMqOlno8c9HbITWMGxu6bzqYea8kKYDaKzFvgd/oc=; b=EOMD9TIld1jyCSUO1tLbWDHkcxzHzwmL6iO7QQvS3E7AEm2JRpPl7baORwNE/ou96K swpvM+ebnN2cYZg9oXwZxQTMkxvKFcmC3/yM8OGLMxf2OA34Hjd5i34tKgvF4aNp84q7 YU20AIkQZ9tLWGxxW1ZNu2BhPbkO9Ejp26Iko2w3rICz990vsEC5srI9t1nzJho6Y0XV 2BSRCVAEaIzTJXABSFVpfaLrYEiJgj69gUls8SBW4r5eIL+neXdnDLfVzF/dStSekeLW X4hVCuSf4qRTD75vrix73tQC9EkrmmVGHmUWE/7APpnrAqGSWD/o9ziH5XNi0KzCRa1D 64bw== X-Gm-Message-State: AMCzsaUGg7AQFCQ5f68W+Gn6R3K+gp5JPwWbLOZGVR0dUZefclSaLquk wkP3bvJKHE8Qyj93jx/grC/hd9O++F38Tw== X-Google-Smtp-Source: ABhQp+T2BBR1fV3r/el/r1Wx1ksXLBcSl0Jxe0n8Dl3ottouepG0HtvhIvi0E3e2y55wQEd4gVdnfA== X-Received: by 10.46.56.14 with SMTP id f14mr5802523lja.46.1508757063454; Mon, 23 Oct 2017 04:11:03 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:02 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:30 +0300 Message-Id: <20171023111057.6328-3-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 02/29] travis: add cross-compiling tests with ABI compatibility disabled 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" Signed-off-by: Dmitry Eremin-Solenikov --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) -- 2.14.2 diff --git a/.travis.yml b/.travis.yml index fdeeefd113ea..6196f91d41de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,10 @@ env: - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" - CROSS_ARCH="i386" + - CROSS_ARCH="arm64" CONF="--disable-abi-compat" + - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" CONF="--disable-abi-compat" + - CROSS_ARCH="powerpc" CONF="--disable-abi-compat" + - CROSS_ARCH="i386" CONF="--disable-abi-compat" before_install: From patchwork Mon Oct 23 11:10:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116679 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4518658qgn; Mon, 23 Oct 2017 04:12:51 -0700 (PDT) X-Received: by 10.55.27.25 with SMTP id b25mr17923114qkb.144.1508757171016; Mon, 23 Oct 2017 04:12:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757171; cv=none; d=google.com; s=arc-20160816; b=KPpGzz4DN7awvpiCD2TjSTDdmabAqHFpPkxgn/Hccd/2sMOEH+fuHc0B1SaUwR2DsH bd0v/EqhwrLf08qYI2ELVm1DbeQxSfCCsRV4EsAxYMiV70AlNwZqwEM2wv6BktU+wVIp i6hZJatRpUKEuA9Ue+3AoBBOzkfTVTiNoOpkMPLmRLFtK19ctSkNUmKdP87Gl0Xq2sD1 Jyptx5w2H6XhLgMStggrD9hF1itzpVreqMFPyp5/egH06JJtOKMLLm3OJ4HnLGZAwf+i y3Cn0LXfkrr4t+D3TzEMVBV/h6Ra1Zn3GZvfAkhEF4OSRQXSmA1fPD31EBSrryC3KrS7 KAhQ== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=/aiqtp9FkQKLzS3dfd30dzsg/WIZZ6bXdSUi+RKimWs=; b=sITHeDof5e+CpLzRp5xCSj75Wh/cUlnThK3t9Bu91kh6QAzoGwolH2IYfagEvzvTyR eIv9Wzsk3Ox9pGnaSb6fZPSY6vr/lfaP6SgTVYi3GNQdp1MkIW/YXfo/XJw1JEEy2A4Z U08B2wkrLQh1ELKYi6bgQ+U3Ts5rUF18iTk5Rj30z/QlzGC0llZiv0tnN43I9vxsrifL JQt20VVP6UMGUWwSYwlUZjsH5tJziht7aT1M9RbnkXa9QkjeeZ0B4iK3JMcjZz2jqHFs 6bDO1hF6VvS/YyJJfjLlMIh+rsupy24zlOlaSbBxt9C4zGmyhUmIUhSzNbSAyHQBgoOJ 1p7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id b29si3152445qtk.59.2017.10.23.04.12.50; Mon, 23 Oct 2017 04:12:51 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B32A7622D6; Mon, 23 Oct 2017 11:12:50 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 5483661D30; Mon, 23 Oct 2017 11:11:16 +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 433DA6164A; Mon, 23 Oct 2017 11:11:09 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.linaro.org (Postfix) with ESMTPS id DE78B6104F for ; Mon, 23 Oct 2017 11:11:05 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id r129so19661727lff.8 for ; Mon, 23 Oct 2017 04:11:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/aiqtp9FkQKLzS3dfd30dzsg/WIZZ6bXdSUi+RKimWs=; b=s7zgKBc9BjiNzYs7WEl73fLy4/lJxGwa9GPRZDjXryZRRmUxs3ThD3c1MhxkQ59hb9 jXg4hhFqmR4V5R0Z158gRJ8CEOj8G4jCh9FTFLPzwT2T4JTx2qCBlL3Z4v6YfyOJDUtw zEbSolDGAXVuZumidZzIW6PThxKaG8R0+MlboBWRDn/1COKOR5N9NUMoupgyJjlCsL6L 0iAqTWF4JQjkn0SCAIYSh46oIizozhVPet4z7yClcFlU0dQv0/94Jbm/hEKmMmhAP/7e 6c7/wrgkphcNA1m3Rbjj3Lo4C/Si42RQAlExxZ2HgrNp4vsM/44nspPH0M05jofbjdiA fplg== X-Gm-Message-State: AMCzsaXHeSnb05KHYA+DHQkOnnyS/VJInTQkf8g+J+c9Cf8yhe/vrVjZ Heav0MSR4sTsg8NdRWrK/Nxdw4dsTCiBag== X-Google-Smtp-Source: ABhQp+SoCZzvS1wq8YB1a0nwQwiw+9rbW6YTLtIVLDccGJ97yzmVCX73L133tcVrH+FLV/g3cSL97A== X-Received: by 10.46.89.199 with SMTP id g68mr5480003ljf.12.1508757064490; Mon, 23 Oct 2017 04:11:04 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:03 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:31 +0300 Message-Id: <20171023111057.6328-4-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 03/29] linux-gen: ipsec: don't use __odp_force 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" __odp_force is not part of ODP API, so it should not be used directly. Signed-off-by: Dmitry Eremin-Solenikov --- platform/linux-generic/odp_ipsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.2 diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index e57736c2a792..7e833adee0a8 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -126,7 +126,7 @@ odp_u16sum_t _odp_chksum(void *buffer, int len) sum += (sum >> 16); result = ~sum; - return (__odp_force odp_u16sum_t) result; + return (odp_u16sum_t)result; } static inline int _odp_ipv4_csum(odp_packet_t pkt, From patchwork Mon Oct 23 11:10:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116678 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4517974qgn; Mon, 23 Oct 2017 04:12:06 -0700 (PDT) X-Received: by 10.200.53.111 with SMTP id z44mr19795602qtb.12.1508757126890; Mon, 23 Oct 2017 04:12:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757126; cv=none; d=google.com; s=arc-20160816; b=RIcsNSLBolDd6y5POc8Jz8CaruRWaW+Kp/S0Rd1Ege80EAXoY+6IDq+5MWSg971YU+ J9ApxyLg5EKcHnSPjiDuhH9D4yRaWxqyodZes81LsRH/fNSuy0MkqbL/gZbMjsEB5Hib yMPnA9pmVMaD7jgWe6ou2dFnSik7RM2I+bfe1PqjhRmlJocNKEutgNCzztnLl726S9EH jK1fsif+77ILFlzZM+OS3NCon+BL9+Jn7kDYKSNPS7jssd+xRXc7ZDXC5jYA7kziGyO2 GYhBdAcXoGAiOu+HqCG68erdb+AlgAMgBfAN44b/MQ4x7uJN+R0JQ9SXKic2vkiNQpWc eJCw== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=kdja5l+p/4QMu1Ce+zmmCqxzR75VfVRbzAQREpc2U80=; b=MBeumRPqEznoF7VCAwg86VxMFeCYOPiWEmIBrIu7j2+Q+FXe8Zur432CN9ZOgQh8wx ajVoaN7FNaAIdP9cyz+US7fa619YJu6Brho3NbRYUakP4z3fWEia5nqjVYDNs9Hyw2br Yw3EqJAgNmWO3S3vVWrOl4ksx5lIkmI9rgWSYLr0P6CtttRMC3CEzHHtvkod3NGmtO3Q HjHVGmoLoyHFPX6TakwgzR8Nw/DcplBlLICgz2w4OSepRaeLltdJlswFAH93tSCFbw+b 8BeXrRn8XdBf69zpyzAYqHue8zuIAIbj4FG2TA4gZAPKn7uNXDMIo34T0VhMH0ctLFxl 77Ag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 54si3131796qto.365.2017.10.23.04.12.06; Mon, 23 Oct 2017 04:12:06 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 7CCFF622A9; Mon, 23 Oct 2017 11:12:06 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM 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 F1E0B61C9E; Mon, 23 Oct 2017 11:11:13 +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 8E00E61653; Mon, 23 Oct 2017 11:11:08 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id C646261613 for ; Mon, 23 Oct 2017 11:11:06 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id n143so2764002lfb.11 for ; Mon, 23 Oct 2017 04:11:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=kdja5l+p/4QMu1Ce+zmmCqxzR75VfVRbzAQREpc2U80=; b=oHb1s8BFKWrCty+HH0UwuPzsTptsId0CUsKI3Sb8nuBzAFRrSTcXehUsY6gBw7lY61 64CQKrX71EMlBQb5utWFsZcSvBEpLteUK2wgMxGaUGB7dlxNG7ml9tfixioZpntdqV9h l0dGWUul+0ZA1p/ytE4WMRVI4ti8rhBH+SIl0EiOe1yTu1rED6kBwIBKQnwjyMmib+XT hicQD+jRs1B/QMcpIv39BqxlfKR3G0rMqCnOeJyS8FdjnODtBoLkd6n4Uu+lLilkYxlO FyfZNogQU1L7EOeaikmzghv/TSDFmBmvdOKO8FpphpfsV1RPyjHbqUbe/AKJOrwsRAT2 ThUw== X-Gm-Message-State: AMCzsaXkELMfKSLY57/cP21OcF/EAjB+I7hxzdNqmIdSYAhueduK9aIY 9mLONtKjNW0jjZWseSIlQ6QrCzret20EKg== X-Google-Smtp-Source: ABhQp+Tw+k4v90Zn2eijU+CO745ft2UoS1ke4dKzC5zlFIf4rkXr6f0Y2+czlpFdDF3fmS7OSCSiKw== X-Received: by 10.46.58.17 with SMTP id h17mr5288630lja.194.1508757065495; Mon, 23 Oct 2017 04:11:05 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:04 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:32 +0300 Message-Id: <20171023111057.6328-5-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 04/29] helper: don't use __odp_force 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" __odp_force is not part of ODP API, so it should not be used directly. Signed-off-by: Dmitry Eremin-Solenikov --- helper/include/odp/helper/chksum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.2 diff --git a/helper/include/odp/helper/chksum.h b/helper/include/odp/helper/chksum.h index 1bf950c8bed0..a80e8be5d7e6 100644 --- a/helper/include/odp/helper/chksum.h +++ b/helper/include/odp/helper/chksum.h @@ -58,7 +58,7 @@ static inline odp_u16sum_t odph_chksum(void *buffer, int len) sum += (sum >> 16); result = ~sum; - return (__odp_force odp_u16sum_t) result; + return (odp_u16sum_t)result; } /** From patchwork Mon Oct 23 11:10:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116696 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4528595qgn; Mon, 23 Oct 2017 04:23:36 -0700 (PDT) X-Received: by 10.107.6.15 with SMTP id 15mr16491886iog.204.1508757816275; Mon, 23 Oct 2017 04:23:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757816; cv=none; d=google.com; s=arc-20160816; b=cZcnHH3wGU67rMwQ7w/Vvc6/JufffjnKKV00oahhSKyNFlccDCqmdvwRLINrTwEpVf sY9lU4xgDKj+vb+r6c9Y47IF1JqAdaT+Ra5S3N19mjIeUbZLcFUYXinGUJ95rbpRwol6 KnqK6NvTgaA0ue0c23vZ7oThvxDwq87iVovFgdbiCobR1IiTOjxgcZhV6kNVrdupogEj Hm16Anvt7h8Ri+rEKMzVsAM9D0KDCDJel3AaOsFB6UwUlbEIWCrJ61se3SgpNwi4PFZS 941g52ZDaxvdKZ+zTklBobYJODJOe2RRTKqsMZkpELgc+fCXorr3uDBIlQ7YFVZxvOv2 fWuA== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=o5LxIn+h7D+zPOwwX7QPvmsXkPT25usssMlvoqdC/Ik=; b=iVbTxrEqDqgshLhLFHFmrDMckUX2slmPCxBJCbiO8DagFyISzMsUnE7muJXAgZnC4N sGhwHCpa9+wwnmwU1nl9XuGIxtjtE1Se0xRz9Vf/OTfD73jUwUKdzXlUGb890zzY61He joIJGhh/5Y7BVkQxOFiXyXVHTW1yICdlvoe2rcbamAXaR3lleBLPsBCX54tlOZHadJIX YDbuum6W+GXO9kLE9oGzf8/o+fc1tvStE48aWD2Z1p3//hbKIjHaOrerO+ZtBt+MdcFL MO/5QfKCBwFqG0MtyHBMa5bn/kS2fOU5DdCTEcos6IOuIXpllEU6YJJRHZ/mIWXB3GPH Z3/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id n69si3741196ith.119.2017.10.23.04.23.35; Mon, 23 Oct 2017 04:23:36 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id BD84B622D5; Mon, 23 Oct 2017 11:23:35 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 9B0FC61E03; Mon, 23 Oct 2017 11:13:23 +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 980BA61D1E; Mon, 23 Oct 2017 11:12:44 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id 62B0361D1E for ; Mon, 23 Oct 2017 11:11:14 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id a16so19648254lfk.0 for ; Mon, 23 Oct 2017 04:11:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=o5LxIn+h7D+zPOwwX7QPvmsXkPT25usssMlvoqdC/Ik=; b=A8zOoeLJ49QSuCuABTwSOWKyMEBXu2CJ6abXfB0pYul6Seeisw9G5AJzcWJwQOUxhA TR6f7IGm7WtSPvF+hrcKV+x1ENmFZ0Ma+W2m9tw4wwl0MwzQowPYYxxe0zD1IyetnMbi 2pU2Pa7IhpoZZI+lC1jXX7MJU8gZegNgfRFAuTPL/3gjc641Yiv7f1KejqVUiGo+CiTI 5jLEWziVJ5e5rzePqq3Wza+aSP6Mt6wa5eGaAYqPV10exxydobt7DK8AqP25dwbC6ZN/ 8dj3nQhalg7eZfNvGn9Jh/7G2ML0Ua1VaNlXwIivo5w6Wvu6uSv2dhE2Y65sLqml59qT 1YhA== X-Gm-Message-State: AMCzsaVRfesl1Adiem4FtlLbrP/BwCxoM0DZqhPAVVKU+5Cvi2RAtQO2 uR7FUwtH9OXdvBkdldeR8VOMusozJj183A== X-Google-Smtp-Source: ABhQp+Tt/uqPMMUOq/0LH8nVu3vsEk3qT0ntMNzhDyxWkieDGgVLYJcsoI6IHt2Hm4YW8MwG5j2zWg== X-Received: by 10.46.89.92 with SMTP id n89mr5006675ljb.57.1508757068948; Mon, 23 Oct 2017 04:11:08 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:08 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:33 +0300 Message-Id: <20171023111057.6328-6-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 05/29] api: abi: provide the the rest of abi files 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" Provide a set of platform-neutral ABI files. They are mostly modified versions of linux-generic api files. Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 188 ++++++++++++++++++++- include/odp/arch/arm32-linux/odp/api/abi/atomic.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/barrier.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/byteorder.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/init.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/ipsec.h | 7 + .../arch/arm32-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/packet_io.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/rwlock.h | 7 + .../arm32-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/schedule.h | 7 + .../arch/arm32-linux/odp/api/abi/schedule_types.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/spinlock.h | 7 + .../arm32-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/sync.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/thread.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/time.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/timer.h | 7 + .../arch/arm32-linux/odp/api/abi/traffic_mngr.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/version.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/atomic.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/barrier.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/byteorder.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/init.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/ipsec.h | 7 + .../arch/arm64-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/packet_io.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/rwlock.h | 7 + .../arm64-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/schedule.h | 7 + .../arch/arm64-linux/odp/api/abi/schedule_types.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/spinlock.h | 7 + .../arm64-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/sync.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/thread.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/time.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/timer.h | 7 + .../arch/arm64-linux/odp/api/abi/traffic_mngr.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/version.h | 7 + include/odp/arch/default/api/abi/atomic.h | 65 +++++++ include/odp/arch/default/api/abi/barrier.h | 38 +++++ include/odp/arch/default/api/abi/byteorder.h | 73 ++++++++ include/odp/arch/default/api/abi/cpumask.h | 54 ++++++ include/odp/arch/default/api/abi/init.h | 35 ++++ include/odp/arch/default/api/abi/ipsec.h | 41 +++++ include/odp/arch/default/api/abi/packet_flags.h | 25 +++ include/odp/arch/default/api/abi/packet_io.h | 60 +++++++ include/odp/arch/default/api/abi/rwlock.h | 35 ++++ .../odp/arch/default/api/abi/rwlock_recursive.h | 36 ++++ include/odp/arch/default/api/abi/schedule.h | 48 ++++++ include/odp/arch/default/api/abi/schedule_types.h | 49 ++++++ include/odp/arch/default/api/abi/spinlock.h | 30 ++++ .../odp/arch/default/api/abi/spinlock_recursive.h | 34 ++++ include/odp/arch/default/api/abi/std_clib.h | 24 +++ include/odp/arch/default/api/abi/std_types.h | 43 +++++ include/odp/arch/default/api/abi/sync.h | 24 +++ include/odp/arch/default/api/abi/thread.h | 34 ++++ include/odp/arch/default/api/abi/thrmask.h | 48 ++++++ include/odp/arch/default/api/abi/ticketlock.h | 33 ++++ include/odp/arch/default/api/abi/time.h | 53 ++++++ include/odp/arch/default/api/abi/timer.h | 55 ++++++ include/odp/arch/default/api/abi/traffic_mngr.h | 178 +++++++++++++++++++ include/odp/arch/default/api/abi/version.h | 30 ++++ include/odp/arch/mips64-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/barrier.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/byteorder.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/init.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/ipsec.h | 7 + .../arch/mips64-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/packet_io.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/rwlock.h | 7 + .../mips64-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/schedule.h | 7 + .../arch/mips64-linux/odp/api/abi/schedule_types.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/spinlock.h | 7 + .../mips64-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/sync.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/thread.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/time.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/timer.h | 7 + .../arch/mips64-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/version.h | 7 + .../odp/arch/power64-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/power64-linux/odp/api/abi/barrier.h | 7 + .../odp/arch/power64-linux/odp/api/abi/byteorder.h | 7 + .../odp/arch/power64-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/power64-linux/odp/api/abi/init.h | 7 + include/odp/arch/power64-linux/odp/api/abi/ipsec.h | 7 + .../arch/power64-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/power64-linux/odp/api/abi/packet_io.h | 7 + .../odp/arch/power64-linux/odp/api/abi/rwlock.h | 7 + .../power64-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/power64-linux/odp/api/abi/schedule.h | 7 + .../power64-linux/odp/api/abi/schedule_types.h | 7 + .../odp/arch/power64-linux/odp/api/abi/spinlock.h | 7 + .../power64-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/power64-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/power64-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/power64-linux/odp/api/abi/sync.h | 7 + .../odp/arch/power64-linux/odp/api/abi/thread.h | 7 + .../odp/arch/power64-linux/odp/api/abi/thrmask.h | 7 + .../arch/power64-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/power64-linux/odp/api/abi/time.h | 7 + include/odp/arch/power64-linux/odp/api/abi/timer.h | 7 + .../arch/power64-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/power64-linux/odp/api/abi/version.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/barrier.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/byteorder.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/init.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h | 7 + .../arch/x86_32-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/packet_io.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h | 7 + .../x86_32-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/schedule.h | 7 + .../arch/x86_32-linux/odp/api/abi/schedule_types.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/spinlock.h | 7 + .../x86_32-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/sync.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/thread.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/time.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/timer.h | 7 + .../arch/x86_32-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/version.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/barrier.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/byteorder.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/init.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h | 7 + .../arch/x86_64-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/packet_io.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h | 7 + .../x86_64-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/schedule.h | 7 + .../arch/x86_64-linux/odp/api/abi/schedule_types.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/spinlock.h | 7 + .../x86_64-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/sync.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/thread.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/time.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/timer.h | 7 + .../arch/x86_64-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/version.h | 7 + 169 files changed, 2335 insertions(+), 6 deletions(-) create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/byteorder.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/byteorder.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/default/api/abi/atomic.h create mode 100644 include/odp/arch/default/api/abi/barrier.h create mode 100644 include/odp/arch/default/api/abi/byteorder.h create mode 100644 include/odp/arch/default/api/abi/cpumask.h create mode 100644 include/odp/arch/default/api/abi/init.h create mode 100644 include/odp/arch/default/api/abi/ipsec.h create mode 100644 include/odp/arch/default/api/abi/packet_flags.h create mode 100644 include/odp/arch/default/api/abi/packet_io.h create mode 100644 include/odp/arch/default/api/abi/rwlock.h create mode 100644 include/odp/arch/default/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/default/api/abi/schedule.h create mode 100644 include/odp/arch/default/api/abi/schedule_types.h create mode 100644 include/odp/arch/default/api/abi/spinlock.h create mode 100644 include/odp/arch/default/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/default/api/abi/std_clib.h create mode 100644 include/odp/arch/default/api/abi/std_types.h create mode 100644 include/odp/arch/default/api/abi/sync.h create mode 100644 include/odp/arch/default/api/abi/thread.h create mode 100644 include/odp/arch/default/api/abi/thrmask.h create mode 100644 include/odp/arch/default/api/abi/ticketlock.h create mode 100644 include/odp/arch/default/api/abi/time.h create mode 100644 include/odp/arch/default/api/abi/timer.h create mode 100644 include/odp/arch/default/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/default/api/abi/version.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/byteorder.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/byteorder.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/version.h -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index d53181ceb83d..40a4daa90fc2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -69,6 +69,38 @@ odpdrvspecinclude_HEADERS = \ odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ + odp/arch/default/api/abi/atomic.h \ + odp/arch/default/api/abi/barrier.h \ + odp/arch/default/api/abi/buffer.h \ + odp/arch/default/api/abi/byteorder.h \ + odp/arch/default/api/abi/classification.h \ + odp/arch/default/api/abi/cpumask.h \ + odp/arch/default/api/abi/crypto.h \ + odp/arch/default/api/abi/event.h \ + odp/arch/default/api/abi/init.h \ + odp/arch/default/api/abi/ipsec.h \ + odp/arch/default/api/abi/packet.h \ + odp/arch/default/api/abi/packet_flags.h \ + odp/arch/default/api/abi/packet_io.h \ + odp/arch/default/api/abi/pool.h \ + odp/arch/default/api/abi/queue.h \ + odp/arch/default/api/abi/rwlock.h \ + odp/arch/default/api/abi/rwlock_recursive.h \ + odp/arch/default/api/abi/schedule.h \ + odp/arch/default/api/abi/schedule_types.h \ + odp/arch/default/api/abi/shared_memory.h \ + odp/arch/default/api/abi/spinlock.h \ + odp/arch/default/api/abi/spinlock_recursive.h \ + odp/arch/default/api/abi/std_clib.h \ + odp/arch/default/api/abi/std_types.h \ + odp/arch/default/api/abi/sync.h \ + odp/arch/default/api/abi/thread.h \ + odp/arch/default/api/abi/thrmask.h \ + odp/arch/default/api/abi/ticketlock.h \ + odp/arch/default/api/abi/time.h \ + odp/arch/default/api/abi/timer.h \ + odp/arch/default/api/abi/traffic_mngr.h \ + odp/arch/default/api/abi/version.h odp/arch/default/api/abi/buffer.h \ odp/arch/default/api/abi/classification.h \ odp/arch/default/api/abi/crypto.h \ @@ -81,69 +113,213 @@ odpapiabidefaultinclude_HEADERS = \ odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ + odp/arch/arm32-linux/odp/api/abi/atomic.h \ + odp/arch/arm32-linux/odp/api/abi/barrier.h \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ + odp/arch/arm32-linux/odp/api/abi/byteorder.h \ odp/arch/arm32-linux/odp/api/abi/classification.h \ + odp/arch/arm32-linux/odp/api/abi/cpumask.h \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ odp/arch/arm32-linux/odp/api/abi/event.h \ + odp/arch/arm32-linux/odp/api/abi/init.h \ + odp/arch/arm32-linux/odp/api/abi/ipsec.h \ odp/arch/arm32-linux/odp/api/abi/packet.h \ + odp/arch/arm32-linux/odp/api/abi/packet_flags.h \ + odp/arch/arm32-linux/odp/api/abi/packet_io.h \ odp/arch/arm32-linux/odp/api/abi/pool.h \ odp/arch/arm32-linux/odp/api/abi/queue.h \ - odp/arch/arm32-linux/odp/api/abi/shared_memory.h + odp/arch/arm32-linux/odp/api/abi/rwlock.h \ + odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/arm32-linux/odp/api/abi/schedule.h \ + odp/arch/arm32-linux/odp/api/abi/schedule_types.h \ + odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ + odp/arch/arm32-linux/odp/api/abi/spinlock.h \ + odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/arm32-linux/odp/api/abi/std_clib.h \ + odp/arch/arm32-linux/odp/api/abi/std_types.h \ + odp/arch/arm32-linux/odp/api/abi/sync.h \ + odp/arch/arm32-linux/odp/api/abi/thread.h \ + odp/arch/arm32-linux/odp/api/abi/thrmask.h \ + odp/arch/arm32-linux/odp/api/abi/ticketlock.h \ + odp/arch/arm32-linux/odp/api/abi/time.h \ + odp/arch/arm32-linux/odp/api/abi/timer.h \ + odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/atomic.h \ + odp/arch/arm64-linux/odp/api/abi/barrier.h \ odp/arch/arm64-linux/odp/api/abi/buffer.h \ + odp/arch/arm64-linux/odp/api/abi/byteorder.h \ odp/arch/arm64-linux/odp/api/abi/classification.h \ + odp/arch/arm64-linux/odp/api/abi/cpumask.h \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ odp/arch/arm64-linux/odp/api/abi/event.h \ + odp/arch/arm64-linux/odp/api/abi/init.h \ + odp/arch/arm64-linux/odp/api/abi/ipsec.h \ odp/arch/arm64-linux/odp/api/abi/packet.h \ + odp/arch/arm64-linux/odp/api/abi/packet_flags.h \ + odp/arch/arm64-linux/odp/api/abi/packet_io.h \ odp/arch/arm64-linux/odp/api/abi/pool.h \ odp/arch/arm64-linux/odp/api/abi/queue.h \ - odp/arch/arm64-linux/odp/api/abi/shared_memory.h + odp/arch/arm64-linux/odp/api/abi/rwlock.h \ + odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/arm64-linux/odp/api/abi/schedule.h \ + odp/arch/arm64-linux/odp/api/abi/schedule_types.h \ + odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ + odp/arch/arm64-linux/odp/api/abi/spinlock.h \ + odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/arm64-linux/odp/api/abi/std_clib.h \ + odp/arch/arm64-linux/odp/api/abi/std_types.h \ + odp/arch/arm64-linux/odp/api/abi/sync.h \ + odp/arch/arm64-linux/odp/api/abi/thread.h \ + odp/arch/arm64-linux/odp/api/abi/thrmask.h \ + odp/arch/arm64-linux/odp/api/abi/ticketlock.h \ + odp/arch/arm64-linux/odp/api/abi/time.h \ + odp/arch/arm64-linux/odp/api/abi/timer.h \ + odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/atomic.h \ + odp/arch/mips64-linux/odp/api/abi/barrier.h \ odp/arch/mips64-linux/odp/api/abi/buffer.h \ + odp/arch/mips64-linux/odp/api/abi/byteorder.h \ odp/arch/mips64-linux/odp/api/abi/classification.h \ + odp/arch/mips64-linux/odp/api/abi/cpumask.h \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ odp/arch/mips64-linux/odp/api/abi/event.h \ + odp/arch/mips64-linux/odp/api/abi/init.h \ + odp/arch/mips64-linux/odp/api/abi/ipsec.h \ odp/arch/mips64-linux/odp/api/abi/packet.h \ + odp/arch/mips64-linux/odp/api/abi/packet_flags.h \ + odp/arch/mips64-linux/odp/api/abi/packet_io.h \ odp/arch/mips64-linux/odp/api/abi/pool.h \ odp/arch/mips64-linux/odp/api/abi/queue.h \ - odp/arch/mips64-linux/odp/api/abi/shared_memory.h + odp/arch/mips64-linux/odp/api/abi/rwlock.h \ + odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/mips64-linux/odp/api/abi/schedule.h \ + odp/arch/mips64-linux/odp/api/abi/schedule_types.h \ + odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ + odp/arch/mips64-linux/odp/api/abi/spinlock.h \ + odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/mips64-linux/odp/api/abi/std_clib.h \ + odp/arch/mips64-linux/odp/api/abi/std_types.h \ + odp/arch/mips64-linux/odp/api/abi/sync.h \ + odp/arch/mips64-linux/odp/api/abi/thread.h \ + odp/arch/mips64-linux/odp/api/abi/thrmask.h \ + odp/arch/mips64-linux/odp/api/abi/ticketlock.h \ + odp/arch/mips64-linux/odp/api/abi/time.h \ + odp/arch/mips64-linux/odp/api/abi/timer.h \ + odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/atomic.h \ + odp/arch/power64-linux/odp/api/abi/barrier.h \ odp/arch/power64-linux/odp/api/abi/buffer.h \ + odp/arch/power64-linux/odp/api/abi/byteorder.h \ odp/arch/power64-linux/odp/api/abi/classification.h \ + odp/arch/power64-linux/odp/api/abi/cpumask.h \ odp/arch/power64-linux/odp/api/abi/crypto.h \ odp/arch/power64-linux/odp/api/abi/event.h \ + odp/arch/power64-linux/odp/api/abi/init.h \ + odp/arch/power64-linux/odp/api/abi/ipsec.h \ odp/arch/power64-linux/odp/api/abi/packet.h \ + odp/arch/power64-linux/odp/api/abi/packet_flags.h \ + odp/arch/power64-linux/odp/api/abi/packet_io.h \ odp/arch/power64-linux/odp/api/abi/pool.h \ odp/arch/power64-linux/odp/api/abi/queue.h \ - odp/arch/power64-linux/odp/api/abi/shared_memory.h + odp/arch/power64-linux/odp/api/abi/rwlock.h \ + odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/power64-linux/odp/api/abi/schedule.h \ + odp/arch/power64-linux/odp/api/abi/schedule_types.h \ + odp/arch/power64-linux/odp/api/abi/shared_memory.h \ + odp/arch/power64-linux/odp/api/abi/spinlock.h \ + odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/power64-linux/odp/api/abi/std_clib.h \ + odp/arch/power64-linux/odp/api/abi/std_types.h \ + odp/arch/power64-linux/odp/api/abi/sync.h \ + odp/arch/power64-linux/odp/api/abi/thread.h \ + odp/arch/power64-linux/odp/api/abi/thrmask.h \ + odp/arch/power64-linux/odp/api/abi/ticketlock.h \ + odp/arch/power64-linux/odp/api/abi/time.h \ + odp/arch/power64-linux/odp/api/abi/timer.h \ + odp/arch/power64-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/atomic.h \ + odp/arch/x86_32-linux/odp/api/abi/barrier.h \ odp/arch/x86_32-linux/odp/api/abi/buffer.h \ + odp/arch/x86_32-linux/odp/api/abi/byteorder.h \ odp/arch/x86_32-linux/odp/api/abi/classification.h \ + odp/arch/x86_32-linux/odp/api/abi/cpumask.h \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ odp/arch/x86_32-linux/odp/api/abi/event.h \ + odp/arch/x86_32-linux/odp/api/abi/init.h \ + odp/arch/x86_32-linux/odp/api/abi/ipsec.h \ odp/arch/x86_32-linux/odp/api/abi/packet.h \ + odp/arch/x86_32-linux/odp/api/abi/packet_flags.h \ + odp/arch/x86_32-linux/odp/api/abi/packet_io.h \ odp/arch/x86_32-linux/odp/api/abi/pool.h \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ - odp/arch/x86_32-linux/odp/api/abi/shared_memory.h + odp/arch/x86_32-linux/odp/api/abi/rwlock.h \ + odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/x86_32-linux/odp/api/abi/schedule.h \ + odp/arch/x86_32-linux/odp/api/abi/schedule_types.h \ + odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ + odp/arch/x86_32-linux/odp/api/abi/spinlock.h \ + odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/x86_32-linux/odp/api/abi/std_clib.h \ + odp/arch/x86_32-linux/odp/api/abi/std_types.h \ + odp/arch/x86_32-linux/odp/api/abi/sync.h \ + odp/arch/x86_32-linux/odp/api/abi/thread.h \ + odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ + odp/arch/x86_32-linux/odp/api/abi/ticketlock.h \ + odp/arch/x86_32-linux/odp/api/abi/time.h \ + odp/arch/x86_32-linux/odp/api/abi/timer.h \ + odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/atomic.h \ + odp/arch/x86_64-linux/odp/api/abi/barrier.h \ odp/arch/x86_64-linux/odp/api/abi/buffer.h \ + odp/arch/x86_64-linux/odp/api/abi/byteorder.h \ odp/arch/x86_64-linux/odp/api/abi/classification.h \ + odp/arch/x86_64-linux/odp/api/abi/cpumask.h \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ odp/arch/x86_64-linux/odp/api/abi/event.h \ + odp/arch/x86_64-linux/odp/api/abi/init.h \ + odp/arch/x86_64-linux/odp/api/abi/ipsec.h \ odp/arch/x86_64-linux/odp/api/abi/packet.h \ + odp/arch/x86_64-linux/odp/api/abi/packet_flags.h \ + odp/arch/x86_64-linux/odp/api/abi/packet_io.h \ odp/arch/x86_64-linux/odp/api/abi/pool.h \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ - odp/arch/x86_64-linux/odp/api/abi/shared_memory.h + odp/arch/x86_64-linux/odp/api/abi/rwlock.h \ + odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/x86_64-linux/odp/api/abi/schedule.h \ + odp/arch/x86_64-linux/odp/api/abi/schedule_types.h \ + odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ + odp/arch/x86_64-linux/odp/api/abi/spinlock.h \ + odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/x86_64-linux/odp/api/abi/std_clib.h \ + odp/arch/x86_64-linux/odp/api/abi/std_types.h \ + odp/arch/x86_64-linux/odp/api/abi/sync.h \ + odp/arch/x86_64-linux/odp/api/abi/thread.h \ + odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ + odp/arch/x86_64-linux/odp/api/abi/ticketlock.h \ + odp/arch/x86_64-linux/odp/api/abi/time.h \ + odp/arch/x86_64-linux/odp/api/abi/timer.h \ + odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/x86_64-linux/odp/api/abi/version.h endif # Create symlink for ABI header files. Application does not need to use the arch diff --git a/include/odp/arch/arm32-linux/odp/api/abi/atomic.h b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h new file mode 100644 index 000000000000..523c614ae2cc --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000000..11c3450103ba --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h new file mode 100644 index 000000000000..c76073317844 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h new file mode 100644 index 000000000000..56266f8b3a31 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/init.h b/include/odp/arch/arm32-linux/odp/api/abi/init.h new file mode 100644 index 000000000000..86b4852d9902 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h new file mode 100644 index 000000000000..e392c8ac0bc2 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h new file mode 100644 index 000000000000..08f954aae1ed --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h new file mode 100644 index 000000000000..e80c1452b568 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h new file mode 100644 index 000000000000..61faaf76b445 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 000000000000..ccfdf14aad8b --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h new file mode 100644 index 000000000000..82148ca978d5 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h new file mode 100644 index 000000000000..1b4f2b316320 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h new file mode 100644 index 000000000000..2e863b014f90 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 000000000000..e90219d901c4 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h new file mode 100644 index 000000000000..bda9fd3078fb --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_types.h b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h new file mode 100644 index 000000000000..44fc6f5ae20e --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/sync.h b/include/odp/arch/arm32-linux/odp/api/abi/sync.h new file mode 100644 index 000000000000..2fd45b629040 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thread.h b/include/odp/arch/arm32-linux/odp/api/abi/thread.h new file mode 100644 index 000000000000..69023d36bb4a --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h new file mode 100644 index 000000000000..523999dcc087 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h new file mode 100644 index 000000000000..160b5e156c9b --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/time.h b/include/odp/arch/arm32-linux/odp/api/abi/time.h new file mode 100644 index 000000000000..d4d734033c61 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/timer.h b/include/odp/arch/arm32-linux/odp/api/abi/timer.h new file mode 100644 index 000000000000..fea797339150 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 000000000000..41d297bce42f --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/version.h b/include/odp/arch/arm32-linux/odp/api/abi/version.h new file mode 100644 index 000000000000..1cdd175edb9a --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/atomic.h b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h new file mode 100644 index 000000000000..523c614ae2cc --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000000..11c3450103ba --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h new file mode 100644 index 000000000000..c76073317844 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h new file mode 100644 index 000000000000..56266f8b3a31 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/init.h b/include/odp/arch/arm64-linux/odp/api/abi/init.h new file mode 100644 index 000000000000..86b4852d9902 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h new file mode 100644 index 000000000000..e392c8ac0bc2 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h new file mode 100644 index 000000000000..08f954aae1ed --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h new file mode 100644 index 000000000000..e80c1452b568 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h new file mode 100644 index 000000000000..61faaf76b445 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 000000000000..ccfdf14aad8b --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h new file mode 100644 index 000000000000..82148ca978d5 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h new file mode 100644 index 000000000000..1b4f2b316320 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h new file mode 100644 index 000000000000..2e863b014f90 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 000000000000..e90219d901c4 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h new file mode 100644 index 000000000000..bda9fd3078fb --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std_types.h b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h new file mode 100644 index 000000000000..44fc6f5ae20e --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/sync.h b/include/odp/arch/arm64-linux/odp/api/abi/sync.h new file mode 100644 index 000000000000..2fd45b629040 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thread.h b/include/odp/arch/arm64-linux/odp/api/abi/thread.h new file mode 100644 index 000000000000..69023d36bb4a --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h new file mode 100644 index 000000000000..523999dcc087 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h new file mode 100644 index 000000000000..160b5e156c9b --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/time.h b/include/odp/arch/arm64-linux/odp/api/abi/time.h new file mode 100644 index 000000000000..d4d734033c61 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/timer.h b/include/odp/arch/arm64-linux/odp/api/abi/timer.h new file mode 100644 index 000000000000..fea797339150 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 000000000000..41d297bce42f --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/version.h b/include/odp/arch/arm64-linux/odp/api/abi/version.h new file mode 100644 index 000000000000..1cdd175edb9a --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/default/api/abi/atomic.h b/include/odp/arch/default/api/abi/atomic.h new file mode 100644 index 000000000000..295aee4e97dd --- /dev/null +++ b/include/odp/arch/default/api/abi/atomic.h @@ -0,0 +1,65 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP atomic operations + */ + +#ifndef ODP_ABI_ATOMIC_H_ +#define ODP_ABI_ATOMIC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +/** + * @internal + * Atomic 64-bit unsigned integer + */ +struct odp_atomic_u64_s { + uint64_t v; /**< Actual storage for the atomic variable */ +} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignment! */ + +#if __GCC_ATOMIC_LLONG_LOCK_FREE >= 2 +/** + * @internal + * Atomic 32-bit unsigned integer + */ +struct odp_atomic_u32_s { + uint32_t v; /**< Actual storage for the atomic variable */ +} ODP_ALIGNED(sizeof(uint32_t)); /* Enforce alignment! */ + +#else + +#define ODP_ATOMIC_U64_LOCK 1 + +/** + * @internal + * Atomic 64-bit unsigned integer + */ +struct odp_atomic_u64_s { + uint64_t v; /**< Actual storage for the atomic variable */ + /* Some architectures do not support lock-free operations on 64-bit + * data types. We use a spin lock to ensure atomicity. */ + char lock; /**< Spin lock (if needed) used to ensure atomic access */ +} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignment! */ + +#endif + +typedef struct odp_atomic_u64_s odp_atomic_u64_t; + +typedef struct odp_atomic_u32_s odp_atomic_u32_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/barrier.h b/include/odp/arch/default/api/abi/barrier.h new file mode 100644 index 000000000000..51d913774c8e --- /dev/null +++ b/include/odp/arch/default/api/abi/barrier.h @@ -0,0 +1,38 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP barrier + */ + +#ifndef ODP_ABI_BARRIER_H_ +#define ODP_ABI_BARRIER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +/** + * @internal + * ODP thread synchronization barrier + */ +struct odp_barrier_s { + uint32_t count; /**< Thread count */ + odp_atomic_u32_t bar; /**< Barrier counter */ +}; + +typedef struct odp_barrier_s odp_barrier_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/byteorder.h b/include/odp/arch/default/api/abi/byteorder.h new file mode 100644 index 000000000000..92f9743ad709 --- /dev/null +++ b/include/odp/arch/default/api/abi/byteorder.h @@ -0,0 +1,73 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP byteorder + */ + +#ifndef ODP_ABI_BYTEORDER_H_ +#define ODP_ABI_BYTEORDER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#ifndef __BYTE_ORDER__ +#error __BYTE_ORDER__ not defined! +#endif + +#ifndef __ORDER_BIG_ENDIAN__ +#error __ORDER_BIG_ENDIAN__ not defined! +#endif + +#ifndef __ORDER_LITTLE_ENDIAN__ +#error __ORDER_LITTLE_ENDIAN__ not defined! +#endif + +/** @addtogroup odp_compiler_optim + * @{ + */ +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + #define ODP_LITTLE_ENDIAN 1 + #define ODP_BIG_ENDIAN 0 + #define ODP_BYTE_ORDER ODP_LITTLE_ENDIAN + #define ODP_LITTLE_ENDIAN_BITFIELD 1 + #define ODP_BIG_ENDIAN_BITFIELD 0 + #define ODP_BITFIELD_ORDER ODP_LITTLE_ENDIAN_BITFIELD +#else + #define ODP_LITTLE_ENDIAN 0 + #define ODP_BIG_ENDIAN 1 + #define ODP_BYTE_ORDER ODP_BIG_ENDIAN + #define ODP_LITTLE_ENDIAN_BITFIELD 0 + #define ODP_BIG_ENDIAN_BITFIELD 1 + #define ODP_BITFIELD_ORDER ODP_BIG_ENDIAN_BITFIELD +#endif + +typedef uint16_t odp_u16le_t; +typedef uint16_t odp_u16be_t; + +typedef uint32_t odp_u32le_t; +typedef uint32_t odp_u32be_t; + +typedef uint64_t odp_u64le_t; +typedef uint64_t odp_u64be_t; + +typedef uint16_t odp_u16sum_t; +typedef uint32_t odp_u32sum_t; + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/cpumask.h b/include/odp/arch/default/api/abi/cpumask.h new file mode 100644 index 000000000000..394a80da72c7 --- /dev/null +++ b/include/odp/arch/default/api/abi/cpumask.h @@ -0,0 +1,54 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP CPU masks and enumeration + */ + +#ifndef ODP_ABI_CPUMASK_H_ +#define ODP_ABI_CPUMASK_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @addtogroup odp_cpumask + * @{ + */ + +#include +#include + +#define ODP_CPUMASK_SIZE 1024 + +#define ODP_CPUMASK_STR_SIZE ((ODP_CPUMASK_SIZE + 3) / 4 + 3) + +/** + * CPU mask + * + * Don't access directly, use access functions. + */ +typedef struct odp_cpumask_t { + /** @private CPU mask storage + * + * This is private to the implementation. + * Don't access directly, use access functions. + */ + uint8_t _u8[ODP_CPUMASK_SIZE / 8]; +} odp_cpumask_t ODP_ALIGNED(8); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/init.h b/include/odp/arch/default/api/abi/init.h new file mode 100644 index 000000000000..dbeb54975733 --- /dev/null +++ b/include/odp/arch/default/api/abi/init.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP initialization. + */ + +#ifndef ODP_ABI_INIT_H_ +#define ODP_ABI_INIT_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +typedef uint64_t odp_instance_t; + +/** + * @internal platform specific data + */ +typedef struct odp_platform_init_t { + char dummy; +} odp_platform_init_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/ipsec.h b/include/odp/arch/default/api/abi/ipsec.h new file mode 100644 index 000000000000..dbd66d9d87b2 --- /dev/null +++ b/include/odp/arch/default/api/abi/ipsec.h @@ -0,0 +1,41 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP IPSEC API - platform specific types + */ + +#ifndef ODP_ABI_IPSEC_H_ +#define ODP_ABI_IPSEC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_ipsec_sa_t; + +/** @ingroup odp_ipsec + * @{ + */ + +typedef _odp_abi_ipsec_sa_t *odp_ipsec_sa_t; + +#define ODP_IPSEC_SA_INVALID ((odp_ipsec_sa_t)0xffffffff) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/packet_flags.h b/include/odp/arch/default/api/abi/packet_flags.h new file mode 100644 index 000000000000..3a7877a1723f --- /dev/null +++ b/include/odp/arch/default/api/abi/packet_flags.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP packet descriptor + */ + +#ifndef ODP_ABI_PACKET_FLAGS_H_ +#define ODP_ABI_PACKET_FLAGS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/packet_io.h b/include/odp/arch/default/api/abi/packet_io.h new file mode 100644 index 000000000000..86c3f075a754 --- /dev/null +++ b/include/odp/arch/default/api/abi/packet_io.h @@ -0,0 +1,60 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP Packet IO + */ + +#ifndef ODP_ABI_PACKET_IO_H_ +#define ODP_ABI_PACKET_IO_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_pktio_t; + +/** @addtogroup odp_packet_io + * Operations on a packet. + * @{ + */ + +typedef _odp_abi_pktio_t *odp_pktio_t; + +/** @internal */ +typedef struct odp_pktin_queue_t { + odp_pktio_t pktio; /**< @internal pktio handle */ + int index; /**< @internal pktio queue index */ +} odp_pktin_queue_t; + +/** @internal */ +typedef struct odp_pktout_queue_t { + odp_pktio_t pktio; /**< @internal pktio handle */ + int index; /**< @internal pktio queue index */ +} odp_pktout_queue_t; + +#define ODP_PKTIO_INVALID ((odp_pktio_t)0) + +#define ODP_PKTIO_MACADDR_MAXSIZE 16 + +#define ODP_PKTIN_NO_WAIT 0 +#define ODP_PKTIN_WAIT UINT64_MAX + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/rwlock.h b/include/odp/arch/default/api/abi/rwlock.h new file mode 100644 index 000000000000..619f61e8cc41 --- /dev/null +++ b/include/odp/arch/default/api/abi/rwlock.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP rwlock + */ + +#ifndef ODP_ABI_RWLOCK_H_ +#define ODP_ABI_RWLOCK_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** @internal */ +typedef struct odp_rwlock_s { + odp_atomic_u32_t cnt; /**< lock count + 0 lock not taken + -1 write lock taken + >0 read lock(s) taken */ +} odp_rwlock_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/rwlock_recursive.h b/include/odp/arch/default/api/abi/rwlock_recursive.h new file mode 100644 index 000000000000..f5f78bfa4c43 --- /dev/null +++ b/include/odp/arch/default/api/abi/rwlock_recursive.h @@ -0,0 +1,36 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP recursive read/write lock + */ + +#ifndef ODP_ABI_RWLOCK_RECURSIVE_H_ +#define ODP_ABI_RWLOCK_RECURSIVE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include + +/** @internal */ +typedef struct odp_rwlock_recursive_s { + odp_rwlock_t lock; /**< the lock */ + int wr_owner; /**< write owner thread */ + uint32_t wr_cnt; /**< write recursion count */ + uint8_t rd_cnt[ODP_THREAD_COUNT_MAX]; /**< read recursion count */ +} odp_rwlock_recursive_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/schedule.h b/include/odp/arch/default/api/abi/schedule.h new file mode 100644 index 000000000000..9615cb012653 --- /dev/null +++ b/include/odp/arch/default/api/abi/schedule.h @@ -0,0 +1,48 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP schedule + */ + +#ifndef ODP_ABI_SCHEDULE_H_ +#define ODP_ABI_SCHEDULE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** @addtogroup odp_scheduler + * @{ + */ + +#define ODP_SCHED_WAIT UINT64_MAX +#define ODP_SCHED_NO_WAIT 0 + +typedef int odp_schedule_group_t; + +/* These must be kept in sync with thread_globals_t in odp_thread.c */ +#define ODP_SCHED_GROUP_INVALID ((odp_schedule_group_t)-1) +#define ODP_SCHED_GROUP_ALL 0 +#define ODP_SCHED_GROUP_WORKER 1 +#define ODP_SCHED_GROUP_CONTROL 2 + +#define ODP_SCHED_GROUP_NAME_LEN 32 + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/schedule_types.h b/include/odp/arch/default/api/abi/schedule_types.h new file mode 100644 index 000000000000..21ad4db7617b --- /dev/null +++ b/include/odp/arch/default/api/abi/schedule_types.h @@ -0,0 +1,49 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP schedule + */ + +#ifndef ODP_ABI_SCHEDULE_TYPES_H_ +#define ODP_ABI_SCHEDULE_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @addtogroup odp_scheduler + * @{ + */ + +typedef int odp_schedule_prio_t; + +#define ODP_SCHED_PRIO_HIGHEST 0 + +#define ODP_SCHED_PRIO_NORMAL 4 + +#define ODP_SCHED_PRIO_LOWEST 7 + +#define ODP_SCHED_PRIO_DEFAULT ODP_SCHED_PRIO_NORMAL + +typedef int odp_schedule_sync_t; + +#define ODP_SCHED_SYNC_PARALLEL 0 +#define ODP_SCHED_SYNC_ATOMIC 1 +#define ODP_SCHED_SYNC_ORDERED 2 + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/spinlock.h b/include/odp/arch/default/api/abi/spinlock.h new file mode 100644 index 000000000000..ceb9288123e3 --- /dev/null +++ b/include/odp/arch/default/api/abi/spinlock.h @@ -0,0 +1,30 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP spinlock + */ + +#ifndef ODP_ABI_SPINLOCK_H_ +#define ODP_ABI_SPINLOCK_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @internal */ +typedef struct odp_spinlock_s { + char lock; /**< lock flag, should match odp_atomic_flag_t */ +} odp_spinlock_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/spinlock_recursive.h b/include/odp/arch/default/api/abi/spinlock_recursive.h new file mode 100644 index 000000000000..235f7ac6bfbe --- /dev/null +++ b/include/odp/arch/default/api/abi/spinlock_recursive.h @@ -0,0 +1,34 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP recursive spinlock + */ + +#ifndef ODP_ABI_SPINLOCK_RECURSIVE_H_ +#define ODP_ABI_SPINLOCK_RECURSIVE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +/** @internal */ +typedef struct odp_spinlock_recursive_s { + odp_spinlock_t lock; /**< the lock */ + int owner; /**< thread owning the lock */ + uint32_t cnt; /**< recursion count */ +} odp_spinlock_recursive_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/std_clib.h b/include/odp/arch/default/api/abi/std_clib.h new file mode 100644 index 000000000000..88ea770aec5e --- /dev/null +++ b/include/odp/arch/default/api/abi/std_clib.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP barrier + */ + +#ifndef ODP_ABI_STD_CLIB_H_ +#define ODP_ABI_STD_CLIB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/std_types.h b/include/odp/arch/default/api/abi/std_types.h new file mode 100644 index 000000000000..aa449512aeb9 --- /dev/null +++ b/include/odp/arch/default/api/abi/std_types.h @@ -0,0 +1,43 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * Standard C language types and definitions for ODP. + */ + +#ifndef ODP_ABI_STD_TYPES_H_ +#define ODP_ABI_STD_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* uint64_t, uint32_t, etc */ +#include + +/* size_t */ +#include + +/* true and false for odp_bool_t */ +#include + +/** @addtogroup odp_system ODP SYSTEM + * @{ + */ + +typedef int odp_bool_t; + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/sync.h b/include/odp/arch/default/api/abi/sync.h new file mode 100644 index 000000000000..d325507ca28d --- /dev/null +++ b/include/odp/arch/default/api/abi/sync.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP barrier + */ + +#ifndef ODP_ABI_SYNC_H_ +#define ODP_ABI_SYNC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/thread.h b/include/odp/arch/default/api/abi/thread.h new file mode 100644 index 000000000000..682d85005328 --- /dev/null +++ b/include/odp/arch/default/api/abi/thread.h @@ -0,0 +1,34 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP thread + */ + +#ifndef ODP_ABI_THREAD_H_ +#define ODP_ABI_THREAD_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @addtogroup odp_thread + * @{ + */ + +#define ODP_THREAD_COUNT_MAX 128 + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/thrmask.h b/include/odp/arch/default/api/abi/thrmask.h new file mode 100644 index 000000000000..1fafd2291e0d --- /dev/null +++ b/include/odp/arch/default/api/abi/thrmask.h @@ -0,0 +1,48 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP thread masks + */ + +#ifndef ODP_ABI_THRMASK_H_ +#define ODP_ABI_THRMASK_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @addtogroup odp_thread + * @{ + */ + +#include + +/** + * Minimum size of output buffer for odp_thrmask_to_str() + */ +#define ODP_THRMASK_STR_SIZE ODP_CPUMASK_STR_SIZE + +/** + * Thread mask + * + * Don't access directly, use access functions. + */ +typedef struct odp_thrmask_t { + odp_cpumask_t m; /**< @private Mask*/ +} odp_thrmask_t; + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/ticketlock.h b/include/odp/arch/default/api/abi/ticketlock.h new file mode 100644 index 000000000000..e19df48b215e --- /dev/null +++ b/include/odp/arch/default/api/abi/ticketlock.h @@ -0,0 +1,33 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP ticketlock + */ + +#ifndef ODP_ABI_TICKETLOCK_H_ +#define ODP_ABI_TICKETLOCK_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** @internal */ +typedef struct odp_ticketlock_s { + odp_atomic_u32_t next_ticket; /**< Next ticket */ + odp_atomic_u32_t cur_ticket; /**< Current ticket */ +} odp_ticketlock_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/time.h b/include/odp/arch/default/api/abi/time.h new file mode 100644 index 000000000000..d3b5abda33a6 --- /dev/null +++ b/include/odp/arch/default/api/abi/time.h @@ -0,0 +1,53 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP time service + */ + +#ifndef ODP_ABI_TIME_H_ +#define ODP_ABI_TIME_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @addtogroup odp_time + * @{ + **/ + +/** + * @internal Time structure used for both POSIX timespec and HW counter + * implementations. + */ +typedef struct odp_time_t { + /** @internal Variant mappings for time type */ + union { + /** @internal Used with generic 64 bit operations */ + uint64_t u64; + + /** @internal Nanoseconds */ + uint64_t nsec; + + /** @internal HW timer counter value */ + uint64_t count; + + }; +} odp_time_t; + +#define ODP_TIME_NULL ((odp_time_t){.u64 = 0}) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/timer.h b/include/odp/arch/default/api/abi/timer.h new file mode 100644 index 000000000000..3bdbb1620ecb --- /dev/null +++ b/include/odp/arch/default/api/abi/timer.h @@ -0,0 +1,55 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP timer service + */ + +#ifndef ODP_ABI_TIMER_H_ +#define ODP_ABI_TIMER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_timer_t; + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_timeout_t; + +/** @addtogroup odp_timer + * @{ + **/ + +struct timer_pool_s; /**< Forward declaration */ + +typedef struct timer_pool_s *odp_timer_pool_t; + +#define ODP_TIMER_POOL_INVALID NULL + +#define ODP_TIMER_POOL_NAME_LEN 32 + +typedef _odp_abi_timer_t *odp_timer_t; + +#define ODP_TIMER_INVALID ((odp_timer_t)0xffffffff) + +typedef _odp_abi_timeout_t *odp_timeout_t; + +#define ODP_TIMEOUT_INVALID ((odp_timeout_t)NULL) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/traffic_mngr.h b/include/odp/arch/default/api/abi/traffic_mngr.h new file mode 100644 index 000000000000..b43ab1a0279e --- /dev/null +++ b/include/odp/arch/default/api/abi/traffic_mngr.h @@ -0,0 +1,178 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP traffic mngr + */ + +#ifndef ODP_ABI_TRAFFIC_MNGR_H_ +#define ODP_ABI_TRAFFIC_MNGR_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** @addtogroup odp_traffic_mngr + * Macros and operations on a TM system. + * @{ + */ + +/** The ODP_TM_MAX_NUM_SYSTEMS constant specifies the maximum number of TM + * systems that may be created. On some platforms this might be much more + * limited to as little as one hardware TM system. + */ +#define ODP_TM_MAX_NUM_SYSTEMS 64 + +/** The ODP_TM_MAX_PRIORITIES constant specifies the largest range of + * priorities that any TM system can support. All strict priority values MUST + * in the range 0..ODP_TM_MAX_PRIORITIES-1. + */ +#define ODP_TM_MAX_PRIORITIES 16 + +/** The ODP_TM MAX_LEVELS constant specifies the largest range of + * tm_node levels that any TM system can support. Hence all tm_node level + * values MUST be in the range 0..ODP_TM_MAX_LEVELS-1. Smaller tm_node + * levels are associated with tm_nodes closer to the TM system egress. + */ +#define ODP_TM_MAX_LEVELS 8 + +/** + * The smallest SCHED weight is 1 (i.e. 0 is not a legal WFQ/WRR value). + */ +#define ODP_TM_MIN_SCHED_WEIGHT 1 + +/** The ODP_TM_MAX_SCHED_WEIGHT constant is the largest weight any TM system + * can support (at least from a configuration standpoint). A given TM system + * could have a smaller value. + */ +#define ODP_TM_MAX_SCHED_WEIGHT 255 + +/** The ODP_TM_MAX_TM_QUEUES constant is the largest number of tm_queues + * that can be handled by any one TM system. + */ +#define ODP_TM_MAX_TM_QUEUES (16 * 1024 * 1024) + +/** The ODP_TM_MAX_NUM_OUTPUTS constant is the largest number of outputs that + * can be configured for any one TM system. + */ +#define ODP_TM_MAX_NUM_OUTPUTS 256 + +/** The ODP_TM_MAX_NUM_TM_NODES constant is the largest number of tm_nodes that + * can be in existence for any one TM system. + */ +#define ODP_TM_MAX_NUM_TM_NODES (1024 * 1024) + +/** The ODP_TM_MAX_TM_NODE_FANIN constant is the largest number of fan-in + * "inputs" that can be simultaneously connected to a single tm_node. + * *TBD* Does this need to be as large as ODP_TM_MAX_TM_QUEUES? *TBD* + */ +#define ODP_TM_MAX_TM_NODE_FANIN (1024 * 1024) + +/** The ODP_TM_MIN_SHAPER_BW constant is the smallest amount of bandwidth that + * can a shaper's peak or commit rate can be set to. It is in units of + * 1000 bytes/second so that it and the ODP_TM_MAX_SHAPER_BW can both fit in + * 32 bits. + */ +#define ODP_TM_MIN_SHAPER_BW 1 + +/** The ODP_TM_MAX_SHAPER_BW constant is the largest amound of bandwidth that + * any shaper's peak or commit rate can be set to. It is in units of + * 1000 bytes/second so that it and the ODP_TM_MIN_SHAPER_BW can both fit in + * 32 bits. + */ +#define ODP_TM_MAX_SHAPER_BW 12500000 + +/** The ODP_NUM_SHAPER_COLORS constant just counts the number of enumeration + * values defined in the odp_tm_shaper_color_t type. + */ +#define ODP_NUM_SHAPER_COLORS 3 + +/** The INVALID_PRIORITY constant is used when one needs to indicate an + * invalid priority value. + */ +#define ODP_TM_INVALID_PRIORITY 255 + +/** The odp_tm_percent_t type is used when specifying fields that are + * percentages. It is a fixed point integer whose units are 1/100 of a + * percent. Hence 100% is represented as the integer value 10000. Note + * that because it is often used as a ratio of the current queue value and + * maximum queue threshold, it can be > 100%, but in any event will never + * be larger than 500% (i.e. it MUST be capped at 50000). + */ +typedef uint16_t odp_tm_percent_t; + +/** The odp_tm_handle_t type is a generic type that can stand for any of the + * other ODP_TM handle types. + */ +typedef uint64_t odp_tm_handle_t; + +/** Each odp_tm_t value represents a specific TM system. Almost all + * functions in this API require a odp_tm_t value - either directly + * as a function parameter or indirectly by having another ODP TM handle value + * as a function parameter. + */ +typedef odp_tm_handle_t odp_tm_t; + +/** Each odp_tm_queue_t value is an opaque ODP handle representing a specific + * tm_queue within a specific TM system. + */ +typedef odp_tm_handle_t odp_tm_queue_t; + +/** Each odp_tm_node_t value is an opaque ODP handle representing a specific + * tm_node within a specific TM system. + */ +typedef odp_tm_handle_t odp_tm_node_t; + +/** Each odp_tm_shaper_t value is an opaque ODP handle representing a specific + * shaper profile usable across all TM systems described by this API. A given + * shaper profile can then be attached to any tm_queue or tm_node. + */ +typedef odp_tm_handle_t odp_tm_shaper_t; + +/** Each odp_tm_sched_t value is an opaque ODP handle representing a specific + * tm_node scheduler profile usable across all TM systems described by this + * API. A given tm_node scheduler profile can then be attached to any tm_node. + */ +typedef odp_tm_handle_t odp_tm_sched_t; + +/** Each odp_tm_threshold_t value is an opaque ODP handle representing a + * specific queue threshold profile usable across all TM systems described by + * this API. A given queue threshold profile can then be attached to any + * tm_queue or tm_node. + */ +typedef odp_tm_handle_t odp_tm_threshold_t; + +/** Each odp_tm_wred_t value is an opaque ODP handle representing a specific + * WRED profile usable across all TM systems described by this API. A given + * WRED profile can then be attached to any tm_queue or tm_node. + */ +typedef odp_tm_handle_t odp_tm_wred_t; + +/** The ODP_TM_INVALID constant can be used with any ODP TM handle type and + * indicates that this value does NOT represent a valid TM object. + */ +#define ODP_TM_INVALID 0 + +/** + * @def ODP_TM_ROOT + * Constant that is used to refer to the egress/root node of the TM subsystem's + * tree/hierarchy of nodes. + */ +#define ODP_TM_ROOT ((odp_tm_handle_t)-1) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default/api/abi/version.h b/include/odp/arch/default/api/abi/version.h new file mode 100644 index 000000000000..0f48ecc160fe --- /dev/null +++ b/include/odp/arch/default/api/abi/version.h @@ -0,0 +1,30 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ABI_VERSION_H_ +#define ODP_ABI_VERSION_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @internal Version string expand */ +#define ODP_VERSION_STR_EXPAND(x) #x + +/** @internal Version to string */ +#define ODP_VERSION_TO_STR(x) ODP_VERSION_STR_EXPAND(x) + +/** @internal API version string */ +#define ODP_VERSION_API_STR \ +ODP_VERSION_TO_STR(ODP_VERSION_API_GENERATION) "." \ +ODP_VERSION_TO_STR(ODP_VERSION_API_MAJOR) "." \ +ODP_VERSION_TO_STR(ODP_VERSION_API_MINOR) + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/mips64-linux/odp/api/abi/atomic.h b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h new file mode 100644 index 000000000000..523c614ae2cc --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000000..11c3450103ba --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h new file mode 100644 index 000000000000..c76073317844 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h new file mode 100644 index 000000000000..56266f8b3a31 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/init.h b/include/odp/arch/mips64-linux/odp/api/abi/init.h new file mode 100644 index 000000000000..86b4852d9902 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h new file mode 100644 index 000000000000..e392c8ac0bc2 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h new file mode 100644 index 000000000000..08f954aae1ed --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h new file mode 100644 index 000000000000..e80c1452b568 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h new file mode 100644 index 000000000000..61faaf76b445 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 000000000000..ccfdf14aad8b --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h new file mode 100644 index 000000000000..82148ca978d5 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h new file mode 100644 index 000000000000..1b4f2b316320 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h new file mode 100644 index 000000000000..2e863b014f90 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 000000000000..e90219d901c4 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h new file mode 100644 index 000000000000..bda9fd3078fb --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/std_types.h b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h new file mode 100644 index 000000000000..44fc6f5ae20e --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/sync.h b/include/odp/arch/mips64-linux/odp/api/abi/sync.h new file mode 100644 index 000000000000..2fd45b629040 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thread.h b/include/odp/arch/mips64-linux/odp/api/abi/thread.h new file mode 100644 index 000000000000..69023d36bb4a --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h new file mode 100644 index 000000000000..523999dcc087 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h new file mode 100644 index 000000000000..160b5e156c9b --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/time.h b/include/odp/arch/mips64-linux/odp/api/abi/time.h new file mode 100644 index 000000000000..d4d734033c61 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/timer.h b/include/odp/arch/mips64-linux/odp/api/abi/timer.h new file mode 100644 index 000000000000..fea797339150 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 000000000000..41d297bce42f --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/version.h b/include/odp/arch/mips64-linux/odp/api/abi/version.h new file mode 100644 index 000000000000..1cdd175edb9a --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/atomic.h b/include/odp/arch/power64-linux/odp/api/abi/atomic.h new file mode 100644 index 000000000000..523c614ae2cc --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/barrier.h b/include/odp/arch/power64-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000000..11c3450103ba --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/byteorder.h b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h new file mode 100644 index 000000000000..c76073317844 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h new file mode 100644 index 000000000000..56266f8b3a31 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/init.h b/include/odp/arch/power64-linux/odp/api/abi/init.h new file mode 100644 index 000000000000..86b4852d9902 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/ipsec.h b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h new file mode 100644 index 000000000000..e392c8ac0bc2 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h new file mode 100644 index 000000000000..08f954aae1ed --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_io.h b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h new file mode 100644 index 000000000000..e80c1452b568 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h new file mode 100644 index 000000000000..61faaf76b445 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 000000000000..ccfdf14aad8b --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule.h b/include/odp/arch/power64-linux/odp/api/abi/schedule.h new file mode 100644 index 000000000000..82148ca978d5 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h new file mode 100644 index 000000000000..1b4f2b316320 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h new file mode 100644 index 000000000000..2e863b014f90 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 000000000000..e90219d901c4 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/std_clib.h b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h new file mode 100644 index 000000000000..bda9fd3078fb --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/std_types.h b/include/odp/arch/power64-linux/odp/api/abi/std_types.h new file mode 100644 index 000000000000..44fc6f5ae20e --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/sync.h b/include/odp/arch/power64-linux/odp/api/abi/sync.h new file mode 100644 index 000000000000..2fd45b629040 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/thread.h b/include/odp/arch/power64-linux/odp/api/abi/thread.h new file mode 100644 index 000000000000..69023d36bb4a --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/thrmask.h b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h new file mode 100644 index 000000000000..523999dcc087 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h new file mode 100644 index 000000000000..160b5e156c9b --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/time.h b/include/odp/arch/power64-linux/odp/api/abi/time.h new file mode 100644 index 000000000000..d4d734033c61 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/timer.h b/include/odp/arch/power64-linux/odp/api/abi/timer.h new file mode 100644 index 000000000000..fea797339150 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 000000000000..41d297bce42f --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/version.h b/include/odp/arch/power64-linux/odp/api/abi/version.h new file mode 100644 index 000000000000..1cdd175edb9a --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h new file mode 100644 index 000000000000..523c614ae2cc --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000000..11c3450103ba --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h new file mode 100644 index 000000000000..c76073317844 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h new file mode 100644 index 000000000000..56266f8b3a31 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/init.h b/include/odp/arch/x86_32-linux/odp/api/abi/init.h new file mode 100644 index 000000000000..86b4852d9902 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h new file mode 100644 index 000000000000..e392c8ac0bc2 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h new file mode 100644 index 000000000000..08f954aae1ed --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h new file mode 100644 index 000000000000..e80c1452b568 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h new file mode 100644 index 000000000000..61faaf76b445 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 000000000000..ccfdf14aad8b --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h new file mode 100644 index 000000000000..82148ca978d5 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h new file mode 100644 index 000000000000..1b4f2b316320 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h new file mode 100644 index 000000000000..2e863b014f90 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 000000000000..e90219d901c4 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h new file mode 100644 index 000000000000..bda9fd3078fb --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h new file mode 100644 index 000000000000..44fc6f5ae20e --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/sync.h b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h new file mode 100644 index 000000000000..2fd45b629040 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h new file mode 100644 index 000000000000..69023d36bb4a --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h new file mode 100644 index 000000000000..523999dcc087 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h new file mode 100644 index 000000000000..160b5e156c9b --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/time.h b/include/odp/arch/x86_32-linux/odp/api/abi/time.h new file mode 100644 index 000000000000..d4d734033c61 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/timer.h b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h new file mode 100644 index 000000000000..fea797339150 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 000000000000..41d297bce42f --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/version.h b/include/odp/arch/x86_32-linux/odp/api/abi/version.h new file mode 100644 index 000000000000..1cdd175edb9a --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h new file mode 100644 index 000000000000..523c614ae2cc --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000000..11c3450103ba --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h new file mode 100644 index 000000000000..c76073317844 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h new file mode 100644 index 000000000000..56266f8b3a31 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/init.h b/include/odp/arch/x86_64-linux/odp/api/abi/init.h new file mode 100644 index 000000000000..86b4852d9902 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h new file mode 100644 index 000000000000..e392c8ac0bc2 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h new file mode 100644 index 000000000000..08f954aae1ed --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h new file mode 100644 index 000000000000..e80c1452b568 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h new file mode 100644 index 000000000000..61faaf76b445 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 000000000000..ccfdf14aad8b --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h new file mode 100644 index 000000000000..82148ca978d5 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h new file mode 100644 index 000000000000..1b4f2b316320 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h new file mode 100644 index 000000000000..2e863b014f90 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 000000000000..e90219d901c4 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h new file mode 100644 index 000000000000..bda9fd3078fb --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h new file mode 100644 index 000000000000..44fc6f5ae20e --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/sync.h b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h new file mode 100644 index 000000000000..2fd45b629040 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h new file mode 100644 index 000000000000..69023d36bb4a --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h new file mode 100644 index 000000000000..523999dcc087 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h new file mode 100644 index 000000000000..160b5e156c9b --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/time.h b/include/odp/arch/x86_64-linux/odp/api/abi/time.h new file mode 100644 index 000000000000..d4d734033c61 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/timer.h b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h new file mode 100644 index 000000000000..fea797339150 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 000000000000..41d297bce42f --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/version.h b/include/odp/arch/x86_64-linux/odp/api/abi/version.h new file mode 100644 index 000000000000..1cdd175edb9a --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include From patchwork Mon Oct 23 11:10:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116683 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4524271qgn; Mon, 23 Oct 2017 04:18:39 -0700 (PDT) X-Received: by 10.200.34.26 with SMTP id o26mr19646494qto.17.1508757519152; Mon, 23 Oct 2017 04:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757519; cv=none; d=google.com; s=arc-20160816; b=BDZmugzNieb8e3fzllh799D3D81bmUgHp4UC3h52jUg2tsMuLMTvAHi18yO2t3oQa0 ND7R5Gh6T23sjhFKJMKvq8Uo/SNb04mSIXdBYuQVzAimouuErxhZl5WND0yqZlAyHkkF TK+WSoNWB+SryrWmvTLImnDPdBDb5uMrfZtOXVuebYI8elAfGMBIeBDaDJmVON9mUoXr eo/X/92FEieqFS3bIBoLZoCfOsCrG9m1y0nfe/TKZ75Qy8ntd0zWOGgoFPYMzdjC8H6h QdUkyT6S9N1k6thLVNB8pmuepDebu30BdKx5kKtiFptkv4TlGENTtt0p7MxxS8jK2LrV D98w== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=9S1LEgt5SPHd04QPlO9xFHN6e8Cl7mbXT26/GIEhCos=; b=Yn5fgC6yx2N+0JX2hv49qLoXFMdH82O9frJsggDBDuVdMIWUMaiVCJIYCzZoaOpZPS 4W/lEdRKTroIN+wdl2T3Nn5UMyhpU0i1s/FdM/SczQ9sTHk4ddAAhvOWc+zaOu9y18lG tHmFn/o2G8uVzuj7xnS8PxdZLFy7HzVQzrtVqpXO9hTCwVau9c1hPWEtcvvUOLv7abwf /O1JylqUAyqFp9JNeyVhNdIvhLhKkh4MGkxhIwgr2S9jTC6X4UJFpcuMOes6LLP0VMM9 4/A6lcMrR9sTOSi+ly38aXen9ydpfo5DJNd6Xu6zGEWGSYeQoI6SBK/rQjwmT3AEJdiQ SwCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id v18si1879977qtf.36.2017.10.23.04.18.38; Mon, 23 Oct 2017 04:18:39 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CB0306292A; Mon, 23 Oct 2017 11:18:38 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 79D66622A5; Mon, 23 Oct 2017 11:12:02 +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 86A2A622B3; Mon, 23 Oct 2017 11:11:59 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id 2F3CE61667 for ; Mon, 23 Oct 2017 11:11:11 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id 90so19649509lfs.13 for ; Mon, 23 Oct 2017 04:11:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=9S1LEgt5SPHd04QPlO9xFHN6e8Cl7mbXT26/GIEhCos=; b=UNFiNXlkG1CK46+CD0bX/N4g836X104oPRXBYmXYacfpg0R9bi8uZMGQyyVnt2eQip QaMcZFnwvK3ELRUktQIZo3xkFp+R/zC8pO06MIwZhocp65f0mAHH84vs+4yhULGduLkF Bq+OuGDFBuO78KZLtUBppysz7IL+sG3BooebLNfrs9Qcsyoa+YoT1by+NZVstigu7yIc PuMyWixmQbj8EBNsUkG+rHhwcPXw/jqwXRvOw7ERcFmrEB3C7csGFP0E+okAaoU6wdRI VCUKKldT9bSUpFWAQm4S06eI8RvjpM33o/pnKFaltf1yqya72jXFyaB1qGUXLxno5ofV DEwQ== X-Gm-Message-State: AMCzsaUH/EHimcMRAaau/uojVMgN74DJsYaZLQixb7KaBbtyToCDVCBy agu4A605ciB8IqbxYooZgt3SS4i/oDV1Jg== X-Google-Smtp-Source: ABhQp+T9do0+vueoA9c++9KggQpALNQV/zv7VUWjEsJbGwHS7Kyu9RG642NLb0knajqmIpbnhcC8cA== X-Received: by 10.46.82.16 with SMTP id g16mr5466130ljb.131.1508757069836; Mon, 23 Oct 2017 04:11:09 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:09 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:34 +0300 Message-Id: <20171023111057.6328-7-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 06/29] configure: provide conditional for ABI-compat mode 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" Signed-off-by: Dmitry Eremin-Solenikov --- configure.ac | 1 + 1 file changed, 1 insertion(+) -- 2.14.2 diff --git a/configure.ac b/configure.ac index 4bc77500c279..255de960c180 100644 --- a/configure.ac +++ b/configure.ac @@ -271,6 +271,7 @@ AC_ARG_ENABLE([abi-compat], ODP_LIBSO_VERSION=0:0:0 fi]) AC_SUBST(ODP_ABI_COMPAT) +AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"]) ########################################################################## # Enable/disable deprecated API definitions From patchwork Mon Oct 23 11:10:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116684 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4524684qgn; Mon, 23 Oct 2017 04:19:09 -0700 (PDT) X-Received: by 10.55.220.195 with SMTP id v186mr2144165qki.324.1508757549065; Mon, 23 Oct 2017 04:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757549; cv=none; d=google.com; s=arc-20160816; b=0ndJGs0PHQRRHUomq4nCiO1Syx1Xlik0s3BdnwR1XBko+LhwSwRM4pkX7E1cwa0k3l 8QQI0E4ptxsW7UPwvst9lLIT+YshWqbDko3IsanibzTEqGLVezdqErYKhsg207MQrjST /uGUSCFgLok+gTO9oWzsGTQBH5citzUSDlhzVAlpjI4r5HUJAGIc71IrpLP2+gMEUCbl rOADAonKStQhkLA/9sbDBC4xqCDaolxvBhOqwajlJt2CzoyXc2UlISxv1Kk8W/1mczH8 c+1Ne0i9j22sNjIYVQep7q9ja71mbo2zKiddwozyS2p8Y0/8eCGkU/a9Q3rxUdI0SV98 N1MA== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=xcRiRUKrEQ/95O8UsrLWtGIfaCyYsQS8iUaDv2xBqes=; b=PtP8/DyvKxS04ssZ0DqZuqKXN17bxQjJu3Q5kgjo9tBiYn0zFD4ZH4/q4NTB0cRCuI TaFzs28hb2rbkcYfI5wWla2jW0GEZkOdXjeAKezXA0NDja6S7CgBU4YoRygvHfFVzRsl yMjqETW3BpiUhrtF9Vh1nf5BqgJ/+Cen+CjzMF8abEA9PZMEpRL6q5AH3gd/tLWr8ezH I2gwLOiGWCrbLP4AtGEz12DZS1Fjb+ezRkJZPjEGdx7zkpSfY3vgC65W7U8nYw6Sfxiq J4sewe4UNBaVkCOGvyxG4bf6GPkWp5PtZBiBFvboTITD94TE8bGeq9Yk5SPf9vqUTk2T 81kQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id w21si5949299qtk.212.2017.10.23.04.19.08; Mon, 23 Oct 2017 04:19:09 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id BA9A96163C; Mon, 23 Oct 2017 11:19:08 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 D42846164A; Mon, 23 Oct 2017 11:12:10 +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 AF1CE61617; Mon, 23 Oct 2017 11:12:04 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id 62F2761617 for ; Mon, 23 Oct 2017 11:11:12 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id 75so19657508lfx.1 for ; Mon, 23 Oct 2017 04:11:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=xcRiRUKrEQ/95O8UsrLWtGIfaCyYsQS8iUaDv2xBqes=; b=aqFXozn8xW5uMw4SfutysFsjvKuQk2cfeSVDeZrKzaYHOWA/7uKBKfStqijEbvvSbl ZjnqBYByXbSAsESslmcC37S/rUuREYG0zOn7cbIe7rlP5MUzWowu6yHOcXk2rHlZ27yt yykTorCiw0oLmQPNmGiBdfYxlKxXZfl8HqBMrSuCzkDkjR2d4HqXZK/QGDqnggBX2iPu Vf5IL/zs6HHYJtzYfkakRSfV0+oAN5HOFDruFb6HuV9gQX2z3zpE2d5DJ0bcyCAolarB AYVE88F/Xr5w5/BgNvQ0q0bchNViVnRXXi4GXoKG56AGbQTIZPSC9KJJAaTbKrGhHG3z Tt4Q== X-Gm-Message-State: AMCzsaUub1Da7k0F0wm2GPWqV+DSSQ6hw7DWoCLeaMvf4F6xkrt1Oa99 2ze15EZYpgj6OC7FBK0VsVmholmFfK5DPA== X-Google-Smtp-Source: ABhQp+TbpfpLwW8x4wGXL87pyY2WjVuX4YoCVfu+cqk8PTklq/lT1bVBem/X91IMv/x3LJkncjWdTg== X-Received: by 10.46.83.67 with SMTP id t3mr5080927ljd.135.1508757070909; Mon, 23 Oct 2017 04:11:10 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:10 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:35 +0300 Message-Id: <20171023111057.6328-8-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 07/29] build: move ODP include path to common Makefile.inc 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" Signed-off-by: Dmitry Eremin-Solenikov --- Makefile.inc | 12 ++++++++++++ example/Makefile.inc | 12 ++++-------- helper/Makefile.am | 12 ++++-------- helper/test/Makefile.am | 18 +++++------------- platform/Makefile.inc | 2 +- platform/linux-generic/Makefile.am | 8 +------- platform/linux-generic/test/Makefile.inc | 12 ++---------- platform/linux-generic/test/ring/Makefile.am | 2 +- .../test/validation/api/shmem/Makefile.am | 4 ++-- test/Makefile.inc | 17 +++++------------ 10 files changed, 37 insertions(+), 62 deletions(-) create mode 100644 Makefile.inc -- 2.14.2 diff --git a/Makefile.inc b/Makefile.inc new file mode 100644 index 000000000000..10e4041fe662 --- /dev/null +++ b/Makefile.inc @@ -0,0 +1,12 @@ +ODP_INCLUDES = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ + -I$(top_srcdir)/include + +HELPER_INCLUDES = \ + -I$(top_srcdir)/helper/include + +LIB = $(top_builddir)/lib diff --git a/example/Makefile.inc b/example/Makefile.inc index 1609066e64c2..498f656faa66 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,16 +1,12 @@ +include $(top_srcdir)/Makefile.inc + TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} -LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/include/ \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/helper/include \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include + $(ODP_INCLUDES) \ + $(HELPER_INCLUDES) AM_LDFLAGS = -L$(LIB) -static diff --git a/helper/Makefile.am b/helper/Makefile.am index ee1c17d6d0a3..2321a2d4f24c 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,15 +1,11 @@ +include $(top_srcdir)/Makefile.inc + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libodphelper.pc -LIB = $(top_builddir)/lib AM_CPPFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include + $(ODP_INCLUDES) \ + $(HELPER_INCLUDES) AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 8eee643bee39..27c414aa7461 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,25 +1,17 @@ -TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} +include $(top_srcdir)/Makefile.inc -LIB = $(top_builddir)/lib +TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la -INCFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/helper - ODP_PLATFORM=${with_platform} -AM_CPPFLAGS = $(INCFLAGS) +AM_CPPFLAGS = \ + $(ODP_INCLUDES) \ + $(HELPER_INCLUDES) AM_LDFLAGS = -static EXECUTABLES = chksum \ diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 0086db779897..4714de0ee805 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -1,4 +1,4 @@ -LIB = $(top_builddir)/lib +include $(top_srcdir)/Makefile.inc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libodp-linux.pc diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index c5406760935e..703b12c702ea 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,14 +3,8 @@ include $(top_srcdir)/platform/Makefile.inc -AM_CPPFLAGS = -I$(srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CPPFLAGS += -I$(top_builddir)/include -AM_CPPFLAGS += -Iinclude -AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) +AM_CPPFLAGS = $(ODP_INCLUDES) AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default -AM_CPPFLAGS += -Iinclude AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) diff --git a/platform/linux-generic/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc index dd21917ebfa7..05c89c9132cd 100644 --- a/platform/linux-generic/test/Makefile.inc +++ b/platform/linux-generic/test/Makefile.inc @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.inc + # The following definitions may be used by platform tests that wish to # build specific ODP applications, (i.e those whose do more than validation # test wrapping) @@ -7,16 +9,6 @@ AM_LDFLAGS = -static AM_CFLAGS = $(CUNIT_CFLAGS) LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la -LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) INCCUNIT_COMMON = -I$(top_srcdir)/test/common -INCODP = \ - -I$(top_builddir)/include \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/test diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 376047559cc7..c08959d04f53 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -7,5 +7,5 @@ ring_main_SOURCES = \ ring_basic.c ring_stress.c ring_main_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/include \ - $(INCCUNIT_COMMON) $(INCODP) + $(INCCUNIT_COMMON) $(ODP_INCLUDES) $(HELPER_INCLUDES) ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index 131a511be73b..8753331e0dd2 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -12,11 +12,11 @@ shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h shmem_odp1_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ - $(INCODP) + $(ODP_INCLUDES) shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h shmem_odp2_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ - $(INCODP) + $(ODP_INCLUDES) shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/Makefile.inc b/test/Makefile.inc index f7c0da21496c..26e188e7d969 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,21 +1,14 @@ -LIB = $(top_builddir)/lib +include $(top_srcdir)/Makefile.inc #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) -INCFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_srcdir)/test/common \ - -I$(top_builddir)/include - -AM_CPPFLAGS = $(INCFLAGS) +AM_CPPFLAGS = \ + $(ODP_INCLUDES) \ + $(HELPER_INCLUDES) \ + -I$(top_srcdir)/test/common AM_CFLAGS = $(CUNIT_CFLAGS) AM_LDFLAGS = -L$(LIB) -static From patchwork Mon Oct 23 11:10:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116711 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4534862qgn; Mon, 23 Oct 2017 04:31:18 -0700 (PDT) X-Received: by 10.55.18.28 with SMTP id c28mr18116679qkh.297.1508758278125; Mon, 23 Oct 2017 04:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508758278; cv=none; d=google.com; s=arc-20160816; b=A4uCLdXsb3lukm3M1SvwjDHNw7e/uiZv4LRdI3Y3HNEIC+itklc7m8KMyUmsX5RVvk BXbTG9HPIDMIx5jzfz2ZYtxEc4Vg2Q+GNNtsF3psztHMKxD9u+DGk0wZVzkizvD2DTO3 /pRzcAtRPOGX1L/0d1QS0LYswuYiF7L+tUQGqUp7K6wZcPSj8EASYGTKq7onCj4287v0 kvEs+fzmf9k2tONeLXqoWeT8YJVwGfqpjCom7R0qofYD0TjNzuUWXCcQQxp4EFZFY1aS Q5nFpoBaRbYHhrKaXAldLKP3PEUgMCoLCWBpdKVASdeAYVPjTCDoTPBo7pyu77OThpyG eMow== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=CHdy5buONFmEoh4p8KfZrXerH11RmWKX78lmHGGzScg=; b=eAyIbewwWV0AOk2skfpGdwiBW4iezRaRqpr424EOx2bEqEaYQnmzkm25wO6NCkn8GR eEY2qlpAoTSqYtIyQrA/Fn58nR921MzSo5MaQN0KXrxUee8QdMbIr4ScqcUDBqVRVKtM ZPJusK2i5dDsSqBR+XXUep0yWHeS9MYkcjSPRLXz6xDjgwsP43miia6CAJcivcVa6Pv2 fy8lNgP0zizymgOGCiW3TNj7I0tDOTEb7tuDJG8BLShW6sIkFDROXE57kU00PbUdeokT yOeF7uOXGEiJbWn4nWmqG0JdDYpxi+yL93mcL7m2Rqw9odPHYLxqd/Z3MIfwoXwSeR93 mIZw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 27si6366994qks.381.2017.10.23.04.31.17; Mon, 23 Oct 2017 04:31:18 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A16236292F; Mon, 23 Oct 2017 11:31:17 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 296C062291; Mon, 23 Oct 2017 11:13:59 +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 22712622D6; Mon, 23 Oct 2017 11:12:47 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id 61B3D61D7E for ; Mon, 23 Oct 2017 11:11:17 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id l23so19661780lfk.10 for ; Mon, 23 Oct 2017 04:11:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=CHdy5buONFmEoh4p8KfZrXerH11RmWKX78lmHGGzScg=; b=ht0ZbqZk2/dq3WwrooH+A03ipBbAzV5Us8gcYKIZTda/zEPtA18dMn++24yvIlHdCR kOa1WnLYnuKq0764h9dh+Sm5QzCvnoCOvcS90+j3gQtiIrPDSw4PK4P8WEzyGdJA0sU2 5AaxIY0SoocS4idR/KeYKuMoDiODnl7SYnqatt30D5CZ7J3vlPDePJ6SVgpo7Axn+OtV Jp//luBxCQLUPgczhN660XI0i/2PHRBs9XUJLWhN6xEvd52dkJFB6+70NSFrxSKXykyA vPuAeti1WKmbuhWfIl9MgqKNZy4BVOhykRG/i8VCFWxuasPVGQDr6NlnDMXxhQhbVkvg M2wg== X-Gm-Message-State: AMCzsaXSdyZIZDHjzpXXTkDqTGB6+Vu2MyJiYTdlLYfe6MsfTbM+XiCx eOm45MZQeJIJzk1PKSIKTn54OlLnIND3ag== X-Google-Smtp-Source: ABhQp+ROuFg8yqzsnrSqDofXdPIE1RX2YZWZiQ7yNXbuHeyRwtKcMVt5xNZlW/GS6zp2HfgWTXEaGQ== X-Received: by 10.46.86.195 with SMTP id k64mr5536059lje.81.1508757073944; Mon, 23 Oct 2017 04:11:13 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:13 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:36 +0300 Message-Id: <20171023111057.6328-9-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 08/29] include: move default ABI headers 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" Reduce amount of directory levels by moving default ABI headers to odp/api/abi-default. Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 82 +++++++++++----------- .../default/api/abi => api/abi-default}/atomic.h | 0 .../default/api/abi => api/abi-default}/barrier.h | 0 .../default/api/abi => api/abi-default}/buffer.h | 0 .../api/abi => api/abi-default}/byteorder.h | 0 .../api/abi => api/abi-default}/classification.h | 0 .../default/api/abi => api/abi-default}/cpumask.h | 0 .../default/api/abi => api/abi-default}/crypto.h | 0 .../default/api/abi => api/abi-default}/event.h | 0 .../default/api/abi => api/abi-default}/init.h | 0 .../default/api/abi => api/abi-default}/ipsec.h | 0 .../default/api/abi => api/abi-default}/packet.h | 0 .../api/abi => api/abi-default}/packet_flags.h | 0 .../api/abi => api/abi-default}/packet_io.h | 0 .../default/api/abi => api/abi-default}/pool.h | 0 .../default/api/abi => api/abi-default}/queue.h | 0 .../default/api/abi => api/abi-default}/rwlock.h | 0 .../api/abi => api/abi-default}/rwlock_recursive.h | 0 .../default/api/abi => api/abi-default}/schedule.h | 0 .../api/abi => api/abi-default}/schedule_types.h | 0 .../api/abi => api/abi-default}/shared_memory.h | 0 .../default/api/abi => api/abi-default}/spinlock.h | 0 .../abi => api/abi-default}/spinlock_recursive.h | 0 .../default/api/abi => api/abi-default}/std_clib.h | 0 .../api/abi => api/abi-default}/std_types.h | 0 .../default/api/abi => api/abi-default}/sync.h | 0 .../default/api/abi => api/abi-default}/thread.h | 0 .../default/api/abi => api/abi-default}/thrmask.h | 0 .../api/abi => api/abi-default}/ticketlock.h | 0 .../default/api/abi => api/abi-default}/time.h | 0 .../default/api/abi => api/abi-default}/timer.h | 0 .../api/abi => api/abi-default}/traffic_mngr.h | 0 .../default/api/abi => api/abi-default}/version.h | 0 include/odp/arch/arm32-linux/odp/api/abi/atomic.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/byteorder.h | 2 +- .../arch/arm32-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/event.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/init.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/packet.h | 2 +- .../arch/arm32-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/rwlock.h | 2 +- .../arm32-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/schedule.h | 2 +- .../arch/arm32-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/arm32-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/spinlock.h | 2 +- .../arm32-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/thread.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/time.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/timer.h | 2 +- .../arch/arm32-linux/odp/api/abi/traffic_mngr.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/version.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/atomic.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/byteorder.h | 2 +- .../arch/arm64-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/init.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/packet.h | 2 +- .../arch/arm64-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/rwlock.h | 2 +- .../arm64-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/schedule.h | 2 +- .../arch/arm64-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/arm64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/spinlock.h | 2 +- .../arm64-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/thread.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/time.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/timer.h | 2 +- .../arch/arm64-linux/odp/api/abi/traffic_mngr.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/version.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/byteorder.h | 2 +- .../arch/mips64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/init.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/packet.h | 2 +- .../arch/mips64-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/rwlock.h | 2 +- .../mips64-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/schedule.h | 2 +- .../arch/mips64-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/mips64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/spinlock.h | 2 +- .../mips64-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/time.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/timer.h | 2 +- .../arch/mips64-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/version.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/barrier.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/byteorder.h | 2 +- .../power64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/cpumask.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/init.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/ipsec.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/packet.h | 2 +- .../arch/power64-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/queue.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/rwlock.h | 2 +- .../power64-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/schedule.h | 2 +- .../power64-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/power64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/spinlock.h | 2 +- .../power64-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/sync.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/thrmask.h | 2 +- .../arch/power64-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/time.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/timer.h | 2 +- .../arch/power64-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/version.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/byteorder.h | 2 +- .../arch/x86_32-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/event.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/init.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/packet.h | 2 +- .../arch/x86_32-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h | 2 +- .../x86_32-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/schedule.h | 2 +- .../arch/x86_32-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/x86_32-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/spinlock.h | 2 +- .../x86_32-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/time.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/timer.h | 2 +- .../arch/x86_32-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/version.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/byteorder.h | 2 +- .../arch/x86_64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/init.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/packet.h | 2 +- .../arch/x86_64-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h | 2 +- .../x86_64-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/schedule.h | 2 +- .../arch/x86_64-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/x86_64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/spinlock.h | 2 +- .../x86_64-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/time.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/timer.h | 2 +- .../arch/x86_64-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/version.h | 2 +- 225 files changed, 233 insertions(+), 233 deletions(-) rename include/odp/{arch/default/api/abi => api/abi-default}/atomic.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/barrier.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/buffer.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/byteorder.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/classification.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/cpumask.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/crypto.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/event.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/init.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/ipsec.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/packet.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/packet_flags.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/packet_io.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/pool.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/queue.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/rwlock.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/rwlock_recursive.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/schedule.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/schedule_types.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/shared_memory.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/spinlock.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/spinlock_recursive.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/std_clib.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/std_types.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/sync.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/thread.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/thrmask.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/ticketlock.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/time.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/timer.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/traffic_mngr.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/version.h (100%) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 40a4daa90fc2..5328133dd4e4 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -67,48 +67,48 @@ odpdrvspecinclude_HEADERS = \ odp/drv/spec/std_types.h \ odp/drv/spec/sync.h -odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi +odpapiabidefaultincludedir= $(includedir)/odp/api/abi-default odpapiabidefaultinclude_HEADERS = \ - odp/arch/default/api/abi/atomic.h \ - odp/arch/default/api/abi/barrier.h \ - odp/arch/default/api/abi/buffer.h \ - odp/arch/default/api/abi/byteorder.h \ - odp/arch/default/api/abi/classification.h \ - odp/arch/default/api/abi/cpumask.h \ - odp/arch/default/api/abi/crypto.h \ - odp/arch/default/api/abi/event.h \ - odp/arch/default/api/abi/init.h \ - odp/arch/default/api/abi/ipsec.h \ - odp/arch/default/api/abi/packet.h \ - odp/arch/default/api/abi/packet_flags.h \ - odp/arch/default/api/abi/packet_io.h \ - odp/arch/default/api/abi/pool.h \ - odp/arch/default/api/abi/queue.h \ - odp/arch/default/api/abi/rwlock.h \ - odp/arch/default/api/abi/rwlock_recursive.h \ - odp/arch/default/api/abi/schedule.h \ - odp/arch/default/api/abi/schedule_types.h \ - odp/arch/default/api/abi/shared_memory.h \ - odp/arch/default/api/abi/spinlock.h \ - odp/arch/default/api/abi/spinlock_recursive.h \ - odp/arch/default/api/abi/std_clib.h \ - odp/arch/default/api/abi/std_types.h \ - odp/arch/default/api/abi/sync.h \ - odp/arch/default/api/abi/thread.h \ - odp/arch/default/api/abi/thrmask.h \ - odp/arch/default/api/abi/ticketlock.h \ - odp/arch/default/api/abi/time.h \ - odp/arch/default/api/abi/timer.h \ - odp/arch/default/api/abi/traffic_mngr.h \ - odp/arch/default/api/abi/version.h - odp/arch/default/api/abi/buffer.h \ - odp/arch/default/api/abi/classification.h \ - odp/arch/default/api/abi/crypto.h \ - odp/arch/default/api/abi/event.h \ - odp/arch/default/api/abi/packet.h \ - odp/arch/default/api/abi/pool.h \ - odp/arch/default/api/abi/queue.h \ - odp/arch/default/api/abi/shared_memory.h + odp/api/abi-default/atomic.h \ + odp/api/abi-default/barrier.h \ + odp/api/abi-default/buffer.h \ + odp/api/abi-default/byteorder.h \ + odp/api/abi-default/classification.h \ + odp/api/abi-default/cpumask.h \ + odp/api/abi-default/crypto.h \ + odp/api/abi-default/event.h \ + odp/api/abi-default/init.h \ + odp/api/abi-default/ipsec.h \ + odp/api/abi-default/packet.h \ + odp/api/abi-default/packet_flags.h \ + odp/api/abi-default/packet_io.h \ + odp/api/abi-default/pool.h \ + odp/api/abi-default/queue.h \ + odp/api/abi-default/rwlock.h \ + odp/api/abi-default/rwlock_recursive.h \ + odp/api/abi-default/schedule.h \ + odp/api/abi-default/schedule_types.h \ + odp/api/abi-default/shared_memory.h \ + odp/api/abi-default/spinlock.h \ + odp/api/abi-default/spinlock_recursive.h \ + odp/api/abi-default/std_clib.h \ + odp/api/abi-default/std_types.h \ + odp/api/abi-default/sync.h \ + odp/api/abi-default/thread.h \ + odp/api/abi-default/thrmask.h \ + odp/api/abi-default/ticketlock.h \ + odp/api/abi-default/time.h \ + odp/api/abi-default/timer.h \ + odp/api/abi-default/traffic_mngr.h \ + odp/api/abi-default/version.h + odp/api/abi-default/buffer.h \ + odp/api/abi-default/classification.h \ + odp/api/abi-default/crypto.h \ + odp/api/abi-default/event.h \ + odp/api/abi-default/packet.h \ + odp/api/abi-default/pool.h \ + odp/api/abi-default/queue.h \ + odp/api/abi-default/shared_memory.h odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi if ARCH_IS_ARM diff --git a/include/odp/arch/default/api/abi/atomic.h b/include/odp/api/abi-default/atomic.h similarity index 100% rename from include/odp/arch/default/api/abi/atomic.h rename to include/odp/api/abi-default/atomic.h diff --git a/include/odp/arch/default/api/abi/barrier.h b/include/odp/api/abi-default/barrier.h similarity index 100% rename from include/odp/arch/default/api/abi/barrier.h rename to include/odp/api/abi-default/barrier.h diff --git a/include/odp/arch/default/api/abi/buffer.h b/include/odp/api/abi-default/buffer.h similarity index 100% rename from include/odp/arch/default/api/abi/buffer.h rename to include/odp/api/abi-default/buffer.h diff --git a/include/odp/arch/default/api/abi/byteorder.h b/include/odp/api/abi-default/byteorder.h similarity index 100% rename from include/odp/arch/default/api/abi/byteorder.h rename to include/odp/api/abi-default/byteorder.h diff --git a/include/odp/arch/default/api/abi/classification.h b/include/odp/api/abi-default/classification.h similarity index 100% rename from include/odp/arch/default/api/abi/classification.h rename to include/odp/api/abi-default/classification.h diff --git a/include/odp/arch/default/api/abi/cpumask.h b/include/odp/api/abi-default/cpumask.h similarity index 100% rename from include/odp/arch/default/api/abi/cpumask.h rename to include/odp/api/abi-default/cpumask.h diff --git a/include/odp/arch/default/api/abi/crypto.h b/include/odp/api/abi-default/crypto.h similarity index 100% rename from include/odp/arch/default/api/abi/crypto.h rename to include/odp/api/abi-default/crypto.h diff --git a/include/odp/arch/default/api/abi/event.h b/include/odp/api/abi-default/event.h similarity index 100% rename from include/odp/arch/default/api/abi/event.h rename to include/odp/api/abi-default/event.h diff --git a/include/odp/arch/default/api/abi/init.h b/include/odp/api/abi-default/init.h similarity index 100% rename from include/odp/arch/default/api/abi/init.h rename to include/odp/api/abi-default/init.h diff --git a/include/odp/arch/default/api/abi/ipsec.h b/include/odp/api/abi-default/ipsec.h similarity index 100% rename from include/odp/arch/default/api/abi/ipsec.h rename to include/odp/api/abi-default/ipsec.h diff --git a/include/odp/arch/default/api/abi/packet.h b/include/odp/api/abi-default/packet.h similarity index 100% rename from include/odp/arch/default/api/abi/packet.h rename to include/odp/api/abi-default/packet.h diff --git a/include/odp/arch/default/api/abi/packet_flags.h b/include/odp/api/abi-default/packet_flags.h similarity index 100% rename from include/odp/arch/default/api/abi/packet_flags.h rename to include/odp/api/abi-default/packet_flags.h diff --git a/include/odp/arch/default/api/abi/packet_io.h b/include/odp/api/abi-default/packet_io.h similarity index 100% rename from include/odp/arch/default/api/abi/packet_io.h rename to include/odp/api/abi-default/packet_io.h diff --git a/include/odp/arch/default/api/abi/pool.h b/include/odp/api/abi-default/pool.h similarity index 100% rename from include/odp/arch/default/api/abi/pool.h rename to include/odp/api/abi-default/pool.h diff --git a/include/odp/arch/default/api/abi/queue.h b/include/odp/api/abi-default/queue.h similarity index 100% rename from include/odp/arch/default/api/abi/queue.h rename to include/odp/api/abi-default/queue.h diff --git a/include/odp/arch/default/api/abi/rwlock.h b/include/odp/api/abi-default/rwlock.h similarity index 100% rename from include/odp/arch/default/api/abi/rwlock.h rename to include/odp/api/abi-default/rwlock.h diff --git a/include/odp/arch/default/api/abi/rwlock_recursive.h b/include/odp/api/abi-default/rwlock_recursive.h similarity index 100% rename from include/odp/arch/default/api/abi/rwlock_recursive.h rename to include/odp/api/abi-default/rwlock_recursive.h diff --git a/include/odp/arch/default/api/abi/schedule.h b/include/odp/api/abi-default/schedule.h similarity index 100% rename from include/odp/arch/default/api/abi/schedule.h rename to include/odp/api/abi-default/schedule.h diff --git a/include/odp/arch/default/api/abi/schedule_types.h b/include/odp/api/abi-default/schedule_types.h similarity index 100% rename from include/odp/arch/default/api/abi/schedule_types.h rename to include/odp/api/abi-default/schedule_types.h diff --git a/include/odp/arch/default/api/abi/shared_memory.h b/include/odp/api/abi-default/shared_memory.h similarity index 100% rename from include/odp/arch/default/api/abi/shared_memory.h rename to include/odp/api/abi-default/shared_memory.h diff --git a/include/odp/arch/default/api/abi/spinlock.h b/include/odp/api/abi-default/spinlock.h similarity index 100% rename from include/odp/arch/default/api/abi/spinlock.h rename to include/odp/api/abi-default/spinlock.h diff --git a/include/odp/arch/default/api/abi/spinlock_recursive.h b/include/odp/api/abi-default/spinlock_recursive.h similarity index 100% rename from include/odp/arch/default/api/abi/spinlock_recursive.h rename to include/odp/api/abi-default/spinlock_recursive.h diff --git a/include/odp/arch/default/api/abi/std_clib.h b/include/odp/api/abi-default/std_clib.h similarity index 100% rename from include/odp/arch/default/api/abi/std_clib.h rename to include/odp/api/abi-default/std_clib.h diff --git a/include/odp/arch/default/api/abi/std_types.h b/include/odp/api/abi-default/std_types.h similarity index 100% rename from include/odp/arch/default/api/abi/std_types.h rename to include/odp/api/abi-default/std_types.h diff --git a/include/odp/arch/default/api/abi/sync.h b/include/odp/api/abi-default/sync.h similarity index 100% rename from include/odp/arch/default/api/abi/sync.h rename to include/odp/api/abi-default/sync.h diff --git a/include/odp/arch/default/api/abi/thread.h b/include/odp/api/abi-default/thread.h similarity index 100% rename from include/odp/arch/default/api/abi/thread.h rename to include/odp/api/abi-default/thread.h diff --git a/include/odp/arch/default/api/abi/thrmask.h b/include/odp/api/abi-default/thrmask.h similarity index 100% rename from include/odp/arch/default/api/abi/thrmask.h rename to include/odp/api/abi-default/thrmask.h diff --git a/include/odp/arch/default/api/abi/ticketlock.h b/include/odp/api/abi-default/ticketlock.h similarity index 100% rename from include/odp/arch/default/api/abi/ticketlock.h rename to include/odp/api/abi-default/ticketlock.h diff --git a/include/odp/arch/default/api/abi/time.h b/include/odp/api/abi-default/time.h similarity index 100% rename from include/odp/arch/default/api/abi/time.h rename to include/odp/api/abi-default/time.h diff --git a/include/odp/arch/default/api/abi/timer.h b/include/odp/api/abi-default/timer.h similarity index 100% rename from include/odp/arch/default/api/abi/timer.h rename to include/odp/api/abi-default/timer.h diff --git a/include/odp/arch/default/api/abi/traffic_mngr.h b/include/odp/api/abi-default/traffic_mngr.h similarity index 100% rename from include/odp/arch/default/api/abi/traffic_mngr.h rename to include/odp/api/abi-default/traffic_mngr.h diff --git a/include/odp/arch/default/api/abi/version.h b/include/odp/api/abi-default/version.h similarity index 100% rename from include/odp/arch/default/api/abi/version.h rename to include/odp/api/abi-default/version.h diff --git a/include/odp/arch/arm32-linux/odp/api/abi/atomic.h b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h index 523c614ae2cc..8848ad19f9ba 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h index 11c3450103ba..9d6c256eb68e 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h index d9c31930dd3f..68a678964f4b 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h index c76073317844..2fd53414ce01 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/classification.h b/include/odp/arch/arm32-linux/odp/api/abi/classification.h index d48a4733f0c7..5a0cac98f790 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/classification.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h index 56266f8b3a31..d991896d8eea 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h index 9a9d2dc1bf8a..d33a777bd345 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/event.h b/include/odp/arch/arm32-linux/odp/api/abi/event.h index 5d2ac75e7cb0..cbbf47f1286c 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/event.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/init.h b/include/odp/arch/arm32-linux/odp/api/abi/init.h index 86b4852d9902..81eafefe3070 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/init.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/init.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h index e392c8ac0bc2..b6747d29ed3e 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet.h b/include/odp/arch/arm32-linux/odp/api/abi/packet.h index f44cb53653b3..ca28eed2adcc 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/packet.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h index 08f954aae1ed..a60c8bd07307 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h index e80c1452b568..79b49262a98a 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/pool.h b/include/odp/arch/arm32-linux/odp/api/abi/pool.h index b354afbf7282..b59365eb5531 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/pool.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/queue.h b/include/odp/arch/arm32-linux/odp/api/abi/queue.h index 6027cee2f8ff..66e2a3415e0b 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/queue.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h index 61faaf76b445..cba0743e74be 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h index ccfdf14aad8b..841710d3c821 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h index 82148ca978d5..18427744fc84 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h index 1b4f2b316320..b3ea96b5a1d1 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h b/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h index d203678597e8..e80c4f320f83 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h index 2e863b014f90..4894095bb08a 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h index e90219d901c4..a7a49bd4d1c9 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h index bda9fd3078fb..72898878a9fe 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_types.h b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h index 44fc6f5ae20e..91130000a7f3 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/sync.h b/include/odp/arch/arm32-linux/odp/api/abi/sync.h index 2fd45b629040..8e5f813211c0 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/sync.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/sync.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thread.h b/include/odp/arch/arm32-linux/odp/api/abi/thread.h index 69023d36bb4a..dc29a7dac301 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/thread.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/thread.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h index 523999dcc087..0c1dc0ce59ad 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h index 160b5e156c9b..0065ce02821c 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/time.h b/include/odp/arch/arm32-linux/odp/api/abi/time.h index d4d734033c61..2672d7892624 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/time.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/time.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/timer.h b/include/odp/arch/arm32-linux/odp/api/abi/timer.h index fea797339150..e52a3e12968b 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/timer.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/timer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h index 41d297bce42f..4245cbf7068b 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm32-linux/odp/api/abi/version.h b/include/odp/arch/arm32-linux/odp/api/abi/version.h index 1cdd175edb9a..b36d53958931 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/version.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/version.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/atomic.h b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h index 523c614ae2cc..8848ad19f9ba 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h index 11c3450103ba..9d6c256eb68e 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h index d9c31930dd3f..68a678964f4b 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h index c76073317844..2fd53414ce01 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/classification.h b/include/odp/arch/arm64-linux/odp/api/abi/classification.h index d48a4733f0c7..5a0cac98f790 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h index 56266f8b3a31..d991896d8eea 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h index 9a9d2dc1bf8a..d33a777bd345 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/event.h b/include/odp/arch/arm64-linux/odp/api/abi/event.h index 5d2ac75e7cb0..cbbf47f1286c 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/event.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/init.h b/include/odp/arch/arm64-linux/odp/api/abi/init.h index 86b4852d9902..81eafefe3070 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/init.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/init.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h index e392c8ac0bc2..b6747d29ed3e 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet.h b/include/odp/arch/arm64-linux/odp/api/abi/packet.h index f44cb53653b3..ca28eed2adcc 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h index 08f954aae1ed..a60c8bd07307 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h index e80c1452b568..79b49262a98a 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/pool.h b/include/odp/arch/arm64-linux/odp/api/abi/pool.h index b354afbf7282..b59365eb5531 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/queue.h b/include/odp/arch/arm64-linux/odp/api/abi/queue.h index 6027cee2f8ff..66e2a3415e0b 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h index 61faaf76b445..cba0743e74be 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h index ccfdf14aad8b..841710d3c821 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h index 82148ca978d5..18427744fc84 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h index 1b4f2b316320..b3ea96b5a1d1 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h index d203678597e8..e80c4f320f83 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h index 2e863b014f90..4894095bb08a 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h index e90219d901c4..a7a49bd4d1c9 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h index bda9fd3078fb..72898878a9fe 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std_types.h b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h index 44fc6f5ae20e..91130000a7f3 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/sync.h b/include/odp/arch/arm64-linux/odp/api/abi/sync.h index 2fd45b629040..8e5f813211c0 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/sync.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/sync.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thread.h b/include/odp/arch/arm64-linux/odp/api/abi/thread.h index 69023d36bb4a..dc29a7dac301 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/thread.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/thread.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h index 523999dcc087..0c1dc0ce59ad 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h index 160b5e156c9b..0065ce02821c 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/time.h b/include/odp/arch/arm64-linux/odp/api/abi/time.h index d4d734033c61..2672d7892624 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/time.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/time.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/timer.h b/include/odp/arch/arm64-linux/odp/api/abi/timer.h index fea797339150..e52a3e12968b 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/timer.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/timer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h index 41d297bce42f..4245cbf7068b 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/version.h b/include/odp/arch/arm64-linux/odp/api/abi/version.h index 1cdd175edb9a..b36d53958931 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/version.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/version.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/atomic.h b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h index 523c614ae2cc..8848ad19f9ba 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h index 11c3450103ba..9d6c256eb68e 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h index d9c31930dd3f..68a678964f4b 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h index c76073317844..2fd53414ce01 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/classification.h b/include/odp/arch/mips64-linux/odp/api/abi/classification.h index d48a4733f0c7..5a0cac98f790 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h index 56266f8b3a31..d991896d8eea 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h b/include/odp/arch/mips64-linux/odp/api/abi/crypto.h index 9a9d2dc1bf8a..d33a777bd345 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/event.h b/include/odp/arch/mips64-linux/odp/api/abi/event.h index 5d2ac75e7cb0..cbbf47f1286c 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/event.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/init.h b/include/odp/arch/mips64-linux/odp/api/abi/init.h index 86b4852d9902..81eafefe3070 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/init.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/init.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h index e392c8ac0bc2..b6747d29ed3e 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet.h b/include/odp/arch/mips64-linux/odp/api/abi/packet.h index f44cb53653b3..ca28eed2adcc 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h index 08f954aae1ed..a60c8bd07307 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h index e80c1452b568..79b49262a98a 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/pool.h b/include/odp/arch/mips64-linux/odp/api/abi/pool.h index b354afbf7282..b59365eb5531 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/queue.h b/include/odp/arch/mips64-linux/odp/api/abi/queue.h index 6027cee2f8ff..66e2a3415e0b 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h index 61faaf76b445..cba0743e74be 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h index ccfdf14aad8b..841710d3c821 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h index 82148ca978d5..18427744fc84 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h index 1b4f2b316320..b3ea96b5a1d1 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h index d203678597e8..e80c4f320f83 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h index 2e863b014f90..4894095bb08a 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h index e90219d901c4..a7a49bd4d1c9 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h index bda9fd3078fb..72898878a9fe 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/std_types.h b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h index 44fc6f5ae20e..91130000a7f3 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/sync.h b/include/odp/arch/mips64-linux/odp/api/abi/sync.h index 2fd45b629040..8e5f813211c0 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/sync.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/sync.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thread.h b/include/odp/arch/mips64-linux/odp/api/abi/thread.h index 69023d36bb4a..dc29a7dac301 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/thread.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/thread.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h index 523999dcc087..0c1dc0ce59ad 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h index 160b5e156c9b..0065ce02821c 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/time.h b/include/odp/arch/mips64-linux/odp/api/abi/time.h index d4d734033c61..2672d7892624 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/time.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/time.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/timer.h b/include/odp/arch/mips64-linux/odp/api/abi/timer.h index fea797339150..e52a3e12968b 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/timer.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/timer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h index 41d297bce42f..4245cbf7068b 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/mips64-linux/odp/api/abi/version.h b/include/odp/arch/mips64-linux/odp/api/abi/version.h index 1cdd175edb9a..b36d53958931 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/version.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/version.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/atomic.h b/include/odp/arch/power64-linux/odp/api/abi/atomic.h index 523c614ae2cc..8848ad19f9ba 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/power64-linux/odp/api/abi/atomic.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/barrier.h b/include/odp/arch/power64-linux/odp/api/abi/barrier.h index 11c3450103ba..9d6c256eb68e 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/power64-linux/odp/api/abi/barrier.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/buffer.h b/include/odp/arch/power64-linux/odp/api/abi/buffer.h index d9c31930dd3f..68a678964f4b 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/power64-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/byteorder.h b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h index c76073317844..2fd53414ce01 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/classification.h b/include/odp/arch/power64-linux/odp/api/abi/classification.h index d48a4733f0c7..5a0cac98f790 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/power64-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h index 56266f8b3a31..d991896d8eea 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/crypto.h b/include/odp/arch/power64-linux/odp/api/abi/crypto.h index 9a9d2dc1bf8a..d33a777bd345 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/power64-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/event.h b/include/odp/arch/power64-linux/odp/api/abi/event.h index 5d2ac75e7cb0..cbbf47f1286c 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/event.h +++ b/include/odp/arch/power64-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/init.h b/include/odp/arch/power64-linux/odp/api/abi/init.h index 86b4852d9902..81eafefe3070 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/init.h +++ b/include/odp/arch/power64-linux/odp/api/abi/init.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/ipsec.h b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h index e392c8ac0bc2..b6747d29ed3e 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet.h b/include/odp/arch/power64-linux/odp/api/abi/packet.h index f44cb53653b3..ca28eed2adcc 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/power64-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h index 08f954aae1ed..a60c8bd07307 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_io.h b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h index e80c1452b568..79b49262a98a 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/pool.h b/include/odp/arch/power64-linux/odp/api/abi/pool.h index b354afbf7282..b59365eb5531 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/power64-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/queue.h b/include/odp/arch/power64-linux/odp/api/abi/queue.h index 6027cee2f8ff..66e2a3415e0b 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/power64-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h index 61faaf76b445..cba0743e74be 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h index ccfdf14aad8b..841710d3c821 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule.h b/include/odp/arch/power64-linux/odp/api/abi/schedule.h index 82148ca978d5..18427744fc84 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/power64-linux/odp/api/abi/schedule.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h index 1b4f2b316320..b3ea96b5a1d1 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h index d203678597e8..e80c4f320f83 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h index 2e863b014f90..4894095bb08a 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h index e90219d901c4..a7a49bd4d1c9 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/std_clib.h b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h index bda9fd3078fb..72898878a9fe 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/std_types.h b/include/odp/arch/power64-linux/odp/api/abi/std_types.h index 44fc6f5ae20e..91130000a7f3 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/power64-linux/odp/api/abi/std_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/sync.h b/include/odp/arch/power64-linux/odp/api/abi/sync.h index 2fd45b629040..8e5f813211c0 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/sync.h +++ b/include/odp/arch/power64-linux/odp/api/abi/sync.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/thread.h b/include/odp/arch/power64-linux/odp/api/abi/thread.h index 69023d36bb4a..dc29a7dac301 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/thread.h +++ b/include/odp/arch/power64-linux/odp/api/abi/thread.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/thrmask.h b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h index 523999dcc087..0c1dc0ce59ad 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h index 160b5e156c9b..0065ce02821c 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/time.h b/include/odp/arch/power64-linux/odp/api/abi/time.h index d4d734033c61..2672d7892624 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/time.h +++ b/include/odp/arch/power64-linux/odp/api/abi/time.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/timer.h b/include/odp/arch/power64-linux/odp/api/abi/timer.h index fea797339150..e52a3e12968b 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/timer.h +++ b/include/odp/arch/power64-linux/odp/api/abi/timer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h index 41d297bce42f..4245cbf7068b 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/version.h b/include/odp/arch/power64-linux/odp/api/abi/version.h index 1cdd175edb9a..b36d53958931 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/version.h +++ b/include/odp/arch/power64-linux/odp/api/abi/version.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h index 523c614ae2cc..8848ad19f9ba 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h index 11c3450103ba..9d6c256eb68e 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h b/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h index d9c31930dd3f..68a678964f4b 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h index c76073317844..2fd53414ce01 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/classification.h b/include/odp/arch/x86_32-linux/odp/api/abi/classification.h index d48a4733f0c7..5a0cac98f790 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/classification.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h index 56266f8b3a31..d991896d8eea 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h b/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h index 9a9d2dc1bf8a..d33a777bd345 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/event.h b/include/odp/arch/x86_32-linux/odp/api/abi/event.h index 5d2ac75e7cb0..cbbf47f1286c 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/event.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/init.h b/include/odp/arch/x86_32-linux/odp/api/abi/init.h index 86b4852d9902..81eafefe3070 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/init.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/init.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h index e392c8ac0bc2..b6747d29ed3e 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet.h index f44cb53653b3..ca28eed2adcc 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/packet.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h index 08f954aae1ed..a60c8bd07307 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h index e80c1452b568..79b49262a98a 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/pool.h b/include/odp/arch/x86_32-linux/odp/api/abi/pool.h index b354afbf7282..b59365eb5531 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/pool.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h index 6027cee2f8ff..66e2a3415e0b 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h index 61faaf76b445..cba0743e74be 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h index ccfdf14aad8b..841710d3c821 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h index 82148ca978d5..18427744fc84 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h index 1b4f2b316320..b3ea96b5a1d1 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h b/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h index d203678597e8..e80c4f320f83 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h index 2e863b014f90..4894095bb08a 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h index e90219d901c4..a7a49bd4d1c9 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h index bda9fd3078fb..72898878a9fe 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h index 44fc6f5ae20e..91130000a7f3 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/sync.h b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h index 2fd45b629040..8e5f813211c0 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/sync.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h index 69023d36bb4a..dc29a7dac301 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h index 523999dcc087..0c1dc0ce59ad 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h index 160b5e156c9b..0065ce02821c 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/time.h b/include/odp/arch/x86_32-linux/odp/api/abi/time.h index d4d734033c61..2672d7892624 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/time.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/time.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/timer.h b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h index fea797339150..e52a3e12968b 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/timer.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h index 41d297bce42f..4245cbf7068b 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/version.h b/include/odp/arch/x86_32-linux/odp/api/abi/version.h index 1cdd175edb9a..b36d53958931 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/version.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/version.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h index 523c614ae2cc..8848ad19f9ba 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h index 11c3450103ba..9d6c256eb68e 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h b/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h index d9c31930dd3f..68a678964f4b 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h index c76073317844..2fd53414ce01 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/classification.h b/include/odp/arch/x86_64-linux/odp/api/abi/classification.h index d48a4733f0c7..5a0cac98f790 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h index 56266f8b3a31..d991896d8eea 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h b/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h index 9a9d2dc1bf8a..d33a777bd345 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/event.h b/include/odp/arch/x86_64-linux/odp/api/abi/event.h index 5d2ac75e7cb0..cbbf47f1286c 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/event.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/init.h b/include/odp/arch/x86_64-linux/odp/api/abi/init.h index 86b4852d9902..81eafefe3070 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/init.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/init.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h index e392c8ac0bc2..b6747d29ed3e 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet.h index f44cb53653b3..ca28eed2adcc 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h index 08f954aae1ed..a60c8bd07307 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h index e80c1452b568..79b49262a98a 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/pool.h b/include/odp/arch/x86_64-linux/odp/api/abi/pool.h index b354afbf7282..b59365eb5531 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h index 6027cee2f8ff..66e2a3415e0b 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h index 61faaf76b445..cba0743e74be 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h index ccfdf14aad8b..841710d3c821 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h index 82148ca978d5..18427744fc84 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h index 1b4f2b316320..b3ea96b5a1d1 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h index d203678597e8..e80c4f320f83 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h index 2e863b014f90..4894095bb08a 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h index e90219d901c4..a7a49bd4d1c9 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h index bda9fd3078fb..72898878a9fe 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h index 44fc6f5ae20e..91130000a7f3 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/sync.h b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h index 2fd45b629040..8e5f813211c0 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/sync.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h index 69023d36bb4a..dc29a7dac301 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h index 523999dcc087..0c1dc0ce59ad 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h index 160b5e156c9b..0065ce02821c 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/time.h b/include/odp/arch/x86_64-linux/odp/api/abi/time.h index d4d734033c61..2672d7892624 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/time.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/time.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/timer.h b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h index fea797339150..e52a3e12968b 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/timer.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h index 41d297bce42f..4245cbf7068b 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/version.h b/include/odp/arch/x86_64-linux/odp/api/abi/version.h index 1cdd175edb9a..b36d53958931 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/version.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/version.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include From patchwork Mon Oct 23 11:10:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116687 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4525634qgn; Mon, 23 Oct 2017 04:20:07 -0700 (PDT) X-Received: by 10.200.56.193 with SMTP id g1mr19205353qtc.67.1508757607262; Mon, 23 Oct 2017 04:20:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757607; cv=none; d=google.com; s=arc-20160816; b=YQpIR6wiNY8b2AqvB+Ngeu+FDigSdgfHjpK7fDjxjV2d3p6iEbwuJYadt1favTPPEW Yf4t+XDQ2nTa7I71pMsCtFVfA847AgXQp1ReLeLX+t9u0MerbfFEIljtimDFyBOWYav6 ETyYBx7U/kntI73zhFyN12qwkMrpec6T1Y5JI6VeFSB3XHMVKYWUirkbPZ9o0009fkHd xunNzZvWw7zQocqqFafVD8KADZI3QOvgs1rIJ+hXJQ7lA9JeznOwEeOBEOLoIjvzFSF3 yREQW52YGt13dsY6dZUhQnjUYKT/yTYjKTclGNPNfCcnLmWzoCpamTsEWVPOZk+9gUAo EH0g== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=skJZWsDJ7NoPZqdxhCC9u3PuQvdTmIXVx55cJd27KXQ=; b=N9cydxhcVIKRcXXenYzuWIODkHpTYT5G+4Y2VKLlnJwENAQDJDpfoW6u+Vfi7iiGef DFtCHAoieRm7Gia8J+AyUfzacNpDVGkC/NsTvWPf3CHBn56a9UApR8f+FnfkKBnIUG8L vrGxkmt756XcxmrYX5dNY4kUYxqqb8XExTXiEo9On0fyr9mb0TVYhSf4SORYT9JYUgog u5Prw2VMPCwFGkUwGNTc55nPeSCMfP+xU3VYjYl41fzlKOW5YUqgFHOmOiPazd84qHFw HaX8Ka4HJdulJjvABmamNFkz/0TF286ko1cRohM9aXWjz7NdHFiWo/tEi5aSBWPc6+bv /cKw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id w18si390630qtj.11.2017.10.23.04.20.06; Mon, 23 Oct 2017 04:20:07 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B55C860385; Mon, 23 Oct 2017 11:20:06 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 321E5622A1; Mon, 23 Oct 2017 11:12:24 +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 E89E1622A1; Mon, 23 Oct 2017 11:12:20 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id C9ECF61DE2 for ; Mon, 23 Oct 2017 11:11:16 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id w21so19688492lfc.6 for ; Mon, 23 Oct 2017 04:11:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=skJZWsDJ7NoPZqdxhCC9u3PuQvdTmIXVx55cJd27KXQ=; b=rIkg0j3B84POWmX+IPJBgDmnhkOEuvZJucqyQMJ/nW54xAiXymsHp18/gY8uLnhqJ4 h5PMFukdnKW/XVy5H20nPIf2+TAavO53MAlddcyXvicTGqytPyvQwWD+LHfcAzyusu5T Pm/O2u9+t6B4sVICa7oTgGR6l7/5UfRCIoPcHLRac155JIEcVu/YUhwvOtMmZ9VH3YV+ M4hq03V7r/6OfQ07WGh5quvD8R6oDMTfBP072ZwfSU5IekSv7JwKZw8mJ6FxShUxxWQ8 Y98W1xDMcTLzTO8Cjz/8gRIESmd3rofJi6Ja2m70ollqE7W7W3VEolDYJ7QiopLisOj6 THQQ== X-Gm-Message-State: AMCzsaVILZ/qzm4XvzcUbCHtXfwKVIPwmVWJSs0DfZaSMWIOzF4ZcDIe 1xkqngXdpBR/Z0eENES8B5Xph8A7Yzo0UQ== X-Google-Smtp-Source: ABhQp+RHG0kXxK0Vf8ltsAQQoKXxyc2kDp4RsIUO/xXgePyF2hJ8QGhBJ+iZU3x9twqgc9FCLtuivw== X-Received: by 10.46.56.20 with SMTP id f20mr5427260lja.189.1508757075479; Mon, 23 Oct 2017 04:11:15 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:14 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:37 +0300 Message-Id: <20171023111057.6328-10-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 09/29] include: install ABI headers without additional ARCH_ABI level 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" Install ABI headers directly to odp/api/abi, removing the need for extra symlink. Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 5328133dd4e4..d841e65b8795 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -110,7 +110,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/queue.h \ odp/api/abi-default/shared_memory.h -odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi +odpapiabiarchincludedir= $(includedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/atomic.h \ @@ -322,16 +322,6 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/version.h endif -# Create symlink for ABI header files. Application does not need to use the arch -# specific include path for installed files. -install-data-hook: - if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ - : ; \ - else \ - $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ - $(DESTDIR)$(prefix)/include/odp/api/abi; \ - fi - # Rerefence all nodist_*_HEADERS here .PHONY: $(nodist_odpapispecinclude_HEADERS) $(nodist_odpapispecinclude_HEADERS): From patchwork Mon Oct 23 11:10:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116688 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4526240qgn; Mon, 23 Oct 2017 04:20:46 -0700 (PDT) X-Received: by 10.55.110.196 with SMTP id j187mr18431009qkc.192.1508757646849; Mon, 23 Oct 2017 04:20:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757646; cv=none; d=google.com; s=arc-20160816; b=S7BjTu1LoDGl/Oi2QiFrXigeijcwYnlsgzh1ox85dQ6NTzvOXuyY98ubmRNSeAxiRG bvuMQVCys7OqzKR35vxE8QY8ktxWHOGsPQqUTzZjQ714WukXdGvbEZsOsl73x0q1A7M4 ChLARgevX8iywji1NxnlzPcbUwHKPKRSQ2WrZVRfMPHPAc6HAncdrmbBmfpisb2H5uUz A0CDviD+FH9QaLNM0c5IKNdK8m1iN7NuKqICFqc888fVX9GnKwCMZ+8IldpG6eoE9zn6 dfrhxDHsrnCOt7gqZs6C69HmWqwIRsDfluKtU3cu/AgqobHoaAAk2D2rUb1O0BARbt/T DpIA== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=wqBBBrZy+g5/JuGTIoyeRl+RLlz4YG+AOYpxxp0bvF8=; b=cBEQxSXSdTrr5O82+Nf63xyr9JoWJM1nRmsODdrXfXV/CQtt1Ws20qb4BEUswW0soQ C9jbrLa/+TnFPIpx/YJ8mB/JbAfEajF8fuNU425ZBuaOCNmkIX8pZN0uEHuLEESI88RI 6fE/CqnW/WpAWuoCSoja0TDFQaqNW8OGDZZM4Jv6r2bZ1XN+XtezTr6944shAubGx9e8 bVlTGcWMV0g+7GR/uhbeWaM2EIk1KNlP38+AfUOY0ocCjZcdY6jGZmohVG5k4kM2H8MU 0FT7OtGHyg9SIo9yziFrhxqsoutvAQEaVk+4rgb/VMk1uouXmdaDOVY9lwEIcJkXJTNS qKaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 8si4044501qtp.6.2017.10.23.04.20.46; Mon, 23 Oct 2017 04:20:46 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 75631622A4; Mon, 23 Oct 2017 11:20:46 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 A6B88622B5; Mon, 23 Oct 2017 11:12:36 +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 64AB4622BE; Mon, 23 Oct 2017 11:12:28 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id CF20B61DEA for ; Mon, 23 Oct 2017 11:11:17 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id k40so19658148lfi.4 for ; Mon, 23 Oct 2017 04:11:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=wqBBBrZy+g5/JuGTIoyeRl+RLlz4YG+AOYpxxp0bvF8=; b=OafT7YBTC4FO4usS9kFkQnP/3MwRUv9KrSdXRKvi/5ESGOJx4ddko08VfmRuYGY35r L6kjQ/3TUDGhsbtw1szRZGLeRGNY4i7UVLPwlxaKb27+4ujJAk44rk1XeYdCdtvYOpt9 uuFWABr47N0bwuHI5vPpXvu7ULBWhDBNJjH4xy9PrqCozP8ixOdlwkNV4hKEsZ6vvHNM +ZMX62yPm+l1fIOEEFsvubs8B/fD6+ebIxJT9BIJinCQL04bNy19/yIgSM4she/w+JD6 +J/RO9tZxDPyLIi7Ebk2gmpeirH6/iUJEtHzzr7ZbSRfPgZiWii2G9uffMjefYD8ghvh RExA== X-Gm-Message-State: AMCzsaXzcKkqdBCDR/S0BEMwqJvWhSb7Wt6CgRU5RcTTz4aqgQxa/xRH nyHEAiClVvA5EGn5nazFKLnV7mmEgaDF/A== X-Google-Smtp-Source: ABhQp+TKJxLGuIRvviSkt62mLmqtnSoxXPdOXV/G0eqGRNTZkO7aC+UEggtCvmy57fLjnAiqNBAuLQ== X-Received: by 10.46.67.14 with SMTP id q14mr5143829lja.73.1508757076488; Mon, 23 Oct 2017 04:11:16 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:15 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:38 +0300 Message-Id: <20171023111057.6328-11-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 10/29] include: install and use ABI headers only in ABI-compat mode 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" There is no need to install ABI headers (or to have them in include path) in non-ABI-compat mode, they should not be used at all. Still provide default ABI headers, because platform may depend on them. Signed-off-by: Dmitry Eremin-Solenikov --- Makefile.inc | 6 +++++- include/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.14.2 diff --git a/Makefile.inc b/Makefile.inc index 10e4041fe662..11fc7c759c85 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -3,9 +3,13 @@ ODP_INCLUDES = \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/include +if ODP_ABI_COMPAT +ODP_INCLUDES += \ + -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +endif + HELPER_INCLUDES = \ -I$(top_srcdir)/helper/include diff --git a/include/Makefile.am b/include/Makefile.am index d841e65b8795..9437f5f68d5a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -110,6 +110,9 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/queue.h \ odp/api/abi-default/shared_memory.h +# Insall ABI headers only if required +if ODP_ABI_COMPAT + odpapiabiarchincludedir= $(includedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ @@ -321,6 +324,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif +endif # ODP_ABI_COMPAT # Rerefence all nodist_*_HEADERS here .PHONY: $(nodist_odpapispecinclude_HEADERS) From patchwork Mon Oct 23 11:10:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116690 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4526800qgn; Mon, 23 Oct 2017 04:21:19 -0700 (PDT) X-Received: by 10.200.52.39 with SMTP id u36mr18185083qtb.246.1508757679275; Mon, 23 Oct 2017 04:21:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757679; cv=none; d=google.com; s=arc-20160816; b=hW5jEA52PYUrdcvyy0tOpeKJ+l8H64oJzpRo6jW6m3F4xh6cy7IXlA7z2sQCiri6o3 lrG6NormtzMsAJkId6AHg+yZwxIxx6Jm7S6p0IQIMnS4882eWNXuSO15d29x3R3xQ7pp DlFofxwyFSl0FpjXS3QCvaYUOhtP1MlVySTbsL9zdHR9XtOQUQccdZsww1T2cQ9HE42n DTxuchu5qBfWAN9n5IToLfbu/FQlgf3N16BPp/t2KmNG9ltkXcvqILmWrEKR2sFxgzwK Rnb5VdXOfaLsH24yGqnbs5x4pJD14okTojF6kkoimmHuMlTpLaMwkanLgzTKF5uXgcST XhWQ== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=EO3YiS8fdyQs+EhVem3u4LtikZ+TBjBZVVwAnN+zCC0=; b=Pv3F2DoHoEGhMopbFuHMnWJwkB/kso07yE3tk0MhVTCIUNH4ZYVejm7Dt61pNtN9b3 RPkdE7Gimfgl5XfSRP5bvIV9wZa+i6Cn2fyG434Pw7fu/QGJG9mQu5VVUiWK8+naKLlO LBK0cn+e+TqiAF0R1gLbD3YzcmxvZrdo9drXWEOXWFO8jzjTdMVv4M03IN6Tn5uynkpv px19FOA/QSX4QPnHo8Fjj8Pau2iR+p1P1Q7k12r0K+ih3/XZ66x4XB1UmhsGnzAkAHa+ HlMn2Yks2N6y7sE/7R6MqUFPbhqLuhkxbDjT3BC810BsUHAhyO1PSyOE0g3TpCq41afA j+jg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id i185si6221559qka.198.2017.10.23.04.21.19; Mon, 23 Oct 2017 04:21:19 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id EB46A62294; Mon, 23 Oct 2017 11:21: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=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 EEFC661DEF; Mon, 23 Oct 2017 11:12:41 +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 E1C38622BE; Mon, 23 Oct 2017 11:12:33 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.linaro.org (Postfix) with ESMTPS id 08EAF61DEF for ; Mon, 23 Oct 2017 11:11:19 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id l23so19661891lfk.10 for ; Mon, 23 Oct 2017 04:11:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=EO3YiS8fdyQs+EhVem3u4LtikZ+TBjBZVVwAnN+zCC0=; b=Hw+Of73ididNhQakG7VNICkY+PlngVQ6Arn5Vfd38dim3JmX/V4szTKlF0crJAVP4u XI+fyuMv9G5dAT3P7+Uo5TIJSFILcATJa9d5BeCOOgI5K9j+b/gyGajEFRtbnmPU8Dxl TGU1OOT6QG27DL8DwttpIooRs7AXN/GyCSCxoVTi1muMsuXAsNwF6dWSxGIt0Zf0gJ3r ySHIeqHjAOIq289jgGeNjLXmwtH/j+PvimrWd/0R0WSypx+s5pSbmTrmyZy9ee6XneIG 2A9gNTHZwfBVN8WmQo4uJo4Gdp7yEZZFeVZvJMwIkwVeJYnB8nfrl5R6bjUKnDLivTQf ydcg== X-Gm-Message-State: AMCzsaVG3SIuhCSYID/Z8M6d3xsGMlO8NR4BaZPXuYZy0n1nb07ZkLLV q00AHKS/vvB06BbICkF602b5+ui+GJbhXg== X-Google-Smtp-Source: ABhQp+SMUK+2aUSi2T/WTIOvSIkhub79QyMrxmvtwSa8P5SsKqO0otPhag3iwh9spwaZGoYj6IVqRg== X-Received: by 10.46.33.209 with SMTP id h78mr5397685lji.152.1508757077678; Mon, 23 Oct 2017 04:11:17 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:16 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:39 +0300 Message-Id: <20171023111057.6328-12-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 11/29] abi: queue: drop unused odp_queue_group_t 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" Signed-off-by: Dmitry Eremin-Solenikov --- include/odp/api/spec/queue.h | 5 ----- platform/linux-generic/include/odp/api/queue.h | 12 ------------ 2 files changed, 17 deletions(-) -- 2.14.2 diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index 73598be06d93..3cd99a9f3035 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -32,11 +32,6 @@ extern "C" { * ODP queue */ -/** - * @typedef odp_queue_group_t - * Queue group instance type - */ - /** * @def ODP_QUEUE_INVALID * Invalid queue diff --git a/platform/linux-generic/include/odp/api/queue.h b/platform/linux-generic/include/odp/api/queue.h index adceafbd1c3b..f958ff5140c8 100644 --- a/platform/linux-generic/include/odp/api/queue.h +++ b/platform/linux-generic/include/odp/api/queue.h @@ -23,18 +23,6 @@ extern "C" { #include #include -/** @ingroup odp_queue - * @{ - */ - -/* REMOVE FROM API SPEC. Typedef needed only for suppressing Doxygen - * warning. */ -typedef void odp_queue_group_t; - -/** - * @} - */ - #include #ifdef __cplusplus From patchwork Mon Oct 23 11:10:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116692 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4527199qgn; Mon, 23 Oct 2017 04:21:54 -0700 (PDT) X-Received: by 10.55.82.86 with SMTP id g83mr17862218qkb.342.1508757714262; Mon, 23 Oct 2017 04:21:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757714; cv=none; d=google.com; s=arc-20160816; b=GK9s/ipX8WOaujL68HMaXUdWoNpMW/3OnzHb6WFLOJrvXVm+xjypyzX0cP3m1qzsRE IC3PmK2Bii4ir+gfjUWN9gdYaXSQA1PedbG7cJ3m8B+1aTnE2JvN379ORjLhzV2nobOp 4tpUYhnYaCZAjIRN0veQ6NiLIbRh4ULKHg7xNfgOaTlvMn1kdUAVGUZl2NMvQeYGzRLo VW8QYp6F/hFrT09OY7wvbT12hw4pB3N/AvItb1wQ44K9qpVvEcdISdbJMj7ZmS800pR+ S7dTtkrzNYqB2kwyfjeMvNtwPWZsLGzqoc71iaXbCL5CJIYboahZeoh8eER4fEhbO8qA wvwQ== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=8C0NOdD8F4Dv9ahRhDeJDQuTf+MQALONFgMAt0eaDv8=; b=a1ux9+I50Xen/wsQ5j/d7G5DJLc/iKkoFI96cjrMmwOm48fsUGInvvmkS3FKoFeeF9 6k+JPA7GwKmRjbwaA8Qi3ZDl+wGewvRo84X2tN6HRIW7KnMEj4UeKeXrEAWhOb409meo Jq/3I4SVNb5Rr4uL71eukbURTSxTgDQWdqxdRRDHe+cvIshmwrwr2DYIFxsKTGPewPUE jTR5f6o76p8m+5ySl+yZnEiBArLAPgA2fRVsclqfn3DPck3FF7MGPQ+DfKx3LXK9oDtQ kTp3bdwIPnFOmbncbjer97Ou3FljnNRUQvId6LM1UR14rMwpi+9SOdfEzGFZ3N1Oane4 z+4w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id d129si669801qkf.177.2017.10.23.04.21.54; Mon, 23 Oct 2017 04:21:54 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E4654622A5; Mon, 23 Oct 2017 11:21:53 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 3792361D7E; Mon, 23 Oct 2017 11:12:48 +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 26D35622CF; Mon, 23 Oct 2017 11:12:39 +0000 (UTC) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.linaro.org (Postfix) with ESMTPS id 028396163C for ; Mon, 23 Oct 2017 11:11:20 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id k40so19658290lfi.4 for ; Mon, 23 Oct 2017 04:11:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8C0NOdD8F4Dv9ahRhDeJDQuTf+MQALONFgMAt0eaDv8=; b=VsItpUMfwQYKQZx/Dr6JDQ3Om4tKZVT9wRLapa4ohx7n6Wpnb5/tYPITO7LO3b5XlE gcX4zP4dNFCwKCM1bf7pDIsfC3E98VuYRgBK9nBeWmYU9mgUyYLzEBIkfQt4oiucoUpF ph6GhxCBA6Bk1sKjwO9rdyRBxNgupXCbWVmyxQ39KoBDdJw+IGsBFhGM+vll6C6ufjI6 Bp1KLNjmRfCvIh0bKe1R+j0bMnlcmfeq+JySqVSpczxrvk/1l+dRiNMx+uJGugXz67YG bQ9VWr68J2KfYN8bwp/lunHo7fT1w1z1glr2QZ9Jxt+0zKm1Xsj/wUzmiZbL6VrsvKio rTdQ== X-Gm-Message-State: AMCzsaWiTJ+EAZWPYfDKmzp4N3cMDGCxCiabA+lx2Ap7nMfQF9hjILuw Hd7qYot98T1CUbrWGUogztPyZqCLSiiv9Q== X-Google-Smtp-Source: ABhQp+T0lGCF92lF6JjR1SxOPC9OScbaBNEOa99TNohxodqIYTLHUBEO9hYIsXLEx4+t5+B8UkCOYg== X-Received: by 10.46.32.150 with SMTP id g22mr5334735lji.62.1508757078644; Mon, 23 Oct 2017 04:11:18 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:18 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:40 +0300 Message-Id: <20171023111057.6328-13-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 12/29] abi: classification: drop two unused types 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" Signed-off-by: Dmitry Eremin-Solenikov --- include/odp/api/spec/classification.h | 11 ----------- platform/linux-generic/include/odp/api/classification.h | 13 ------------- 2 files changed, 24 deletions(-) -- 2.14.2 diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 0c4a95c5f6e7..d0d51d1fb2b8 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -30,11 +30,6 @@ extern "C" { * ODP Class of service handle */ -/** - * @typedef odp_flowsig_t - * flow signature type, only used for packet metadata field. - */ - /** * @def ODP_COS_INVALID * This value is returned from odp_cls_cos_create() on failure, @@ -389,12 +384,6 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, odp_bool_t l3_preference); -/** - * @typedef odp_cos_flow_set_t - * Set of header fields that take part in flow signature hash calculation: - * bit positions per odp_cos_hdr_flow_fields_t enumeration. - */ - /** * @typedef odp_pmr_t * PMR - Packet Matching Rule diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h index 2ba6eb0eb6b0..377d1a02f7e8 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/platform/linux-generic/include/odp/api/classification.h @@ -24,19 +24,6 @@ extern "C" { #include #include -/** @ingroup odp_classification - * @{ - */ - -/* REMOVE THESE FROM API SPEC. Typedefs needed only for suppressing Doxygen - * warning. */ -typedef void odp_flowsig_t; -typedef void odp_cos_flow_set_t; - -/** - * @} - */ - #include #ifdef __cplusplus From patchwork Mon Oct 23 11:10:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116714 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4541069qgn; Mon, 23 Oct 2017 04:38:04 -0700 (PDT) X-Received: by 10.107.138.222 with SMTP id c91mr8216578ioj.246.1508758684788; Mon, 23 Oct 2017 04:38:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508758684; cv=none; d=google.com; s=arc-20160816; b=kpoJG7yY5UJZOSR0JAR+rExfAbPjSGLZkKzeFYLunyN9kXMmNv7mezYk+3vi8zotjK K4bnLj0ZF8HFDJ4870kt8KRSLnMH49lmUnyvVqG1FJ2C+PZouBGwMlxJCLEMtshxS19G QbKy9P+TQce4IufnSnUhDwlNzuFd5aol2xDlV3Hh5ZvFa3prVZxwwxO6puL/t6ll84Fs vkbF0jPs5CejWb/JU/+21sjAhuE6gB0Zj8bo6JhgHy4CAO8gr2qDH7XuKNmoWFfNjTyn nK3kMbqsPp6uQde1xYoLGaSZfz4YUBoA/rgyk5uvLGJ9p8yrxuID3nzvRq1fbcgFipv8 ICDw== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=yVQi1DaY1lsK9yrwV92uFslRWPaCpzHDnghu0mTOPr0=; b=h9RlgaQHhgZnhRUE7mT/qJiXStX169brj9Ty5nred18LIQD8bd74V+Ilu9wjHkmF9F EaOyPB6QSCyktjO3d3uQqiz8BZjulCh2vJk9mC3OKoay+/8/rfcdTJSf5Q2xHxHTOzFI zfnrnKOBMNXxEKH41w/xtL74eNOOQqwfbqx8mMPsrl0vx7BvLXFnqPqriCc6m2nRuHIx NDQL7P5vwMImanGVL1LkqTmE6bD6w+UV1mYN30q9Th0fizrRlVbHXuZp1pggWzllqzrY DRE0wuRWxueGT3ahBbVU1iqKHjJQPPpIGSX6oojWBXzaqiFX700MrJgNvE0c6U4ju9wt iiXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id v10si5749954iob.320.2017.10.23.04.38.04; Mon, 23 Oct 2017 04:38:04 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5BBD86291E; Mon, 23 Oct 2017 11:38:04 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 DF874622E4; Mon, 23 Oct 2017 11:14: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 35843622DB; Mon, 23 Oct 2017 11:13:06 +0000 (UTC) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.linaro.org (Postfix) with ESMTPS id 771CD61DF1 for ; Mon, 23 Oct 2017 11:11:21 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id a132so19652581lfa.7 for ; Mon, 23 Oct 2017 04:11:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=yVQi1DaY1lsK9yrwV92uFslRWPaCpzHDnghu0mTOPr0=; b=LVn4kQhP4j4p7evpHxIj4PDgHNqaMb4Eip7ctfxjdLduTsHDje9hKP8hMmzeE0hO3P bBvdH6nzKaPfYQvh8/sDg+OVEvOmnRytlcjr1Wm5zYUHXQkkJAZBLqSjTo8d0hERPSHx gzrck+KaYI8BLCYLYulSlILGp5w6+T5zaNkuQspKhMCYWp+wbtWivynGB6Q5yTeUj6oH WmPLQg2MDYOdTgbg/eMEzJD4OuIwmQnZK3QWqdkICKk7aOgcX4pRefFoBvrrhoeA/mbx R5RtqppE1f7cxgqaD/oGVErtGdXXCNUMXd5J95Yzg/da1xLYlvzuehNGcbw1KM1EN49m NDng== X-Gm-Message-State: AMCzsaWD3CkLa4WhCSMeSsMkgtX6T2wXAh97LvD+Qi/Afkn4H3YQ+HWP qgSmapGUCRwK+Ukp3Ggln0mSEiwsuib+lw== X-Google-Smtp-Source: ABhQp+Sx0WxHGsgXMLSWJVQNn8AYi+ngstgFXLqUfZ/TxW/nYMsrt3EFp1xal7ShCH6ugLgj1gij0A== X-Received: by 10.46.47.7 with SMTP id v7mr4381866ljv.192.1508757079871; Mon, 23 Oct 2017 04:11:19 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:19 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:41 +0300 Message-Id: <20171023111057.6328-14-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 13/29] include: change spec guarding define from ODP_API to ODP_API_SPEC 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" Change defines guarding inclusion of ODP API spec files from ODP_API_FOO to ODP_API_SPEC_FOO, as they are placed in odp/api/spec/foo.h path. Signed-off-by: Dmitry Eremin-Solenikov --- include/odp/api/spec/align.h | 4 ++-- include/odp/api/spec/atomic.h | 4 ++-- include/odp/api/spec/barrier.h | 4 ++-- include/odp/api/spec/buffer.h | 4 ++-- include/odp/api/spec/byteorder.h | 4 ++-- include/odp/api/spec/chksum.h | 4 ++-- include/odp/api/spec/classification.h | 4 ++-- include/odp/api/spec/compiler.h | 4 ++-- include/odp/api/spec/cpu.h | 4 ++-- include/odp/api/spec/cpumask.h | 4 ++-- include/odp/api/spec/crypto.h | 4 ++-- include/odp/api/spec/debug.h | 4 ++-- include/odp/api/spec/deprecated.h.in | 4 ++-- include/odp/api/spec/errno.h | 4 ++-- include/odp/api/spec/event.h | 4 ++-- include/odp/api/spec/feature.h | 4 ++-- include/odp/api/spec/hash.h | 4 ++-- include/odp/api/spec/hints.h | 4 ++-- include/odp/api/spec/init.h | 4 ++-- include/odp/api/spec/ipsec.h | 4 ++-- include/odp/api/spec/packet.h | 4 ++-- include/odp/api/spec/packet_flags.h | 4 ++-- include/odp/api/spec/packet_io.h | 4 ++-- include/odp/api/spec/packet_io_stats.h | 4 ++-- include/odp/api/spec/pool.h | 4 ++-- include/odp/api/spec/queue.h | 4 ++-- include/odp/api/spec/random.h | 4 ++-- include/odp/api/spec/rwlock.h | 4 ++-- include/odp/api/spec/rwlock_recursive.h | 4 ++-- include/odp/api/spec/schedule.h | 4 ++-- include/odp/api/spec/schedule_types.h | 4 ++-- include/odp/api/spec/shared_memory.h | 4 ++-- include/odp/api/spec/spinlock.h | 4 ++-- include/odp/api/spec/spinlock_recursive.h | 4 ++-- include/odp/api/spec/std_clib.h | 4 ++-- include/odp/api/spec/std_types.h | 4 ++-- include/odp/api/spec/support.h | 4 ++-- include/odp/api/spec/sync.h | 4 ++-- include/odp/api/spec/system_info.h | 4 ++-- include/odp/api/spec/thread.h | 4 ++-- include/odp/api/spec/thrmask.h | 4 ++-- include/odp/api/spec/ticketlock.h | 4 ++-- include/odp/api/spec/time.h | 4 ++-- include/odp/api/spec/timer.h | 4 ++-- include/odp/api/spec/traffic_mngr.h | 4 ++-- include/odp/api/spec/version.h.in | 4 ++-- 46 files changed, 92 insertions(+), 92 deletions(-) -- 2.14.2 diff --git a/include/odp/api/spec/align.h b/include/odp/api/spec/align.h index fdf8c29e14e4..0a9db3488232 100644 --- a/include/odp/api/spec/align.h +++ b/include/odp/api/spec/align.h @@ -11,8 +11,8 @@ * ODP alignments */ -#ifndef ODP_API_ALIGN_H_ -#define ODP_API_ALIGN_H_ +#ifndef ODP_API_SPEC_ALIGN_H_ +#define ODP_API_SPEC_ALIGN_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/atomic.h b/include/odp/api/spec/atomic.h index 408829df299f..d828ea47da3b 100644 --- a/include/odp/api/spec/atomic.h +++ b/include/odp/api/spec/atomic.h @@ -10,8 +10,8 @@ * ODP atomic operations */ -#ifndef ODP_API_ATOMIC_H_ -#define ODP_API_ATOMIC_H_ +#ifndef ODP_API_SPEC_ATOMIC_H_ +#define ODP_API_SPEC_ATOMIC_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/barrier.h b/include/odp/api/spec/barrier.h index 6de683c73e0c..8351ef8864b7 100644 --- a/include/odp/api/spec/barrier.h +++ b/include/odp/api/spec/barrier.h @@ -10,8 +10,8 @@ * ODP execution barriers */ -#ifndef ODP_API_BARRIER_H_ -#define ODP_API_BARRIER_H_ +#ifndef ODP_API_SPEC_BARRIER_H_ +#define ODP_API_SPEC_BARRIER_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/buffer.h b/include/odp/api/spec/buffer.h index 94829b324dd9..b2f90f949864 100644 --- a/include/odp/api/spec/buffer.h +++ b/include/odp/api/spec/buffer.h @@ -11,8 +11,8 @@ * ODP buffer descriptor */ -#ifndef ODP_API_BUFFER_H_ -#define ODP_API_BUFFER_H_ +#ifndef ODP_API_SPEC_BUFFER_H_ +#define ODP_API_SPEC_BUFFER_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/byteorder.h b/include/odp/api/spec/byteorder.h index 38c0bdbf7a3d..814438d3f803 100644 --- a/include/odp/api/spec/byteorder.h +++ b/include/odp/api/spec/byteorder.h @@ -10,8 +10,8 @@ * ODP byteorder */ -#ifndef ODP_API_BYTEORDER_H_ -#define ODP_API_BYTEORDER_H_ +#ifndef ODP_API_SPEC_BYTEORDER_H_ +#define ODP_API_SPEC_BYTEORDER_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/chksum.h b/include/odp/api/spec/chksum.h index e523ac286528..8f35e253fe91 100644 --- a/include/odp/api/spec/chksum.h +++ b/include/odp/api/spec/chksum.h @@ -10,8 +10,8 @@ * ODP Hash functions */ -#ifndef ODP_API_CHKSUM_H_ -#define ODP_API_CHKSUM_H_ +#ifndef ODP_API_SPEC_CHKSUM_H_ +#define ODP_API_SPEC_CHKSUM_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index d0d51d1fb2b8..d395feae2102 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -10,8 +10,8 @@ * ODP classification descriptor */ -#ifndef ODP_API_CLASSIFY_H_ -#define ODP_API_CLASSIFY_H_ +#ifndef ODP_API_SPEC_CLASSIFY_H_ +#define ODP_API_SPEC_CLASSIFY_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/compiler.h b/include/odp/api/spec/compiler.h index c88350e2c17e..443607fbd22c 100644 --- a/include/odp/api/spec/compiler.h +++ b/include/odp/api/spec/compiler.h @@ -11,8 +11,8 @@ * Compiler related */ -#ifndef ODP_API_COMPILER_H_ -#define ODP_API_COMPILER_H_ +#ifndef ODP_API_SPEC_COMPILER_H_ +#define ODP_API_SPEC_COMPILER_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/cpu.h b/include/odp/api/spec/cpu.h index 0f47e4798116..04fbbe9006d2 100644 --- a/include/odp/api/spec/cpu.h +++ b/include/odp/api/spec/cpu.h @@ -11,8 +11,8 @@ * ODP CPU API */ -#ifndef ODP_CPU_H_ -#define ODP_CPU_H_ +#ifndef ODP_API_SPEC_CPU_H_ +#define ODP_API_SPEC_CPU_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/cpumask.h b/include/odp/api/spec/cpumask.h index 22d8e8f246f0..68a705d25262 100644 --- a/include/odp/api/spec/cpumask.h +++ b/include/odp/api/spec/cpumask.h @@ -11,8 +11,8 @@ * ODP CPU masks and enumeration */ -#ifndef ODP_API_CPUMASK_H_ -#define ODP_API_CPUMASK_H_ +#ifndef ODP_API_SPEC_CPUMASK_H_ +#define ODP_API_SPEC_CPUMASK_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 7dcb71264f8a..7720468ee0ce 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -11,8 +11,8 @@ * ODP crypto */ -#ifndef ODP_API_CRYPTO_H_ -#define ODP_API_CRYPTO_H_ +#ifndef ODP_API_SPEC_CRYPTO_H_ +#define ODP_API_SPEC_CRYPTO_H_ #include #include diff --git a/include/odp/api/spec/debug.h b/include/odp/api/spec/debug.h index b3b170f3e386..c2896a824b51 100644 --- a/include/odp/api/spec/debug.h +++ b/include/odp/api/spec/debug.h @@ -9,8 +9,8 @@ * ODP debug */ -#ifndef ODP_API_DEBUG_H_ -#define ODP_API_DEBUG_H_ +#ifndef ODP_API_SPEC_DEBUG_H_ +#define ODP_API_SPEC_DEBUG_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/deprecated.h.in b/include/odp/api/spec/deprecated.h.in index 224f60ff37ab..25520b9d8e21 100644 --- a/include/odp/api/spec/deprecated.h.in +++ b/include/odp/api/spec/deprecated.h.in @@ -10,8 +10,8 @@ * Macro for deprecated API definitions */ -#ifndef ODP_API_DEPRECATED_H_ -#define ODP_API_DEPRECATED_H_ +#ifndef ODP_API_SPEC_DEPRECATED_H_ +#define ODP_API_SPEC_DEPRECATED_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/errno.h b/include/odp/api/spec/errno.h index 9b60a98bafe2..ca74f7416a06 100644 --- a/include/odp/api/spec/errno.h +++ b/include/odp/api/spec/errno.h @@ -10,8 +10,8 @@ * ODP errno API */ -#ifndef ODP_ERRNO_H_ -#define ODP_ERRNO_H_ +#ifndef ODP_API_SPEC_ERRNO_H_ +#define ODP_API_SPEC_ERRNO_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/event.h b/include/odp/api/spec/event.h index f924973f0f91..0638f674ed37 100644 --- a/include/odp/api/spec/event.h +++ b/include/odp/api/spec/event.h @@ -11,8 +11,8 @@ * ODP event */ -#ifndef ODP_API_EVENT_H_ -#define ODP_API_EVENT_H_ +#ifndef ODP_API_SPEC_EVENT_H_ +#define ODP_API_SPEC_EVENT_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h index 0cfc141db906..b64b2c7d0fd8 100644 --- a/include/odp/api/spec/feature.h +++ b/include/odp/api/spec/feature.h @@ -12,8 +12,8 @@ * components. */ -#ifndef ODP_API_FEATURE_H_ -#define ODP_API_FEATURE_H_ +#ifndef ODP_API_SPEC_FEATURE_H_ +#define ODP_API_SPEC_FEATURE_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/hash.h b/include/odp/api/spec/hash.h index 66b740e2c133..e86b2c6d7ee0 100644 --- a/include/odp/api/spec/hash.h +++ b/include/odp/api/spec/hash.h @@ -10,8 +10,8 @@ * ODP Hash functions */ -#ifndef ODP_API_HASH_H_ -#define ODP_API_HASH_H_ +#ifndef ODP_API_SPEC_HASH_H_ +#define ODP_API_SPEC_HASH_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/hints.h b/include/odp/api/spec/hints.h index 7434c6a5c328..649957374cdb 100644 --- a/include/odp/api/spec/hints.h +++ b/include/odp/api/spec/hints.h @@ -11,8 +11,8 @@ * ODP compiler hints */ -#ifndef ODP_API_HINTS_H_ -#define ODP_API_HINTS_H_ +#ifndef ODP_API_SPEC_HINTS_H_ +#define ODP_API_SPEC_HINTS_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h index e8ec41136c3b..56c86740f9bc 100644 --- a/include/odp/api/spec/init.h +++ b/include/odp/api/spec/init.h @@ -19,8 +19,8 @@ * - odp_term_local() */ -#ifndef ODP_API_INIT_H_ -#define ODP_API_INIT_H_ +#ifndef ODP_API_SPEC_INIT_H_ +#define ODP_API_SPEC_INIT_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 26e852fca1d7..441c35c16454 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -10,8 +10,8 @@ * ODP IPSEC API */ -#ifndef ODP_API_IPSEC_H_ -#define ODP_API_IPSEC_H_ +#ifndef ODP_API_SPEC_IPSEC_H_ +#define ODP_API_SPEC_IPSEC_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 62ecf70e1d0e..b665855529b4 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -11,8 +11,8 @@ * ODP packet descriptor */ -#ifndef ODP_API_PACKET_H_ -#define ODP_API_PACKET_H_ +#ifndef ODP_API_SPEC_PACKET_H_ +#define ODP_API_SPEC_PACKET_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/packet_flags.h b/include/odp/api/spec/packet_flags.h index 377b75ba0a55..8e86e5b58626 100644 --- a/include/odp/api/spec/packet_flags.h +++ b/include/odp/api/spec/packet_flags.h @@ -11,8 +11,8 @@ * ODP packet flags */ -#ifndef ODP_API_PACKET_FLAGS_H_ -#define ODP_API_PACKET_FLAGS_H_ +#ifndef ODP_API_SPEC_PACKET_FLAGS_H_ +#define ODP_API_SPEC_PACKET_FLAGS_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 52af646a6180..4156d07860f2 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -11,8 +11,8 @@ * ODP Packet IO */ -#ifndef ODP_API_PACKET_IO_H_ -#define ODP_API_PACKET_IO_H_ +#ifndef ODP_API_SPEC_PACKET_IO_H_ +#define ODP_API_SPEC_PACKET_IO_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/packet_io_stats.h b/include/odp/api/spec/packet_io_stats.h index 299ecd0e1d2a..18619143d525 100644 --- a/include/odp/api/spec/packet_io_stats.h +++ b/include/odp/api/spec/packet_io_stats.h @@ -10,8 +10,8 @@ * ODP Packet IO */ -#ifndef ODP_API_PACKET_IO_STATS_H_ -#define ODP_API_PACKET_IO_STATS_H_ +#ifndef ODP_API_SPEC_PACKET_IO_STATS_H_ +#define ODP_API_SPEC_PACKET_IO_STATS_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index 221798ee8cc6..b537589b8d85 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -11,8 +11,8 @@ * ODP pool */ -#ifndef ODP_API_POOL_H_ -#define ODP_API_POOL_H_ +#ifndef ODP_API_SPEC_POOL_H_ +#define ODP_API_SPEC_POOL_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index 3cd99a9f3035..b82c1b852fb1 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -11,8 +11,8 @@ * ODP queue */ -#ifndef ODP_API_QUEUE_H_ -#define ODP_API_QUEUE_H_ +#ifndef ODP_API_SPEC_QUEUE_H_ +#define ODP_API_SPEC_QUEUE_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/random.h b/include/odp/api/spec/random.h index 4765475c24c5..8bed969b6ad8 100644 --- a/include/odp/api/spec/random.h +++ b/include/odp/api/spec/random.h @@ -11,8 +11,8 @@ * ODP random number API */ -#ifndef ODP_API_RANDOM_H_ -#define ODP_API_RANDOM_H_ +#ifndef ODP_API_SPEC_RANDOM_H_ +#define ODP_API_SPEC_RANDOM_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/rwlock.h b/include/odp/api/spec/rwlock.h index ff8a3f2783d1..3e5c47ba62fc 100644 --- a/include/odp/api/spec/rwlock.h +++ b/include/odp/api/spec/rwlock.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ODP_API_RWLOCK_H_ -#define ODP_API_RWLOCK_H_ +#ifndef ODP_API_SPEC_RWLOCK_H_ +#define ODP_API_SPEC_RWLOCK_H_ #include /** diff --git a/include/odp/api/spec/rwlock_recursive.h b/include/odp/api/spec/rwlock_recursive.h index 1c19c7217d08..03a4dce4e83c 100644 --- a/include/odp/api/spec/rwlock_recursive.h +++ b/include/odp/api/spec/rwlock_recursive.h @@ -10,8 +10,8 @@ * ODP recursive read/write lock */ -#ifndef ODP_API_RWLOCK_RECURSIVE_H_ -#define ODP_API_RWLOCK_RECURSIVE_H_ +#ifndef ODP_API_SPEC_RWLOCK_RECURSIVE_H_ +#define ODP_API_SPEC_RWLOCK_RECURSIVE_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index fe2300db0f0b..524449647b0c 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -11,8 +11,8 @@ * ODP schedule */ -#ifndef ODP_API_SCHEDULE_H_ -#define ODP_API_SCHEDULE_H_ +#ifndef ODP_API_SPEC_SCHEDULE_H_ +#define ODP_API_SPEC_SCHEDULE_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h index 397f98fcd452..e0dc4027b91b 100644 --- a/include/odp/api/spec/schedule_types.h +++ b/include/odp/api/spec/schedule_types.h @@ -10,8 +10,8 @@ * ODP schedule types */ -#ifndef ODP_API_SCHEDULE_TYPES_H_ -#define ODP_API_SCHEDULE_TYPES_H_ +#ifndef ODP_API_SPEC_SCHEDULE_TYPES_H_ +#define ODP_API_SPEC_SCHEDULE_TYPES_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 1a9c1299e5da..1b534d927fc3 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -11,8 +11,8 @@ * ODP shared memory */ -#ifndef ODP_API_SHARED_MEMORY_H_ -#define ODP_API_SHARED_MEMORY_H_ +#ifndef ODP_API_SPEC_SHARED_MEMORY_H_ +#define ODP_API_SPEC_SHARED_MEMORY_H_ #include #include diff --git a/include/odp/api/spec/spinlock.h b/include/odp/api/spec/spinlock.h index 11b7339b101f..fc7629dda76a 100644 --- a/include/odp/api/spec/spinlock.h +++ b/include/odp/api/spec/spinlock.h @@ -10,8 +10,8 @@ * ODP spinlock */ -#ifndef ODP_API_SPINLOCK_H_ -#define ODP_API_SPINLOCK_H_ +#ifndef ODP_API_SPEC_SPINLOCK_H_ +#define ODP_API_SPEC_SPINLOCK_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/spinlock_recursive.h b/include/odp/api/spec/spinlock_recursive.h index c9c7ddb02fd7..7546e75eae19 100644 --- a/include/odp/api/spec/spinlock_recursive.h +++ b/include/odp/api/spec/spinlock_recursive.h @@ -10,8 +10,8 @@ * ODP recursive spinlock */ -#ifndef ODP_API_SPINLOCK_RECURSIVE_H_ -#define ODP_API_SPINLOCK_RECURSIVE_H_ +#ifndef ODP_API_SPEC_SPINLOCK_RECURSIVE_H_ +#define ODP_API_SPEC_SPINLOCK_RECURSIVE_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/std_clib.h b/include/odp/api/spec/std_clib.h index 33e9db5361fb..d308442051bc 100644 --- a/include/odp/api/spec/std_clib.h +++ b/include/odp/api/spec/std_clib.h @@ -10,8 +10,8 @@ * ODP version of often used C library calls */ -#ifndef ODP_API_STD_CLIB_H_ -#define ODP_API_STD_CLIB_H_ +#ifndef ODP_API_SPEC_STD_CLIB_H_ +#define ODP_API_SPEC_STD_CLIB_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/std_types.h b/include/odp/api/spec/std_types.h index ec6a6df6d75d..4732b6fe4d91 100644 --- a/include/odp/api/spec/std_types.h +++ b/include/odp/api/spec/std_types.h @@ -12,8 +12,8 @@ * */ -#ifndef ODP_API_STD_TYPES_H_ -#define ODP_API_STD_TYPES_H_ +#ifndef ODP_API_SPEC_STD_TYPES_H_ +#define ODP_API_SPEC_STD_TYPES_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/support.h b/include/odp/api/spec/support.h index cc43b6f0e2bc..df732d1815d9 100644 --- a/include/odp/api/spec/support.h +++ b/include/odp/api/spec/support.h @@ -10,8 +10,8 @@ * ODP support API */ -#ifndef ODP_API_SUPPORT_H_ -#define ODP_API_SUPPORT_H_ +#ifndef ODP_API_SPEC_SUPPORT_H_ +#define ODP_API_SPEC_SUPPORT_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/sync.h b/include/odp/api/spec/sync.h index 6f87db559367..1306687c045b 100644 --- a/include/odp/api/spec/sync.h +++ b/include/odp/api/spec/sync.h @@ -10,8 +10,8 @@ * ODP memory barriers */ -#ifndef ODP_API_SYNC_H_ -#define ODP_API_SYNC_H_ +#ifndef ODP_API_SPEC_SYNC_H_ +#define ODP_API_SPEC_SYNC_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h index 140db7b4fd17..38767640faac 100644 --- a/include/odp/api/spec/system_info.h +++ b/include/odp/api/spec/system_info.h @@ -11,8 +11,8 @@ * ODP system information */ -#ifndef ODP_API_SYSTEM_INFO_H_ -#define ODP_API_SYSTEM_INFO_H_ +#ifndef ODP_API_SPEC_SYSTEM_INFO_H_ +#define ODP_API_SPEC_SYSTEM_INFO_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/thread.h b/include/odp/api/spec/thread.h index 689ba59b58fa..5fe74c69da87 100644 --- a/include/odp/api/spec/thread.h +++ b/include/odp/api/spec/thread.h @@ -11,8 +11,8 @@ * ODP thread API */ -#ifndef ODP_API_THREAD_H_ -#define ODP_API_THREAD_H_ +#ifndef ODP_API_SPEC_THREAD_H_ +#define ODP_API_SPEC_THREAD_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/thrmask.h b/include/odp/api/spec/thrmask.h index 3986769acedb..cd37e6149580 100644 --- a/include/odp/api/spec/thrmask.h +++ b/include/odp/api/spec/thrmask.h @@ -10,8 +10,8 @@ * ODP thread masks */ -#ifndef ODP_API_THRMASK_H_ -#define ODP_API_THRMASK_H_ +#ifndef ODP_API_SPEC_THRMASK_H_ +#define ODP_API_SPEC_THRMASK_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/ticketlock.h b/include/odp/api/spec/ticketlock.h index b23253b5536c..bf706cb39724 100644 --- a/include/odp/api/spec/ticketlock.h +++ b/include/odp/api/spec/ticketlock.h @@ -11,8 +11,8 @@ * ODP ticketlock */ -#ifndef ODP_API_TICKETLOCK_H_ -#define ODP_API_TICKETLOCK_H_ +#ifndef ODP_API_SPEC_TICKETLOCK_H_ +#define ODP_API_SPEC_TICKETLOCK_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/time.h b/include/odp/api/spec/time.h index 29175eb5a60e..dec1b9a7b556 100644 --- a/include/odp/api/spec/time.h +++ b/include/odp/api/spec/time.h @@ -11,8 +11,8 @@ * ODP time */ -#ifndef ODP_API_TIME_H_ -#define ODP_API_TIME_H_ +#ifndef ODP_API_SPEC_TIME_H_ +#define ODP_API_SPEC_TIME_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 17daafc78e1b..a85edda55fee 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -11,8 +11,8 @@ * ODP timer service */ -#ifndef ODP_API_TIMER_H_ -#define ODP_API_TIMER_H_ +#ifndef ODP_API_SPEC_TIMER_H_ +#define ODP_API_SPEC_TIMER_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index c9134e8e4ff6..361e73653e66 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ODP_TRAFFIC_MNGR_H_ -#define ODP_TRAFFIC_MNGR_H_ +#ifndef ODP_API_SPEC_TRAFFIC_MNGR_H_ +#define ODP_API_SPEC_TRAFFIC_MNGR_H_ #include #ifdef __cplusplus diff --git a/include/odp/api/spec/version.h.in b/include/odp/api/spec/version.h.in index f5e9e9c8be91..1a9a83f9a970 100644 --- a/include/odp/api/spec/version.h.in +++ b/include/odp/api/spec/version.h.in @@ -11,8 +11,8 @@ * ODP version */ -#ifndef ODP_API_VERSION_H_ -#define ODP_API_VERSION_H_ +#ifndef ODP_API_SPEC_VERSION_H_ +#define ODP_API_SPEC_VERSION_H_ #include #ifdef __cplusplus From patchwork Mon Oct 23 11:10:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116713 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4539860qgn; Mon, 23 Oct 2017 04:36:36 -0700 (PDT) X-Received: by 10.55.153.69 with SMTP id b66mr18588462qke.107.1508758596670; Mon, 23 Oct 2017 04:36:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508758596; cv=none; d=google.com; s=arc-20160816; b=E+M5INAlnYQIP7nW7bhG3VfA9FaoiHpZopnKrTO1svPaCwBCFvWvhUObC3wFDkjz31 PYNh1mYw4epy31M4QnFZ5cTp6aH5GWIxb1ugU7B7kuRXn0lOuW9hB3tH5etMukTnSxrJ bCdQv2mE2jskcrgp3fjv1VSDdP6rRcR7q0z0e4MvoZ4Gtnp6D1i261M2LCiIbflfK2CJ 2ShwHzjfSAFeGI8wVx7/3129JQnXIevn7FABWtmgTqn5D0ZCAL93IAkMG7QpSxghbZF3 vZcjNVGhG/jPdsqqOdXqQ+911hsVIVw7i5nfFNqOlPhVOfKiPHfUWEc95ktGrcKf+5nk b82w== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=4SLdPUNGeQCu/ykTMF6OQ4JaVTXIYMYehqtnDN6QzEc=; b=DFwGM1kZDvCJyoCYrjc8qzIc5cq0Ets3NhaBiOI0AGDKp5d7vbWSykciARNevxu3Pg is+1ujw80yYbJ1abVBSvwI7Sqm1yTz5bIJg/UAhI3q3K4Ie3crE3b28P6bRB4M/N+oeK XiTvdmSESFSle7U8RjVuQtlc+R4CaPKcn02geUPuS3siUTSJKjwJOUzOjAqEg8RD6t3/ 5sLgJRERAisIQJoG92vz19/CFYjFOqXsisYGrvEB558BCOU5SgZhQNj09Sr63RmjWPAj 06zLVG10ooaxlx8MXgjIJy6kNcwDOVtRVfx52dPcDNzXshWOt6fdvhxtwB1+35Gzsl1y LUOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id e26si3778361qkj.323.2017.10.23.04.36.36; Mon, 23 Oct 2017 04:36:36 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4634862942; Mon, 23 Oct 2017 11:36:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 911BD622DE; Mon, 23 Oct 2017 11:14:09 +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 DC26B622DD; Mon, 23 Oct 2017 11:13:02 +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.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.linaro.org (Postfix) with ESMTPS id 53B8B61D48 for ; Mon, 23 Oct 2017 11:11:22 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id k40so19658399lfi.4 for ; Mon, 23 Oct 2017 04:11:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4SLdPUNGeQCu/ykTMF6OQ4JaVTXIYMYehqtnDN6QzEc=; b=FXnNwVIXx1JtObgk/c41R9UfJvgMaXX54qZf2yjvdfggfRb0BL01FJR/SZuT61YoEu x62y3+znNy8DYuxp1L/Y3L3xRhAWQxm9nhP8iyzc4b4fpLt7DU+uqM/LJgDUpxXHiD3u nEnbYu8Zfi/r35v0Vu6gveZPkLn8HvGSQcRh8xzQ11Y0YKAV3/60UQGL7IftniJaIsOo zyGo+rwaOMdYwciCxpGwzrDqgoChdyl8Eg2dKE+3DfWzwdJHE6MeXivhH+KSBedsx6wX 2FZRfM+VP6e4aVEF4PDb069nAyMOEhoHGKXsFfOLFjlBqW/JfJza7pkKQL6lekS4bmhI yTVw== X-Gm-Message-State: AMCzsaV0Eiled9hYcTbN/MfXSNP8xWep1vyF5eCFxGPAYI6TzNUTw2HF 9Fko0hqmfsPMFxXd7LKERf0XX45C0G29zg== X-Google-Smtp-Source: ABhQp+QrYUIrvLkwmzyil8bThzplMBFokRnBlqwdLR7Ta4X+GILo3oArcQRght7YCuk2yQe7VYEd/g== X-Received: by 10.46.29.65 with SMTP id d62mr5297388ljd.139.1508757080975; Mon, 23 Oct 2017 04:11:20 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:20 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:42 +0300 Message-Id: <20171023111057.6328-15-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 14/29] api: schedule: remove duplication between schedule and schedule_types 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" Move the rest of ODP_SCHED_GROUP_* defines to schedule_types.h to remove duplication between headers. Signed-off-by: Dmitry Eremin-Solenikov --- include/odp/api/abi-default/schedule.h | 8 -------- include/odp/api/abi-default/schedule_types.h | 8 ++++++++ include/odp/api/spec/schedule.h | 20 -------------------- include/odp/api/spec/schedule_types.h | 10 ++++++++++ 4 files changed, 18 insertions(+), 28 deletions(-) -- 2.14.2 diff --git a/include/odp/api/abi-default/schedule.h b/include/odp/api/abi-default/schedule.h index 9615cb012653..95f23c8134f4 100644 --- a/include/odp/api/abi-default/schedule.h +++ b/include/odp/api/abi-default/schedule.h @@ -27,14 +27,6 @@ extern "C" { #define ODP_SCHED_WAIT UINT64_MAX #define ODP_SCHED_NO_WAIT 0 -typedef int odp_schedule_group_t; - -/* These must be kept in sync with thread_globals_t in odp_thread.c */ -#define ODP_SCHED_GROUP_INVALID ((odp_schedule_group_t)-1) -#define ODP_SCHED_GROUP_ALL 0 -#define ODP_SCHED_GROUP_WORKER 1 -#define ODP_SCHED_GROUP_CONTROL 2 - #define ODP_SCHED_GROUP_NAME_LEN 32 /** diff --git a/include/odp/api/abi-default/schedule_types.h b/include/odp/api/abi-default/schedule_types.h index 21ad4db7617b..badc4ca09eb7 100644 --- a/include/odp/api/abi-default/schedule_types.h +++ b/include/odp/api/abi-default/schedule_types.h @@ -38,6 +38,14 @@ typedef int odp_schedule_sync_t; #define ODP_SCHED_SYNC_ATOMIC 1 #define ODP_SCHED_SYNC_ORDERED 2 +typedef int odp_schedule_group_t; + +/* These must be kept in sync with thread_globals_t in odp_thread.c */ +#define ODP_SCHED_GROUP_INVALID ((odp_schedule_group_t)-1) +#define ODP_SCHED_GROUP_ALL 0 +#define ODP_SCHED_GROUP_WORKER 1 +#define ODP_SCHED_GROUP_CONTROL 2 + /** * @} */ diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index 524449647b0c..8c55b4ec2ba5 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -45,26 +45,6 @@ extern "C" { * Maximum schedule group name length in chars including null char */ -/** - * @def ODP_SCHED_GROUP_INVALID - * Invalid scheduler group - */ - -/** - * @def ODP_SCHED_GROUP_ALL - * Predefined scheduler group of all threads - */ - -/** - * @def ODP_SCHED_GROUP_WORKER - * Predefined scheduler group of all worker threads - */ - -/** - * @def ODP_SCHED_GROUP_CONTROL - * Predefined scheduler group of all control threads - */ - /** * Schedule wait time * diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h index e0dc4027b91b..a13cc4f13317 100644 --- a/include/odp/api/spec/schedule_types.h +++ b/include/odp/api/spec/schedule_types.h @@ -112,6 +112,11 @@ extern "C" { * Scheduler thread group */ +/** + * @def ODP_SCHED_GROUP_INVALID + * Invalid scheduler group + */ + /** * @def ODP_SCHED_GROUP_ALL * Group of all threads. All active worker and control threads belong to this @@ -126,6 +131,11 @@ extern "C" { * old threads exit ODP. */ +/** + * @def ODP_SCHED_GROUP_CONTROL + * Predefined scheduler group of all control threads + */ + /** Scheduler parameters */ typedef struct odp_schedule_param_t { /** Priority level From patchwork Mon Oct 23 11:10:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116716 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4544256qgn; Mon, 23 Oct 2017 04:41:50 -0700 (PDT) X-Received: by 10.55.19.228 with SMTP id 97mr17367299qkt.271.1508758910062; Mon, 23 Oct 2017 04:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508758910; cv=none; d=google.com; s=arc-20160816; b=KAYWKCQvpg8HhxI8fVsuh0Auzm/cfdFgt62XDMrifp8KzvtCH99pY8fmGxl6iVetpf qWVwo5tKOMiEQwAt+S3XOXz+4BfUd89f9HssZ6wKOB2nlyUraIcJl2i24M4WIIFb9s69 m69gMmoux2cyRUWKdfiXqgVNlg9WcipsyIp+pH/bpOIofqDx6eW0rjCLbQxZtTfPhutv fM1gOmDD/fjYFSjn4ZFupOe08UZ2yP7m1qbAAIdq2L6Twl9akY5YNsZi1MKwDfCxKSbi UmxjxiEdK0auFHzk6NgS31cIfq4d2wRvaU03I6feBDV1idlR7DstVJXLy9bFEtoGiYWp JnGg== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=71VpIYO+kLBHdtOFK/qtX1fkOBw/2IqxrfXXt6fGtps=; b=VJE2kKhSVZ7Bjo+VUn23mnQo9Xmm0OeP/MsbVqgPAGkoug+II+ZGzm5IPNjxf1tI9J VcxgG7+q+aUOJOyVqtNMGY9VItZUBf0zxFwme1Q755YbtEVblyC1POsuYftDEUX6TAE9 9ecj7netN5NekGM2SUNxHT7iAFzIphewJKX4FZAI7GWoVjXLuZfK1hUZSuwrzqrJ+u+n SzcotrjwFS9UHKwoEKbiexygkO5mOyS/12CdfSjJ6z/LpjC0a+eQO3t8OwR9Q9G7vdcs ACY9LCc7wPpkXNwOb/HJBR163ONpOPmulTtv3/Lvt2SlNGpyeDCdG44hZVUpj4UybYYz PrNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id p25si3565541qte.430.2017.10.23.04.41.49; Mon, 23 Oct 2017 04:41:49 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 7BFF762940; Mon, 23 Oct 2017 11:41:49 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 973906289E; Mon, 23 Oct 2017 11:14:49 +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 6C0AE622D8; Mon, 23 Oct 2017 11:13:20 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.linaro.org (Postfix) with ESMTPS id 1F20F61DF6 for ; Mon, 23 Oct 2017 11:11:25 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id k40so19658559lfi.4 for ; Mon, 23 Oct 2017 04:11:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=71VpIYO+kLBHdtOFK/qtX1fkOBw/2IqxrfXXt6fGtps=; b=M1Acd1DIo8DbGcJbGX5L5RTE4aqzCJ/SDp8VVL/ygIRQGQft8UVBfOhaVG0U+/AJKK tmse83p/cZOilfhlltHj+U6LDut48yGyPBG4xGtCjsxroEiwNEIHR668jvrc+KVg3fpL Km3IGpdBqDcLpKWhsnjkgPX81+wFsKyHtdI3WZPDXCPU71V+YVsJLV//99Bw9M4kHBtl EJF1jZWGv21ygS1ZMA6CkGKE+cIpDpze0eTllNFHllcuKkvikoEC9jesGCt2la/oAZZ8 BRjb+32Db9Wrucfe0I4MgYd0MzCmA3kurzLVAYV2joIpjzATZiHDNBpqO8tOD0RTZwly LRBQ== X-Gm-Message-State: AMCzsaUa5c6R0/wSsz8GmWhW0kEHATijWPkiUudDkheouEeKxUfSIgkz zrMFq0EB7UyPQy7XoifcUx2kT0JdK19yJA== X-Google-Smtp-Source: ABhQp+RZIZol41bQR9vJ+d2rmCGmPojlZafQEabCb+ELIx1uhq6LzDeDC/Ju2IpLeNTYlAFQTmLNWw== X-Received: by 10.46.56.14 with SMTP id f14mr5803012lja.46.1508757082913; Mon, 23 Oct 2017 04:11:22 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:21 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:43 +0300 Message-Id: <20171023111057.6328-16-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 15/29] linux-gen, include: for several simple headers switch to api+abi pattern 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" Start simplifying platform headers by using same include paths for ABI-compat and non-ABI-compat modes. In either case there will be header (provided either by generic includes, or by platform itself). In case of non-ABI-compat mode, this header provides runtime-optimized versions of some functions, etc. Signed-off-by: Dmitry Eremin-Solenikov --- Makefile.inc | 3 + include/Makefile.am | 17 ++ .../include => include}/odp/api/cpumask.h | 6 +- .../include => include}/odp/api/init.h | 14 +- .../include => include}/odp/api/rwlock.h | 6 +- .../include => include}/odp/api/rwlock_recursive.h | 6 +- .../include => include}/odp/api/schedule.h | 15 +- .../include => include}/odp/api/schedule_types.h | 6 +- .../include => include}/odp/api/spinlock.h | 6 +- .../odp/api/spinlock_recursive.h | 6 +- .../include => include}/odp/api/std_types.h | 19 +-- .../include => include}/odp/api/thread.h | 6 +- .../include => include}/odp/api/thrmask.h | 14 +- .../include => include}/odp/api/time.h | 8 +- .../include => include}/odp/api/traffic_mngr.h | 13 +- .../include => include}/odp/api/version.h | 7 +- platform/linux-generic/Makefile.am | 51 +++--- .../odp/api/abi/barrier.h} | 4 +- .../include-abi/odp/api/abi/cpumask.h | 7 + .../linux-generic/include-abi/odp/api/abi/init.h | 7 + .../linux-generic/include-abi/odp/api/abi/rwlock.h | 7 + .../include-abi/odp/api/abi/rwlock_recursive.h | 7 + .../include-abi/odp/api/abi/schedule.h | 7 + .../include-abi/odp/api/abi/schedule_types.h | 7 + .../include-abi/odp/api/abi/spinlock.h | 7 + .../include-abi/odp/api/abi/spinlock_recursive.h | 7 + .../include-abi/odp/api/abi/std_types.h | 7 + .../linux-generic/include-abi/odp/api/abi/thread.h | 7 + .../include-abi/odp/api/abi/thrmask.h | 7 + .../linux-generic/include-abi/odp/api/abi/time.h | 7 + .../include-abi/odp/api/abi/traffic_mngr.h | 7 + .../include-abi/odp/api/abi/version.h | 7 + platform/linux-generic/include/odp/api/barrier.h | 2 +- .../include/odp/api/plat/cpumask_types.h | 54 ------ .../include/odp/api/plat/init_types.h | 35 ---- .../include/odp/api/plat/rwlock_recursive_types.h | 38 ----- .../include/odp/api/plat/rwlock_types.h | 37 ----- .../include/odp/api/plat/schedule_types.h | 64 ------- .../odp/api/plat/spinlock_recursive_types.h | 36 ---- .../include/odp/api/plat/spinlock_types.h | 34 ---- .../include/odp/api/plat/thread_types.h | 34 ---- .../include/odp/api/plat/thrmask_types.h | 48 ------ .../include/odp/api/plat/time_types.h | 53 ------ .../include/odp/api/plat/traffic_mngr_types.h | 185 --------------------- .../include/odp/api/plat/version_types.h | 30 ---- 45 files changed, 187 insertions(+), 768 deletions(-) rename {platform/linux-generic/include => include}/odp/api/cpumask.h (74%) rename {platform/linux-generic/include => include}/odp/api/init.h (64%) rename {platform/linux-generic/include => include}/odp/api/rwlock.h (75%) rename {platform/linux-generic/include => include}/odp/api/rwlock_recursive.h (70%) rename {platform/linux-generic/include => include}/odp/api/schedule.h (63%) rename {platform/linux-generic/include => include}/odp/api/schedule_types.h (71%) rename {platform/linux-generic/include => include}/odp/api/spinlock.h (72%) rename {platform/linux-generic/include => include}/odp/api/spinlock_recursive.h (68%) rename {platform/linux-generic/include => include}/odp/api/std_types.h (54%) rename {platform/linux-generic/include => include}/odp/api/thread.h (74%) rename {platform/linux-generic/include => include}/odp/api/thrmask.h (64%) rename {platform/linux-generic/include => include}/odp/api/time.h (76%) rename {platform/linux-generic/include => include}/odp/api/traffic_mngr.h (62%) rename {platform/linux-generic/include => include}/odp/api/version.h (73%) rename platform/linux-generic/{include/odp/api/plat/barrier_types.h => include-abi/odp/api/abi/barrier.h} (89%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/cpumask.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/init.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/rwlock.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/schedule.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/schedule_types.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/spinlock.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/std_types.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/thread.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/thrmask.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/time.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/version.h delete mode 100644 platform/linux-generic/include/odp/api/plat/cpumask_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/init_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/rwlock_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/schedule_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/spinlock_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/thread_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/thrmask_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/time_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/version_types.h -- 2.14.2 diff --git a/Makefile.inc b/Makefile.inc index 11fc7c759c85..91be46bcb017 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -8,6 +8,9 @@ ODP_INCLUDES = \ if ODP_ABI_COMPAT ODP_INCLUDES += \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +else +ODP_INCLUDES += \ + -I$(top_srcdir)/platform/@with_platform@/include-abi endif HELPER_INCLUDES = \ diff --git a/include/Makefile.am b/include/Makefile.am index 9437f5f68d5a..0e39a0d8db5f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -3,6 +3,23 @@ include_HEADERS = \ odp_api.h \ odp_drv.h +odpapiincludedir= $(includedir)/odp/api/ +odpapiinclude_HEADERS = \ + odp/api/cpumask.h \ + odp/api/init.h \ + odp/api/rwlock.h \ + odp/api/rwlock_recursive.h \ + odp/api/schedule.h \ + odp/api/schedule_types.h \ + odp/api/spinlock.h \ + odp/api/spinlock_recursive.h \ + odp/api/std_types.h \ + odp/api/thread.h \ + odp/api/thrmask.h \ + odp/api/time.h \ + odp/api/traffic_mngr.h \ + odp/api/version.h + odpapispecincludedir= $(includedir)/odp/api/spec odpapispecinclude_HEADERS = \ odp/api/spec/align.h \ diff --git a/platform/linux-generic/include/odp/api/cpumask.h b/include/odp/api/cpumask.h similarity index 74% rename from platform/linux-generic/include/odp/api/cpumask.h rename to include/odp/api/cpumask.h index 325ea52edfbe..f5140df1d351 100644 --- a/platform/linux-generic/include/odp/api/cpumask.h +++ b/include/odp/api/cpumask.h @@ -10,14 +10,14 @@ * ODP CPU masks and enumeration */ -#ifndef ODP_PLAT_CPUMASK_H_ -#define ODP_PLAT_CPUMASK_H_ +#ifndef ODP_API_CPUMASK_H_ +#define ODP_API_CPUMASK_H_ #ifdef __cplusplus extern "C" { #endif -#include +#include #include diff --git a/platform/linux-generic/include/odp/api/init.h b/include/odp/api/init.h similarity index 64% rename from platform/linux-generic/include/odp/api/init.h rename to include/odp/api/init.h index 1d9f59a6f521..af3f1f740b6a 100644 --- a/platform/linux-generic/include/odp/api/init.h +++ b/include/odp/api/init.h @@ -10,22 +10,14 @@ * ODP initialization. */ -#ifndef ODP_PLAT_INIT_H_ -#define ODP_PLAT_INIT_H_ +#ifndef ODP_API_INIT_H_ +#define ODP_API_INIT_H_ #ifdef __cplusplus extern "C" { #endif -#include - -/** @ingroup odp_initialization - * @{ - */ - -/** - * @} - */ +#include #include diff --git a/platform/linux-generic/include/odp/api/rwlock.h b/include/odp/api/rwlock.h similarity index 75% rename from platform/linux-generic/include/odp/api/rwlock.h rename to include/odp/api/rwlock.h index 4a86173f51e1..1aab75965adc 100644 --- a/platform/linux-generic/include/odp/api/rwlock.h +++ b/include/odp/api/rwlock.h @@ -10,14 +10,14 @@ * ODP RW Locks */ -#ifndef ODP_PLAT_RWLOCK_H_ -#define ODP_PLAT_RWLOCK_H_ +#ifndef ODP_API_RWLOCK_H_ +#define ODP_API_RWLOCK_H_ #ifdef __cplusplus extern "C" { #endif -#include +#include #include diff --git a/platform/linux-generic/include/odp/api/rwlock_recursive.h b/include/odp/api/rwlock_recursive.h similarity index 70% rename from platform/linux-generic/include/odp/api/rwlock_recursive.h rename to include/odp/api/rwlock_recursive.h index 4a081532daed..f205f434d20b 100644 --- a/platform/linux-generic/include/odp/api/rwlock_recursive.h +++ b/include/odp/api/rwlock_recursive.h @@ -10,14 +10,14 @@ * ODP resursive read/write lock */ -#ifndef ODP_PLAT_RWLOCK_RECURSIVE_H_ -#define ODP_PLAT_RWLOCK_RECURSIVE_H_ +#ifndef ODP_API_RWLOCK_RECURSIVE_H_ +#define ODP_API_RWLOCK_RECURSIVE_H_ #ifdef __cplusplus extern "C" { #endif -#include +#include #include diff --git a/platform/linux-generic/include/odp/api/schedule.h b/include/odp/api/schedule.h similarity index 63% rename from platform/linux-generic/include/odp/api/schedule.h rename to include/odp/api/schedule.h index 00264851703b..dcdc0ff49e2e 100644 --- a/platform/linux-generic/include/odp/api/schedule.h +++ b/include/odp/api/schedule.h @@ -10,22 +10,15 @@ * ODP schedule */ -#ifndef ODP_PLAT_SCHEDULE_H_ -#define ODP_PLAT_SCHEDULE_H_ +#ifndef ODP_API_SCHEDULE_H_ +#define ODP_API_SCHEDULE_H_ #ifdef __cplusplus extern "C" { #endif -#include - -/** @ingroup odp_scheduler - * @{ - */ - -/** - * @} - */ +#include +#include #include diff --git a/platform/linux-generic/include/odp/api/schedule_types.h b/include/odp/api/schedule_types.h similarity index 71% rename from platform/linux-generic/include/odp/api/schedule_types.h rename to include/odp/api/schedule_types.h index 536007d66ad5..7c347ae464de 100644 --- a/platform/linux-generic/include/odp/api/schedule_types.h +++ b/include/odp/api/schedule_types.h @@ -10,14 +10,14 @@ * ODP schedule */ -#ifndef ODP_PLAT_SCHEDULE_TYPES_H_ -#define ODP_PLAT_SCHEDULE_TYPES_H_ +#ifndef ODP_API_SCHEDULE_TYPES_H_ +#define ODP_API_SCHEDULE_TYPES_H_ #ifdef __cplusplus extern "C" { #endif -#include +#include #include diff --git a/platform/linux-generic/include/odp/api/spinlock.h b/include/odp/api/spinlock.h similarity index 72% rename from platform/linux-generic/include/odp/api/spinlock.h rename to include/odp/api/spinlock.h index 830f4edd2316..0f41216d0259 100644 --- a/platform/linux-generic/include/odp/api/spinlock.h +++ b/include/odp/api/spinlock.h @@ -10,14 +10,14 @@ * ODP spinlock */ -#ifndef ODP_PLAT_SPINLOCK_H_ -#define ODP_PLAT_SPINLOCK_H_ +#ifndef ODP_API_SPINLOCK_H_ +#define ODP_API_SPINLOCK_H_ #ifdef __cplusplus extern "C" { #endif -#include +#include #include diff --git a/platform/linux-generic/include/odp/api/spinlock_recursive.h b/include/odp/api/spinlock_recursive.h similarity index 68% rename from platform/linux-generic/include/odp/api/spinlock_recursive.h rename to include/odp/api/spinlock_recursive.h index d97b0173ac34..23f79db223ff 100644 --- a/platform/linux-generic/include/odp/api/spinlock_recursive.h +++ b/include/odp/api/spinlock_recursive.h @@ -10,14 +10,14 @@ * ODP resursive spinlock */ -#ifndef ODP_PLAT_SPINLOCK_RECURSIVE_H_ -#define ODP_PLAT_SPINLOCK_RECURSIVE_H_ +#ifndef ODP_API_SPINLOCK_RECURSIVE_H_ +#define ODP_API_SPINLOCK_RECURSIVE_H_ #ifdef __cplusplus extern "C" { #endif -#include +#include #include diff --git a/platform/linux-generic/include/odp/api/std_types.h b/include/odp/api/std_types.h similarity index 54% rename from platform/linux-generic/include/odp/api/std_types.h rename to include/odp/api/std_types.h index b61f33f4c55b..c99cbf9796a5 100644 --- a/platform/linux-generic/include/odp/api/std_types.h +++ b/include/odp/api/std_types.h @@ -10,28 +10,15 @@ * Standard C language types and definitions for ODP. */ -#ifndef ODP_PLAT_STD_TYPES_H_ -#define ODP_PLAT_STD_TYPES_H_ +#ifndef ODP_API_STD_TYPES_H_ +#define ODP_API_STD_TYPES_H_ #ifdef __cplusplus extern "C" { #endif -/* uint64_t, uint32_t, etc */ -#include -/* true and false for odp_bool_t */ -#include - -/** @addtogroup odp_system ODP SYSTEM - * @{ - */ - -typedef int odp_bool_t; - -/** - * @} - */ +#include #include diff --git a/platform/linux-generic/include/odp/api/thread.h b/include/odp/api/thread.h similarity index 74% rename from platform/linux-generic/include/odp/api/thread.h rename to include/odp/api/thread.h index c54abc890aa1..85af314beecb 100644 --- a/platform/linux-generic/include/odp/api/thread.h +++ b/include/odp/api/thread.h @@ -10,14 +10,14 @@ * ODP thread API */ -#ifndef ODP_PLAT_THREAD_H_ -#define ODP_PLAT_THREAD_H_ +#ifndef ODP_API_THREAD_H_ +#define ODP_API_THREAD_H_ #ifdef __cplusplus extern "C" { #endif -#include +#include #include diff --git a/platform/linux-generic/include/odp/api/thrmask.h b/include/odp/api/thrmask.h similarity index 64% rename from platform/linux-generic/include/odp/api/thrmask.h rename to include/odp/api/thrmask.h index b1c2077754d5..568beb1c5872 100644 --- a/platform/linux-generic/include/odp/api/thrmask.h +++ b/include/odp/api/thrmask.h @@ -10,22 +10,14 @@ * ODP thread masks */ -#ifndef ODP_PLAT_THRMASK_H_ -#define ODP_PLAT_THRMASK_H_ +#ifndef ODP_API_THRMASK_H_ +#define ODP_API_THRMASK_H_ #ifdef __cplusplus extern "C" { #endif -#include - -/** @ingroup odp_thread - * @{ - */ - -/** - * @} - */ +#include #include diff --git a/platform/linux-generic/include/odp/api/time.h b/include/odp/api/time.h similarity index 76% rename from platform/linux-generic/include/odp/api/time.h rename to include/odp/api/time.h index 8d1c33e68f29..629677d45e45 100644 --- a/platform/linux-generic/include/odp/api/time.h +++ b/include/odp/api/time.h @@ -10,18 +10,16 @@ * ODP time */ -#ifndef ODP_PLAT_TIME_H_ -#define ODP_PLAT_TIME_H_ +#ifndef ODP_API_TIME_H_ +#define ODP_API_TIME_H_ #ifdef __cplusplus extern "C" { #endif #include +#include - - -#include #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/traffic_mngr.h b/include/odp/api/traffic_mngr.h similarity index 62% rename from platform/linux-generic/include/odp/api/traffic_mngr.h rename to include/odp/api/traffic_mngr.h index 3e6f5fbbe036..6360ccf9b4f8 100644 --- a/platform/linux-generic/include/odp/api/traffic_mngr.h +++ b/include/odp/api/traffic_mngr.h @@ -10,22 +10,15 @@ * ODP Traffic manager */ -#ifndef ODP_PLAT_TRAFFIC_MNGR_H_ -#define ODP_PLAT_TRAFFIC_MNGR_H_ +#ifndef ODP_API_TRAFFIC_MNGR_H_ +#define ODP_API_TRAFFIC_MNGR_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_traffic_mngr - * @{ - */ - -/** - * @} - */ +#include -#include #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/version.h b/include/odp/api/version.h similarity index 73% rename from platform/linux-generic/include/odp/api/version.h rename to include/odp/api/version.h index fc4ea5865590..35c844e703cb 100644 --- a/platform/linux-generic/include/odp/api/version.h +++ b/include/odp/api/version.h @@ -10,14 +10,15 @@ * ODP version */ -#ifndef ODP_PLAT_VERSION_H_ -#define ODP_PLAT_VERSION_H_ +#ifndef ODP_API_VERSION_H_ +#define ODP_API_VERSION_H_ #ifdef __cplusplus extern "C" { #endif -#include +#include + #include #ifdef __cplusplus diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 703b12c702ea..4f47b277de29 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -28,7 +28,6 @@ odpapiinclude_HEADERS = \ include/odp/api/compiler.h \ include/odp/api/chksum.h \ include/odp/api/cpu.h \ - include/odp/api/cpumask.h \ include/odp/api/crypto.h \ include/odp/api/debug.h \ include/odp/api/deprecated.h \ @@ -37,7 +36,6 @@ odpapiinclude_HEADERS = \ include/odp/api/feature.h \ include/odp/api/hash.h \ include/odp/api/hints.h \ - include/odp/api/init.h \ include/odp/api/ipsec.h \ include/odp/api/packet_flags.h \ include/odp/api/packet.h \ @@ -46,39 +44,24 @@ odpapiinclude_HEADERS = \ include/odp/api/pool.h \ include/odp/api/queue.h \ include/odp/api/random.h \ - include/odp/api/rwlock.h \ - include/odp/api/rwlock_recursive.h \ - include/odp/api/schedule.h \ - include/odp/api/schedule_types.h \ include/odp/api/shared_memory.h \ - include/odp/api/spinlock.h \ - include/odp/api/spinlock_recursive.h \ include/odp/api/std_clib.h \ - include/odp/api/std_types.h \ include/odp/api/support.h \ include/odp/api/sync.h \ include/odp/api/system_info.h \ - include/odp/api/thread.h \ - include/odp/api/thrmask.h \ include/odp/api/ticketlock.h \ - include/odp/api/time.h \ - include/odp/api/timer.h \ - include/odp/api/traffic_mngr.h \ - include/odp/api/version.h + include/odp/api/timer.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/atomic_types.h \ - include/odp/api/plat/barrier_types.h \ include/odp/api/plat/buffer_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/classification_types.h \ - include/odp/api/plat/cpumask_types.h \ include/odp/api/plat/crypto_types.h \ include/odp/api/plat/event_types.h \ - include/odp/api/plat/init_types.h \ include/odp/api/plat/ipsec_types.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ @@ -88,28 +71,38 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_io_types.h \ include/odp/api/plat/pool_types.h \ include/odp/api/plat/queue_types.h \ - include/odp/api/plat/rwlock_types.h \ - include/odp/api/plat/rwlock_recursive_types.h \ - include/odp/api/plat/schedule_types.h \ include/odp/api/plat/shared_memory_types.h \ - include/odp/api/plat/spinlock_types.h \ - include/odp/api/plat/spinlock_recursive_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ - include/odp/api/plat/thread_types.h \ - include/odp/api/plat/thrmask_types.h \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h \ include/odp/api/plat/ticketlock_types.h \ - include/odp/api/plat/time_types.h \ - include/odp/api/plat/timer_types.h \ - include/odp/api/plat/traffic_mngr_types.h \ - include/odp/api/plat/version_types.h + include/odp/api/plat/timer_types.h nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h +if !ODP_ABI_COMPAT +odpapiabiarchincludedir= $(includedir)/odp/api/abi +odpapiabiarchinclude_HEADERS = \ + include-abi/odp/api/abi/barrier.h \ + include-abi/odp/api/abi/cpumask.h \ + include-abi/odp/api/abi/init.h \ + include-abi/odp/api/abi/rwlock.h \ + include-abi/odp/api/abi/rwlock_recursive.h \ + include-abi/odp/api/abi/schedule.h \ + include-abi/odp/api/abi/schedule_types.h \ + include-abi/odp/api/abi/spinlock.h \ + include-abi/odp/api/abi/spinlock_recursive.h \ + include-abi/odp/api/abi/std_types.h \ + include-abi/odp/api/abi/thread.h \ + include-abi/odp/api/abi/thrmask.h \ + include-abi/odp/api/abi/time.h \ + include-abi/odp/api/abi/traffic_mngr.h \ + include-abi/odp/api/abi/version.h +endif + odpdrvincludedir = $(includedir)/odp/drv odpdrvinclude_HEADERS = \ include/odp/drv/align.h \ diff --git a/platform/linux-generic/include/odp/api/plat/barrier_types.h b/platform/linux-generic/include-abi/odp/api/abi/barrier.h similarity index 89% rename from platform/linux-generic/include/odp/api/plat/barrier_types.h rename to platform/linux-generic/include-abi/odp/api/abi/barrier.h index 00b383cc676c..51d913774c8e 100644 --- a/platform/linux-generic/include/odp/api/plat/barrier_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/barrier.h @@ -10,8 +10,8 @@ * ODP barrier */ -#ifndef ODP_BARRIER_TYPES_H_ -#define ODP_BARRIER_TYPES_H_ +#ifndef ODP_ABI_BARRIER_H_ +#define ODP_ABI_BARRIER_H_ #ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include-abi/odp/api/abi/cpumask.h b/platform/linux-generic/include-abi/odp/api/abi/cpumask.h new file mode 100644 index 000000000000..d991896d8eea --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/init.h b/platform/linux-generic/include-abi/odp/api/abi/init.h new file mode 100644 index 000000000000..81eafefe3070 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/rwlock.h b/platform/linux-generic/include-abi/odp/api/abi/rwlock.h new file mode 100644 index 000000000000..cba0743e74be --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h b/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h new file mode 100644 index 000000000000..841710d3c821 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/schedule.h b/platform/linux-generic/include-abi/odp/api/abi/schedule.h new file mode 100644 index 000000000000..18427744fc84 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h b/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h new file mode 100644 index 000000000000..b3ea96b5a1d1 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/spinlock.h b/platform/linux-generic/include-abi/odp/api/abi/spinlock.h new file mode 100644 index 000000000000..4894095bb08a --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h b/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h new file mode 100644 index 000000000000..a7a49bd4d1c9 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/std_types.h b/platform/linux-generic/include-abi/odp/api/abi/std_types.h new file mode 100644 index 000000000000..91130000a7f3 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/thread.h b/platform/linux-generic/include-abi/odp/api/abi/thread.h new file mode 100644 index 000000000000..dc29a7dac301 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/thrmask.h b/platform/linux-generic/include-abi/odp/api/abi/thrmask.h new file mode 100644 index 000000000000..0c1dc0ce59ad --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/time.h b/platform/linux-generic/include-abi/odp/api/abi/time.h new file mode 100644 index 000000000000..2672d7892624 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h b/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h new file mode 100644 index 000000000000..4245cbf7068b --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include-abi/odp/api/abi/version.h b/platform/linux-generic/include-abi/odp/api/abi/version.h new file mode 100644 index 000000000000..b36d53958931 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/linux-generic/include/odp/api/barrier.h b/platform/linux-generic/include/odp/api/barrier.h index ab1b7756246e..98200f87b5ea 100644 --- a/platform/linux-generic/include/odp/api/barrier.h +++ b/platform/linux-generic/include/odp/api/barrier.h @@ -20,7 +20,7 @@ extern "C" { #include #include #include -#include +#include #include diff --git a/platform/linux-generic/include/odp/api/plat/cpumask_types.h b/platform/linux-generic/include/odp/api/plat/cpumask_types.h deleted file mode 100644 index c2727a46ce10..000000000000 --- a/platform/linux-generic/include/odp/api/plat/cpumask_types.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * ODP CPU masks and enumeration - */ - -#ifndef ODP_CPUMASK_TYPES_H_ -#define ODP_CPUMASK_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odp_cpumask - * @{ - */ - -#include -#include - -#define ODP_CPUMASK_SIZE 1024 - -#define ODP_CPUMASK_STR_SIZE ((ODP_CPUMASK_SIZE + 3) / 4 + 3) - -/** - * CPU mask - * - * Don't access directly, use access functions. - */ -typedef struct odp_cpumask_t { - /** @private CPU mask storage - * - * This is private to the implementation. - * Don't access directly, use access functions. - */ - uint8_t _u8[ODP_CPUMASK_SIZE / 8]; -} odp_cpumask_t ODP_ALIGNED(8); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/init_types.h b/platform/linux-generic/include/odp/api/plat/init_types.h deleted file mode 100644 index 888b04a7020e..000000000000 --- a/platform/linux-generic/include/odp/api/plat/init_types.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP initialization. - */ - -#ifndef ODP_INIT_TYPES_H_ -#define ODP_INIT_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -typedef uint64_t odp_instance_t; - -/** - * @internal platform specific data - */ -typedef struct odp_platform_init_t { - int ipc_ns; /**< Name space for ipc shared objects. */ -} odp_platform_init_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h b/platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h deleted file mode 100644 index 36f9204ac91f..000000000000 --- a/platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP recursive read/write lock - */ - -#ifndef ODP_RWLOCK_RECURSIVE_TYPES_H_ -#define ODP_RWLOCK_RECURSIVE_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include - -/** @internal */ -struct odp_rwlock_recursive_s { - odp_rwlock_t lock; /**< the lock */ - int wr_owner; /**< write owner thread */ - uint32_t wr_cnt; /**< write recursion count */ - uint8_t rd_cnt[ODP_THREAD_COUNT_MAX]; /**< read recursion count */ -}; - -typedef struct odp_rwlock_recursive_s odp_rwlock_recursive_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/rwlock_types.h b/platform/linux-generic/include/odp/api/plat/rwlock_types.h deleted file mode 100644 index f7dc04496c35..000000000000 --- a/platform/linux-generic/include/odp/api/plat/rwlock_types.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * ODP rwlock - */ - -#ifndef ODP_RWLOCK_TYPES_H_ -#define ODP_RWLOCK_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/** @internal */ -struct odp_rwlock_s { - odp_atomic_u32_t cnt; /**< lock count - 0 lock not taken - -1 write lock taken - >0 read lock(s) taken */ -}; - -typedef struct odp_rwlock_s odp_rwlock_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/schedule_types.h b/platform/linux-generic/include/odp/api/plat/schedule_types.h deleted file mode 100644 index 4e75f9eecae7..000000000000 --- a/platform/linux-generic/include/odp/api/plat/schedule_types.h +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * ODP schedule - */ - -#ifndef ODP_SCHEDULE_TYPES_H_ -#define ODP_SCHEDULE_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/** @addtogroup odp_scheduler - * @{ - */ - -#define ODP_SCHED_WAIT UINT64_MAX -#define ODP_SCHED_NO_WAIT 0 - -typedef int odp_schedule_prio_t; - -#define ODP_SCHED_PRIO_HIGHEST 0 - -#define ODP_SCHED_PRIO_NORMAL 4 - -#define ODP_SCHED_PRIO_LOWEST 7 - -#define ODP_SCHED_PRIO_DEFAULT ODP_SCHED_PRIO_NORMAL - -typedef int odp_schedule_sync_t; - -#define ODP_SCHED_SYNC_PARALLEL 0 -#define ODP_SCHED_SYNC_ATOMIC 1 -#define ODP_SCHED_SYNC_ORDERED 2 - -typedef int odp_schedule_group_t; - -/* These must be kept in sync with thread_globals_t in odp_thread.c */ -#define ODP_SCHED_GROUP_INVALID ((odp_schedule_group_t)-1) -#define ODP_SCHED_GROUP_ALL 0 -#define ODP_SCHED_GROUP_WORKER 1 -#define ODP_SCHED_GROUP_CONTROL 2 - -#define ODP_SCHED_GROUP_NAME_LEN 32 - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h b/platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h deleted file mode 100644 index c5a1adff935e..000000000000 --- a/platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP recursive spinlock - */ - -#ifndef ODP_SPINLOCK_RECURSIVE_TYPES_H_ -#define ODP_SPINLOCK_RECURSIVE_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -/** @internal */ -struct odp_spinlock_recursive_s { - odp_spinlock_t lock; /**< the lock */ - int owner; /**< thread owning the lock */ - uint32_t cnt; /**< recursion count */ -}; - -typedef struct odp_spinlock_recursive_s odp_spinlock_recursive_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/spinlock_types.h b/platform/linux-generic/include/odp/api/plat/spinlock_types.h deleted file mode 100644 index f38ece6afd48..000000000000 --- a/platform/linux-generic/include/odp/api/plat/spinlock_types.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * ODP spinlock - */ - -#ifndef ODP_SPINLOCK_TYPES_H_ -#define ODP_SPINLOCK_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/** @internal */ -struct odp_spinlock_s { - char lock; /**< lock flag, should match odp_atomic_flag_t */ -}; - -typedef struct odp_spinlock_s odp_spinlock_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/thread_types.h b/platform/linux-generic/include/odp/api/plat/thread_types.h deleted file mode 100644 index 33af459831c1..000000000000 --- a/platform/linux-generic/include/odp/api/plat/thread_types.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP thread - */ - -#ifndef ODP_THREAD_TYPES_H_ -#define ODP_THREAD_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odp_thread - * @{ - */ - -#define ODP_THREAD_COUNT_MAX 128 - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/thrmask_types.h b/platform/linux-generic/include/odp/api/plat/thrmask_types.h deleted file mode 100644 index 5d93890c1b3c..000000000000 --- a/platform/linux-generic/include/odp/api/plat/thrmask_types.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP thread masks - */ - -#ifndef ODP_THRMASK_TYPES_H_ -#define ODP_THRMASK_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odp_thread - * @{ - */ - -#include - -/** - * Minimum size of output buffer for odp_thrmask_to_str() - */ -#define ODP_THRMASK_STR_SIZE ODP_CPUMASK_STR_SIZE - -/** - * Thread mask - * - * Don't access directly, use access functions. - */ -typedef struct odp_thrmask_t { - odp_cpumask_t m; /**< @private Mask*/ -} odp_thrmask_t; - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/time_types.h b/platform/linux-generic/include/odp/api/plat/time_types.h deleted file mode 100644 index e7111c8c51f7..000000000000 --- a/platform/linux-generic/include/odp/api/plat/time_types.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP time service - */ - -#ifndef ODP_TIME_TYPES_H_ -#define ODP_TIME_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odp_time - * @{ - **/ - -/** - * @internal Time structure used for both POSIX timespec and HW counter - * implementations. - */ -typedef struct odp_time_t { - /** @internal Variant mappings for time type */ - union { - /** @internal Used with generic 64 bit operations */ - uint64_t u64; - - /** @internal Nanoseconds */ - uint64_t nsec; - - /** @internal HW timer counter value */ - uint64_t count; - - }; -} odp_time_t; - -#define ODP_TIME_NULL ((odp_time_t){.u64 = 0}) - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h deleted file mode 100644 index be3926d460a8..000000000000 --- a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h +++ /dev/null @@ -1,185 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP traffic mngr - */ - -#ifndef ODP_TRAFFIC_MNGR_TYPES_H_ -#define ODP_TRAFFIC_MNGR_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -/** @addtogroup odp_traffic_mngr - * Macros and operations on a TM system. - * @{ - */ - -/** The ODP_TM_MAX_NUM_SYSTEMS constant specifies the maximum number of TM - * systems that may be created. On some platforms this might be much more - * limited to as little as one hardware TM system. - */ -#define ODP_TM_MAX_NUM_SYSTEMS 64 - -/** The ODP_TM_MAX_PRIORITIES constant specifies the largest range of - * priorities that any TM system can support. All strict priority values MUST - * in the range 0..ODP_TM_MAX_PRIORITIES-1. - */ -#define ODP_TM_MAX_PRIORITIES 16 - -/** The ODP_TM MAX_LEVELS constant specifies the largest range of - * tm_node levels that any TM system can support. Hence all tm_node level - * values MUST be in the range 0..ODP_TM_MAX_LEVELS-1. Smaller tm_node - * levels are associated with tm_nodes closer to the TM system egress. - */ -#define ODP_TM_MAX_LEVELS 8 - -/** - * The smallest SCHED weight is 1 (i.e. 0 is not a legal WFQ/WRR value). - */ -#define ODP_TM_MIN_SCHED_WEIGHT 1 - -/** The ODP_TM_MAX_SCHED_WEIGHT constant is the largest weight any TM system - * can support (at least from a configuration standpoint). A given TM system - * could have a smaller value. - */ -#define ODP_TM_MAX_SCHED_WEIGHT 255 - -/** The ODP_TM_MAX_TM_QUEUES constant is the largest number of tm_queues - * that can be handled by any one TM system. - */ -#define ODP_TM_MAX_TM_QUEUES (16 * 1024 * 1024) - -/** The ODP_TM_MAX_NUM_OUTPUTS constant is the largest number of outputs that - * can be configured for any one TM system. - */ -#define ODP_TM_MAX_NUM_OUTPUTS 256 - -/** The ODP_TM_MAX_NUM_TM_NODES constant is the largest number of tm_nodes that - * can be in existence for any one TM system. - */ -#define ODP_TM_MAX_NUM_TM_NODES (1024 * 1024) - -/** The ODP_TM_MAX_TM_NODE_FANIN constant is the largest number of fan-in - * "inputs" that can be simultaneously connected to a single tm_node. - * *TBD* Does this need to be as large as ODP_TM_MAX_TM_QUEUES? *TBD* - */ -#define ODP_TM_MAX_TM_NODE_FANIN (1024 * 1024) - -/** The ODP_TM_MIN_SHAPER_BW constant is the smallest amount of bandwidth that - * can a shaper's peak or commit rate can be set to. It is in units of - * 1000 bytes/second so that it and the ODP_TM_MAX_SHAPER_BW can both fit in - * 32 bits. - */ -#define ODP_TM_MIN_SHAPER_BW 1 - -/** The ODP_TM_MAX_SHAPER_BW constant is the largest amound of bandwidth that - * any shaper's peak or commit rate can be set to. It is in units of - * 1000 bytes/second so that it and the ODP_TM_MIN_SHAPER_BW can both fit in - * 32 bits. - */ -#define ODP_TM_MAX_SHAPER_BW 12500000 - -/** The ODP_NUM_SHAPER_COLORS constant just counts the number of enumeration - * values defined in the odp_tm_shaper_color_t type. - */ -#define ODP_NUM_SHAPER_COLORS 3 - -/** The INVALID_PRIORITY constant is used when one needs to indicate an - * invalid priority value. - */ -#define ODP_TM_INVALID_PRIORITY 255 - -/** The odp_tm_percent_t type is used when specifying fields that are - * percentages. It is a fixed point integer whose units are 1/100 of a - * percent. Hence 100% is represented as the integer value 10000. Note - * that because it is often used as a ratio of the current queue value and - * maximum queue threshold, it can be > 100%, but in any event will never - * be larger than 500% (i.e. it MUST be capped at 50000). - */ -typedef uint16_t odp_tm_percent_t; - -/** The odp_tm_handle_t type is a generic type that can stand for any of the - * other ODP_TM handle types. - */ -typedef uint64_t odp_tm_handle_t; - -/** Each odp_tm_t value represents a specific TM system. Almost all - * functions in this API require a odp_tm_t value - either directly - * as a function parameter or indirectly by having another ODP TM handle value - * as a function parameter. - */ -typedef odp_tm_handle_t odp_tm_t; - -/** Each odp_tm_queue_t value is an opaque ODP handle representing a specific - * tm_queue within a specific TM system. - */ -typedef odp_tm_handle_t odp_tm_queue_t; - -/** Each odp_tm_node_t value is an opaque ODP handle representing a specific - * tm_node within a specific TM system. - */ -typedef odp_tm_handle_t odp_tm_node_t; - -/** Each odp_tm_shaper_t value is an opaque ODP handle representing a specific - * shaper profile usable across all TM systems described by this API. A given - * shaper profile can then be attached to any tm_queue or tm_node. - */ -typedef odp_tm_handle_t odp_tm_shaper_t; - -/** Each odp_tm_sched_t value is an opaque ODP handle representing a specific - * tm_node scheduler profile usable across all TM systems described by this - * API. A given tm_node scheduler profile can then be attached to any tm_node. - */ -typedef odp_tm_handle_t odp_tm_sched_t; - -/** Each odp_tm_threshold_t value is an opaque ODP handle representing a - * specific queue threshold profile usable across all TM systems described by - * this API. A given queue threshold profile can then be attached to any - * tm_queue or tm_node. - */ -typedef odp_tm_handle_t odp_tm_threshold_t; - -/** Each odp_tm_wred_t value is an opaque ODP handle representing a specific - * WRED profile usable across all TM systems described by this API. A given - * WRED profile can then be attached to any tm_queue or tm_node. - */ -typedef odp_tm_handle_t odp_tm_wred_t; - -/** The ODP_TM_INVALID constant can be used with any ODP TM handle type and - * indicates that this value does NOT represent a valid TM object. - */ -#define ODP_TM_INVALID 0 - -/** - * @def ODP_TM_ROOT - * Constant that is used to refer to the egress/root node of the TM subsystem's - * tree/hierarchy of nodes. - */ -#define ODP_TM_ROOT ((odp_tm_handle_t)-1) - -/** @internal Get printable format of odp_tm_handle_t @param hdl @return */ -static inline uint64_t odp_tm_handle_to_u64(odp_tm_handle_t hdl) -{ - return hdl; -} - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/version_types.h b/platform/linux-generic/include/odp/api/plat/version_types.h deleted file mode 100644 index e3327eb338e6..000000000000 --- a/platform/linux-generic/include/odp/api/plat/version_types.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_VERSION_TYPESH_ -#define ODP_VERSION_TYPESH_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @internal Version string expand */ -#define ODP_VERSION_STR_EXPAND(x) #x - -/** @internal Version to string */ -#define ODP_VERSION_TO_STR(x) ODP_VERSION_STR_EXPAND(x) - -/** @internal API version string */ -#define ODP_VERSION_API_STR \ -ODP_VERSION_TO_STR(ODP_VERSION_API_GENERATION) "." \ -ODP_VERSION_TO_STR(ODP_VERSION_API_MAJOR) "." \ -ODP_VERSION_TO_STR(ODP_VERSION_API_MINOR) - -#ifdef __cplusplus -} -#endif - -#endif From patchwork Mon Oct 23 11:10:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116715 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4542484qgn; Mon, 23 Oct 2017 04:39:41 -0700 (PDT) X-Received: by 10.36.233.196 with SMTP id f187mr8398290ith.14.1508758781021; Mon, 23 Oct 2017 04:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508758781; cv=none; d=google.com; s=arc-20160816; b=ddz7vlR7yv6eV4G4/E6BKNBoQlhkCWiMfriKTXQC7jr/rTx8dzSmRzlzhUBZhy89VW rZYgoaU+cs3G1h8J26KWrha7ngfsL2LpqazYED9M4bX6mXOn+gRF/yodsIEMNtFLfXUO XJFgv5PLwRDmLcqIRD1Y1AJFg5vnHcHMpqhJ91MHHyMh2FwBnLDocaiqH0jxwWxbdy/m yzGdxjZ3Wi9q2KruVRbq/VXopQBsVf6yUnVUr695dzsKmS2Wt3sADJ1BPidvtMeuw2VF THFO/XYEXDlrRf+3GFJdEzWE8h2WjxAls3WVCpK3cH5/hkGwSxz0HFUHaqC2uoX1lOHn KMTg== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=7fndndn13tI05pyXQmEydTUCWZM4VoaqyE8wlkya07s=; b=xwEAALIhzuEofwsGM055uDNCH7+QegybADRZ1UDMcycO78Sl0BdAlp1dKMycGDZINR yIU7D0JmvoG6gNB7p7BAXIFR4V/RujK412+/Rb26KOJ8AmR4EYMWRstd9e5Jbx1qG4Bk QnOBPgBzdALu/zBFCOE6vMYjlwAoqQ6w660x7+dlShaPaLfjWR2Kb1ikAQAx5oK3Kgs8 /besIK2HewEDO0WKJ2mA/xY1eofl5Br72zDqWC+m9busoZAMpP8/Zhd90ZwLijIksuux 6F+USjWyvwqwzq7lE9lf9ukW1xxS30Db1e2e87Fh5ERWnofKFxyGOblh4JLpBQGcm3mu Qp0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id u11si5459505iod.27.2017.10.23.04.39.40; Mon, 23 Oct 2017 04:39:41 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8F418622E8; Mon, 23 Oct 2017 11:39:40 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 3E0346286B; Mon, 23 Oct 2017 11:14:28 +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 9C72A622D9; Mon, 23 Oct 2017 11:13:15 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id 5207361E03 for ; Mon, 23 Oct 2017 11:11:26 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id l23so19662281lfk.10 for ; Mon, 23 Oct 2017 04:11:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=7fndndn13tI05pyXQmEydTUCWZM4VoaqyE8wlkya07s=; b=YvoLsUmkyFNO3hkMHfMQV88QS6aeGv/cIrC1cMyKR4XJjuBsmLRwdJn4EuBJFsvFHA XILBcliqgpNc+6SbZqcHn8sIr2DfzXY2r1quv4TYjL9BdWJRGb1XGwl79ZnudrOQ27dP Gqtrsg2TWYpMbkm0tIMPI/C6JhgjgDIxEtRthpInJzTGdOmJxVSYI+Ll82LvDXxmlDW4 uiF3qSNpOE0732pDG/MjMKxGjbdAU8TyVAhblmhwjK4ANT5XsFZQKW+uPk1hhZ4WW7gE 5LLy1XpDDaUfIIv3NiGfLbHkcKathstOJX6XgikZXeSAGq7YUjCghwstL70cp4SK7HT9 VPiQ== X-Gm-Message-State: AMCzsaVn2gR++nInJv2dWt4uLm91e0L7vwH+YasYoToKwCvqcE3RNoAu G2i0E8iGXsMG5e34F9MWYvvI3qq9UwRaDg== X-Google-Smtp-Source: ABhQp+Q1g9ITd3bJwt84CWqdYqXcEp+Kds8R7njV89Q2gpFOhInXK13DKuTzxR2LzEZZuGtKfBH9fA== X-Received: by 10.25.228.197 with SMTP id x66mr939748lfi.231.1508757084196; Mon, 23 Oct 2017 04:11:24 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:23 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:44 +0300 Message-Id: <20171023111057.6328-17-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 16/29] linux-gen, include: progress in switching headers to api+abi pattern 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" Rework more platform headers to use odp/api/abi/ subdir instead of odp/api/plat/. Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 8 +++++ .../include => include}/odp/api/barrier.h | 6 ++-- .../include => include}/odp/api/buffer.h | 18 ++++-------- .../include => include}/odp/api/event.h | 14 ++------- .../include => include}/odp/api/ipsec.h | 14 ++------- .../include => include}/odp/api/pool.h | 17 ++++------- .../include => include}/odp/api/queue.h | 12 ++++---- .../include => include}/odp/api/shared_memory.h | 14 ++------- .../include => include}/odp/api/timer.h | 20 ++++--------- platform/linux-generic/Makefile.am | 34 +++++++++------------- .../odp/api/abi/buffer.h} | 11 ++----- .../odp/api/abi/classification.h} | 11 ++----- .../odp/api/abi/crypto.h} | 11 ++----- .../odp/api/abi/event.h} | 12 ++------ .../odp/api/abi/ipsec.h} | 4 +-- .../odp/api/abi/packet_io.h} | 10 ++----- .../odp/api/abi/pool.h} | 13 ++------- .../odp/api/abi/queue.h} | 11 ++----- .../odp/api/abi/shared_memory.h} | 11 ++----- .../odp/api/abi/timer.h} | 4 +-- .../linux-generic/include/odp/api/classification.h | 12 ++++---- platform/linux-generic/include/odp/api/crypto.h | 10 +++---- platform/linux-generic/include/odp/api/packet.h | 8 ++--- platform/linux-generic/include/odp/api/packet_io.h | 8 ++--- .../include/odp/api/plat/packet_inlines.h | 1 + .../include/odp/api/plat/strong_types.h | 2 ++ .../linux-generic/include/odp_queue_internal.h | 1 + .../include/odp_queue_scalable_internal.h | 1 + platform/linux-generic/odp_packet_io.c | 6 ++++ 29 files changed, 106 insertions(+), 198 deletions(-) rename {platform/linux-generic/include => include}/odp/api/barrier.h (78%) rename {platform/linux-generic/include => include}/odp/api/buffer.h (58%) rename {platform/linux-generic/include => include}/odp/api/event.h (65%) rename {platform/linux-generic/include => include}/odp/api/ipsec.h (67%) rename {platform/linux-generic/include => include}/odp/api/pool.h (53%) rename {platform/linux-generic/include => include}/odp/api/queue.h (58%) rename {platform/linux-generic/include => include}/odp/api/shared_memory.h (62%) rename {platform/linux-generic/include => include}/odp/api/timer.h (54%) rename platform/linux-generic/{include/odp/api/plat/buffer_types.h => include-abi/odp/api/abi/buffer.h} (73%) rename platform/linux-generic/{include/odp/api/plat/classification_types.h => include-abi/odp/api/abi/classification.h} (74%) rename platform/linux-generic/{include/odp/api/plat/crypto_types.h => include-abi/odp/api/abi/crypto.h} (71%) rename platform/linux-generic/{include/odp/api/plat/event_types.h => include-abi/odp/api/abi/event.h} (80%) rename platform/linux-generic/{include/odp/api/plat/ipsec_types.h => include-abi/odp/api/abi/ipsec.h} (88%) rename platform/linux-generic/{include/odp/api/plat/packet_io_types.h => include-abi/odp/api/abi/packet_io.h} (83%) rename platform/linux-generic/{include/odp/api/plat/pool_types.h => include-abi/odp/api/abi/pool.h} (76%) rename platform/linux-generic/{include/odp/api/plat/queue_types.h => include-abi/odp/api/abi/queue.h} (74%) rename platform/linux-generic/{include/odp/api/plat/shared_memory_types.h => include-abi/odp/api/abi/shared_memory.h} (73%) rename platform/linux-generic/{include/odp/api/plat/timer_types.h => include-abi/odp/api/abi/timer.h} (92%) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 0e39a0d8db5f..946b7c07cf73 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -5,18 +5,26 @@ include_HEADERS = \ odpapiincludedir= $(includedir)/odp/api/ odpapiinclude_HEADERS = \ + odp/api/barrier.h \ + odp/api/buffer.h \ odp/api/cpumask.h \ + odp/api/event.h \ odp/api/init.h \ + odp/api/ipsec.h \ + odp/api/pool.h \ + odp/api/queue.h \ odp/api/rwlock.h \ odp/api/rwlock_recursive.h \ odp/api/schedule.h \ odp/api/schedule_types.h \ + odp/api/shared_memory.h \ odp/api/spinlock.h \ odp/api/spinlock_recursive.h \ odp/api/std_types.h \ odp/api/thread.h \ odp/api/thrmask.h \ odp/api/time.h \ + odp/api/timer.h \ odp/api/traffic_mngr.h \ odp/api/version.h diff --git a/platform/linux-generic/include/odp/api/barrier.h b/include/odp/api/barrier.h similarity index 78% rename from platform/linux-generic/include/odp/api/barrier.h rename to include/odp/api/barrier.h index 98200f87b5ea..7101b4c64948 100644 --- a/platform/linux-generic/include/odp/api/barrier.h +++ b/include/odp/api/barrier.h @@ -10,8 +10,8 @@ * ODP execution barriers */ -#ifndef ODP_PLAT_BARRIER_H_ -#define ODP_PLAT_BARRIER_H_ +#ifndef ODP_API_BARRIER_H_ +#define ODP_API_BARRIER_H_ #ifdef __cplusplus extern "C" { @@ -19,7 +19,7 @@ extern "C" { #include #include -#include +#include #include #include diff --git a/platform/linux-generic/include/odp/api/buffer.h b/include/odp/api/buffer.h similarity index 58% rename from platform/linux-generic/include/odp/api/buffer.h rename to include/odp/api/buffer.h index 81dbf1280049..15734ca7102f 100644 --- a/platform/linux-generic/include/odp/api/buffer.h +++ b/include/odp/api/buffer.h @@ -10,25 +10,17 @@ * ODP buffer descriptor */ -#ifndef ODP_PLAT_BUFFER_H_ -#define ODP_PLAT_BUFFER_H_ +#ifndef ODP_API_BUFFER_H_ +#define ODP_API_BUFFER_H_ #ifdef __cplusplus extern "C" { #endif #include -#include -#include -#include - -/** @ingroup odp_buffer - * @{ - */ - -/** - * @} - */ +#include +#include +#include #include diff --git a/platform/linux-generic/include/odp/api/event.h b/include/odp/api/event.h similarity index 65% rename from platform/linux-generic/include/odp/api/event.h rename to include/odp/api/event.h index 55931b625a52..71c64eb9b93e 100644 --- a/platform/linux-generic/include/odp/api/event.h +++ b/include/odp/api/event.h @@ -10,22 +10,14 @@ * ODP event */ -#ifndef ODP_PLAT_EVENT_H_ -#define ODP_PLAT_EVENT_H_ +#ifndef ODP_API_EVENT_H_ +#define ODP_API_EVENT_H_ #ifdef __cplusplus extern "C" { #endif -#include - -/** @ingroup odp_event - * @{ - */ - -/** - * @} - */ +#include #include diff --git a/platform/linux-generic/include/odp/api/ipsec.h b/include/odp/api/ipsec.h similarity index 67% rename from platform/linux-generic/include/odp/api/ipsec.h rename to include/odp/api/ipsec.h index 44c5d02553f0..cb39750e5d80 100644 --- a/platform/linux-generic/include/odp/api/ipsec.h +++ b/include/odp/api/ipsec.h @@ -10,22 +10,14 @@ * ODP IPSEC API - platform specific header */ -#ifndef ODP_PLAT_IPSEC_H_ -#define ODP_PLAT_IPSEC_H_ +#ifndef ODP_API_IPSEC_H_ +#define ODP_API_IPSEC_H_ #ifdef __cplusplus extern "C" { #endif -#include - -/** @ingroup odp_ipsec - * @{ - */ - -/** - * @} - */ +#include #include diff --git a/platform/linux-generic/include/odp/api/pool.h b/include/odp/api/pool.h similarity index 53% rename from platform/linux-generic/include/odp/api/pool.h rename to include/odp/api/pool.h index d712b65010c7..845ed5fbe652 100644 --- a/platform/linux-generic/include/odp/api/pool.h +++ b/include/odp/api/pool.h @@ -10,24 +10,17 @@ * ODP pool */ -#ifndef ODP_PLAT_POOL_H_ -#define ODP_PLAT_POOL_H_ +#ifndef ODP_API_POOL_H_ +#define ODP_API_POOL_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_buffer - * @{ - */ - -/** - * @} - */ +#include +#include +#include -#include -#include -#include #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/queue.h b/include/odp/api/queue.h similarity index 58% rename from platform/linux-generic/include/odp/api/queue.h rename to include/odp/api/queue.h index f958ff5140c8..6a67b176130b 100644 --- a/platform/linux-generic/include/odp/api/queue.h +++ b/include/odp/api/queue.h @@ -10,18 +10,18 @@ * ODP queue */ -#ifndef ODP_PLAT_QUEUE_H_ -#define ODP_PLAT_QUEUE_H_ +#ifndef ODP_API_QUEUE_H_ +#define ODP_API_QUEUE_H_ #ifdef __cplusplus extern "C" { #endif #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/platform/linux-generic/include/odp/api/shared_memory.h b/include/odp/api/shared_memory.h similarity index 62% rename from platform/linux-generic/include/odp/api/shared_memory.h rename to include/odp/api/shared_memory.h index affc290e71d9..940126483988 100644 --- a/platform/linux-generic/include/odp/api/shared_memory.h +++ b/include/odp/api/shared_memory.h @@ -10,22 +10,14 @@ * ODP shared memory */ -#ifndef ODP_PLAT_SHARED_MEMORY_H_ -#define ODP_PLAT_SHARED_MEMORY_H_ +#ifndef ODP_API_SHARED_MEMORY_H_ +#define ODP_API_SHARED_MEMORY_H_ #ifdef __cplusplus extern "C" { #endif -#include - -/** @ingroup odp_shared_memory - * @{ - */ - -/** - * @} - */ +#include #include diff --git a/platform/linux-generic/include/odp/api/timer.h b/include/odp/api/timer.h similarity index 54% rename from platform/linux-generic/include/odp/api/timer.h rename to include/odp/api/timer.h index 1450727f8608..e69a85323c30 100644 --- a/platform/linux-generic/include/odp/api/timer.h +++ b/include/odp/api/timer.h @@ -10,26 +10,18 @@ * ODP timer service */ -#ifndef ODP_PLAT_TIMER_H_ -#define ODP_PLAT_TIMER_H_ +#ifndef ODP_API_TIMER_H_ +#define ODP_API_TIMER_H_ #ifdef __cplusplus extern "C" { #endif #include -#include -#include -#include -#include - -/** @ingroup odp_timer - * @{ - */ - -/** - * @} - */ +#include +#include +#include +#include #include diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4f47b277de29..1516f8ee7aee 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -21,64 +21,46 @@ odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ include/odp/api/align.h \ include/odp/api/atomic.h \ - include/odp/api/barrier.h \ - include/odp/api/buffer.h \ include/odp/api/byteorder.h \ + include/odp/api/chksum.h \ include/odp/api/classification.h \ include/odp/api/compiler.h \ - include/odp/api/chksum.h \ include/odp/api/cpu.h \ include/odp/api/crypto.h \ include/odp/api/debug.h \ include/odp/api/deprecated.h \ include/odp/api/errno.h \ - include/odp/api/event.h \ include/odp/api/feature.h \ include/odp/api/hash.h \ include/odp/api/hints.h \ - include/odp/api/ipsec.h \ include/odp/api/packet_flags.h \ include/odp/api/packet.h \ include/odp/api/packet_io.h \ include/odp/api/packet_io_stats.h \ - include/odp/api/pool.h \ - include/odp/api/queue.h \ include/odp/api/random.h \ - include/odp/api/shared_memory.h \ include/odp/api/std_clib.h \ include/odp/api/support.h \ include/odp/api/sync.h \ include/odp/api/system_info.h \ - include/odp/api/ticketlock.h \ - include/odp/api/timer.h + include/odp/api/ticketlock.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/atomic_types.h \ - include/odp/api/plat/buffer_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ - include/odp/api/plat/classification_types.h \ - include/odp/api/plat/crypto_types.h \ - include/odp/api/plat/event_types.h \ - include/odp/api/plat/ipsec_types.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/packet_types.h \ - include/odp/api/plat/packet_io_types.h \ - include/odp/api/plat/pool_types.h \ - include/odp/api/plat/queue_types.h \ - include/odp/api/plat/shared_memory_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h \ - include/odp/api/plat/ticketlock_types.h \ - include/odp/api/plat/timer_types.h + include/odp/api/plat/ticketlock_types.h nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h @@ -87,18 +69,28 @@ if !ODP_ABI_COMPAT odpapiabiarchincludedir= $(includedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/barrier.h \ + include-abi/odp/api/abi/buffer.h \ + include-abi/odp/api/abi/classification.h \ include-abi/odp/api/abi/cpumask.h \ + include-abi/odp/api/abi/crypto.h \ + include-abi/odp/api/abi/event.h \ include-abi/odp/api/abi/init.h \ + include-abi/odp/api/abi/ipsec.h \ + include-abi/odp/api/abi/packet_io.h \ + include-abi/odp/api/abi/pool.h \ + include-abi/odp/api/abi/queue.h \ include-abi/odp/api/abi/rwlock.h \ include-abi/odp/api/abi/rwlock_recursive.h \ include-abi/odp/api/abi/schedule.h \ include-abi/odp/api/abi/schedule_types.h \ + include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/spinlock.h \ include-abi/odp/api/abi/spinlock_recursive.h \ include-abi/odp/api/abi/std_types.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ include-abi/odp/api/abi/time.h \ + include-abi/odp/api/abi/timer.h \ include-abi/odp/api/abi/traffic_mngr.h \ include-abi/odp/api/abi/version.h endif diff --git a/platform/linux-generic/include/odp/api/plat/buffer_types.h b/platform/linux-generic/include-abi/odp/api/abi/buffer.h similarity index 73% rename from platform/linux-generic/include/odp/api/plat/buffer_types.h rename to platform/linux-generic/include-abi/odp/api/abi/buffer.h index 8b79bb52e552..90b6653a66a5 100644 --- a/platform/linux-generic/include/odp/api/plat/buffer_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/buffer.h @@ -10,18 +10,13 @@ * ODP buffer descriptor */ -#ifndef ODP_BUFFER_TYPES_H_ -#define ODP_BUFFER_TYPES_H_ +#ifndef ODP_API_ABI_BUFFER_H_ +#define ODP_API_ABI_BUFFER_H_ #ifdef __cplusplus extern "C" { #endif -#include -#if ODP_ABI_COMPAT == 1 -#include -#else - #include #include @@ -37,8 +32,6 @@ typedef ODP_HANDLE_T(odp_buffer_t); * @} */ -#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/plat/classification_types.h b/platform/linux-generic/include-abi/odp/api/abi/classification.h similarity index 74% rename from platform/linux-generic/include/odp/api/plat/classification_types.h rename to platform/linux-generic/include-abi/odp/api/abi/classification.h index d210feb0ce13..3f866c67aaa1 100644 --- a/platform/linux-generic/include/odp/api/plat/classification_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/classification.h @@ -10,18 +10,13 @@ * ODP classification descriptor */ -#ifndef ODP_CLASSIFICATION_TYPES_H_ -#define ODP_CLASSIFICATION_TYPES_H_ +#ifndef ODP_API_ABI_CLASSIFICATION_H_ +#define ODP_API_ABI_CLASSIFICATION_H_ #ifdef __cplusplus extern "C" { #endif -#include -#if ODP_ABI_COMPAT == 1 -#include -#else - #include /** @ingroup odp_classification @@ -40,8 +35,6 @@ typedef ODP_HANDLE_T(odp_pmr_t); * @} */ -#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/plat/crypto_types.h b/platform/linux-generic/include-abi/odp/api/abi/crypto.h similarity index 71% rename from platform/linux-generic/include/odp/api/plat/crypto_types.h rename to platform/linux-generic/include-abi/odp/api/abi/crypto.h index 2cc747eb2fde..fe3a921295e4 100644 --- a/platform/linux-generic/include/odp/api/plat/crypto_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/crypto.h @@ -11,18 +11,13 @@ * ODP crypto */ -#ifndef ODP_CRYPTO_TYPES_H_ -#define ODP_CRYPTO_TYPES_H_ +#ifndef ODP_API_ABI_CRYPTO_H_ +#define ODP_API_ABI_CRYPTO_H_ #ifdef __cplusplus extern "C" { #endif -#include -#if ODP_ABI_COMPAT == 1 -#include -#else - /** @ingroup odp_crypto * @{ */ @@ -36,8 +31,6 @@ typedef ODP_HANDLE_T(odp_crypto_compl_t); * @} */ -#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/plat/event_types.h b/platform/linux-generic/include-abi/odp/api/abi/event.h similarity index 80% rename from platform/linux-generic/include/odp/api/plat/event_types.h rename to platform/linux-generic/include-abi/odp/api/abi/event.h index 9bff607a5684..802e431f3a82 100644 --- a/platform/linux-generic/include/odp/api/plat/event_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/event.h @@ -11,19 +11,13 @@ * ODP event */ -#ifndef ODP_EVENT_TYPES_H_ -#define ODP_EVENT_TYPES_H_ +#ifndef ODP_API_ABI_EVENT_H_ +#define ODP_API_ABI_EVENT_H_ #ifdef __cplusplus extern "C" { #endif -#include -#if ODP_ABI_COMPAT == 1 -#include -#else - -#include #include /** @ingroup odp_event @@ -53,8 +47,6 @@ typedef enum odp_event_subtype_t { * @} */ -#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/plat/ipsec_types.h b/platform/linux-generic/include-abi/odp/api/abi/ipsec.h similarity index 88% rename from platform/linux-generic/include/odp/api/plat/ipsec_types.h rename to platform/linux-generic/include-abi/odp/api/abi/ipsec.h index a36cdada47ce..75d84c43a043 100644 --- a/platform/linux-generic/include/odp/api/plat/ipsec_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ipsec.h @@ -10,8 +10,8 @@ * ODP IPSEC API - platform specific types */ -#ifndef ODP_PLAT_IPSEC_TYPES_H_ -#define ODP_PLAT_IPSEC_TYPES_H_ +#ifndef ODP_API_ABI_IPSEC_H_ +#define ODP_API_ABI_IPSEC_H_ #ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/plat/packet_io_types.h b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h similarity index 83% rename from platform/linux-generic/include/odp/api/plat/packet_io_types.h rename to platform/linux-generic/include-abi/odp/api/abi/packet_io.h index 5a45321fb527..a84e858e650a 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_io_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h @@ -11,8 +11,8 @@ * ODP Packet IO */ -#ifndef ODP_PACKET_IO_TYPES_H_ -#define ODP_PACKET_IO_TYPES_H_ +#ifndef ODP_API_ABI_PACKET_IO_H_ +#define ODP_API_ABI_PACKET_IO_H_ #ifdef __cplusplus extern "C" { @@ -47,12 +47,6 @@ typedef struct odp_pktout_queue_t { #define ODP_PKTIN_NO_WAIT 0 #define ODP_PKTIN_WAIT UINT64_MAX -/** Get printable format of odp_pktio_t */ -static inline uint64_t odp_pktio_to_u64(odp_pktio_t hdl) -{ - return _odp_pri(hdl); -} - /** * @} */ diff --git a/platform/linux-generic/include/odp/api/plat/pool_types.h b/platform/linux-generic/include-abi/odp/api/abi/pool.h similarity index 76% rename from platform/linux-generic/include/odp/api/plat/pool_types.h rename to platform/linux-generic/include-abi/odp/api/abi/pool.h index 8bc816d4e64b..586e80f75bb4 100644 --- a/platform/linux-generic/include/odp/api/plat/pool_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/pool.h @@ -10,21 +10,16 @@ * ODP pool */ -#ifndef ODP_POOL_TYPES_H_ -#define ODP_POOL_TYPES_H_ +#ifndef ODP_API_ABI_POOL_H_ +#define ODP_API_ABI_POOL_H_ #ifdef __cplusplus extern "C" { #endif -#include -#if ODP_ABI_COMPAT == 1 -#include -#else - #include #include -#include +#include /** @ingroup odp_pool * @{ @@ -46,8 +41,6 @@ typedef enum odp_pool_type_t { * @} */ -#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/plat/queue_types.h b/platform/linux-generic/include-abi/odp/api/abi/queue.h similarity index 74% rename from platform/linux-generic/include/odp/api/plat/queue_types.h rename to platform/linux-generic/include-abi/odp/api/abi/queue.h index 1561e2239114..28c721a770e3 100644 --- a/platform/linux-generic/include/odp/api/plat/queue_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/queue.h @@ -10,18 +10,13 @@ * ODP queue */ -#ifndef ODP_QUEUE_TYPES_H_ -#define ODP_QUEUE_TYPES_H_ +#ifndef ODP_API_ABI_QUEUE_H_ +#define ODP_API_ABI_QUEUE_H_ #ifdef __cplusplus extern "C" { #endif -#include -#if ODP_ABI_COMPAT == 1 -#include -#else - #include #include @@ -39,8 +34,6 @@ typedef ODP_HANDLE_T(odp_queue_t); * @} */ -#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/plat/shared_memory_types.h b/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h similarity index 73% rename from platform/linux-generic/include/odp/api/plat/shared_memory_types.h rename to platform/linux-generic/include-abi/odp/api/abi/shared_memory.h index 2c5b4ed2e7b9..05922238c881 100644 --- a/platform/linux-generic/include/odp/api/plat/shared_memory_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h @@ -11,18 +11,13 @@ * ODP shared memory */ -#ifndef ODP_SHARED_MEMORY_TYPES_H_ -#define ODP_SHARED_MEMORY_TYPES_H_ +#ifndef ODP_API_ABI_SHARED_MEMORY_H_ +#define ODP_API_ABI_SHARED_MEMORY_H_ #ifdef __cplusplus extern "C" { #endif -#include -#if ODP_ABI_COMPAT == 1 -#include -#else - #include #include @@ -41,8 +36,6 @@ typedef ODP_HANDLE_T(odp_shm_t); * @} */ -#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/plat/timer_types.h b/platform/linux-generic/include-abi/odp/api/abi/timer.h similarity index 92% rename from platform/linux-generic/include/odp/api/plat/timer_types.h rename to platform/linux-generic/include-abi/odp/api/abi/timer.h index 9605d584121f..19b6a4b0d73e 100644 --- a/platform/linux-generic/include/odp/api/plat/timer_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/timer.h @@ -11,8 +11,8 @@ * ODP timer service */ -#ifndef ODP_TIMER_TYPES_H_ -#define ODP_TIMER_TYPES_H_ +#ifndef ODP_API_ABI_TIMER_H_ +#define ODP_API_ABI_TIMER_H_ #ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h index 377d1a02f7e8..01be7063d102 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/platform/linux-generic/include/odp/api/classification.h @@ -10,19 +10,19 @@ * ODP classification descriptor */ -#ifndef ODP_PLAT_CLASSIFICATION_H_ -#define ODP_PLAT_CLASSIFICATION_H_ +#ifndef ODP_API_CLASSIFICATION_H_ +#define ODP_API_CLASSIFICATION_H_ #ifdef __cplusplus extern "C" { #endif #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include diff --git a/platform/linux-generic/include/odp/api/crypto.h b/platform/linux-generic/include/odp/api/crypto.h index 4f65932aa1e1..ead28eab0bfc 100644 --- a/platform/linux-generic/include/odp/api/crypto.h +++ b/platform/linux-generic/include/odp/api/crypto.h @@ -10,8 +10,8 @@ * ODP crypto */ -#ifndef ODP_PLAT_CRYPTO_H_ -#define ODP_PLAT_CRYPTO_H_ +#ifndef ODP_API_CRYPTO_H_ +#define ODP_API_CRYPTO_H_ #ifdef __cplusplus extern "C" { @@ -19,9 +19,9 @@ extern "C" { #include #include -#include -#include -#include +#include +#include +#include #include /** @ingroup odp_crypto diff --git a/platform/linux-generic/include/odp/api/packet.h b/platform/linux-generic/include/odp/api/packet.h index eff40803531f..5d744df544d6 100644 --- a/platform/linux-generic/include/odp/api/packet.h +++ b/platform/linux-generic/include/odp/api/packet.h @@ -18,11 +18,11 @@ extern "C" { #endif #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #if ODP_ABI_COMPAT == 0 diff --git a/platform/linux-generic/include/odp/api/packet_io.h b/platform/linux-generic/include/odp/api/packet_io.h index 76c7dfeda1cf..9107685a36dc 100644 --- a/platform/linux-generic/include/odp/api/packet_io.h +++ b/platform/linux-generic/include/odp/api/packet_io.h @@ -18,11 +18,11 @@ extern "C" { #endif #include -#include -#include +#include +#include #include -#include -#include +#include +#include /** @ingroup odp_packet_io * @{ diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 1804fa6f2f1b..bfd65cbf1068 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -13,6 +13,7 @@ #ifndef _ODP_PLAT_PACKET_INLINES_H_ #define _ODP_PLAT_PACKET_INLINES_H_ +#include #include #include #include diff --git a/platform/linux-generic/include/odp/api/plat/strong_types.h b/platform/linux-generic/include/odp/api/plat/strong_types.h index 2e3070f8b185..ce920285efb8 100644 --- a/platform/linux-generic/include/odp/api/plat/strong_types.h +++ b/platform/linux-generic/include/odp/api/plat/strong_types.h @@ -15,6 +15,8 @@ #ifndef STRONG_TYPES_H_ #define STRONG_TYPES_H_ +#include + /** Use strong typing for ODP types */ #ifdef __cplusplus /* Allow type to be expanded before concatenation with underscore */ diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index dd846d592120..df1b29ff8dcb 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -18,6 +18,7 @@ extern "C" { #endif +#include #include #include #include diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index ddc65f604cb8..58d64aa5b37c 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -13,6 +13,7 @@ extern "C" { #endif +#include #include #include #include diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 566fc847c2c0..e6ed8632cba9 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1772,3 +1772,9 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[], return entry->s.ops->send(entry, queue.index, packets, num); } + +/** Get printable format of odp_pktio_t */ +uint64_t odp_pktio_to_u64(odp_pktio_t hdl) +{ + return _odp_pri(hdl); +} From patchwork Mon Oct 23 11:10:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116717 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4546592qgn; Mon, 23 Oct 2017 04:44:49 -0700 (PDT) X-Received: by 10.55.22.38 with SMTP id g38mr17961310qkh.98.1508759089239; Mon, 23 Oct 2017 04:44:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508759089; cv=none; d=google.com; s=arc-20160816; b=MdDsfWjNhWLlmf7YO8ujMV3ZyRPvEQBBp4j4QQNEpwiQ/z/El5Uk716MoC1Gu9LkkB veBTiy4L2Cc/6pah2RQgzHzMbhF15gp9rh1stHCRvequjn/Sz99liG1d7Wq+LW4Ho/Hc lB7EYOoawl4Q8V16+YbgBC2p0Fx6zn+FEa6NBFW1M+8if5C05mQ033bmP/fR8XzD05Dy +5NLb39y2YIIVS1bvgyKnmIsQAC0R8zM2blex2yNj/iY1U+BJCGJcAMidPg4q9Xb1PTW KSRnFwWZhnagOldKcKiutUNdjc5UlnnaTp6aJP/NZJL/ijvBO1mirv0vHSXdFLXkH9ze 4DzQ== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=sW17BP7Hs3QBbS6M2ENpummYFR1taXzSLogxL7ec5QQ=; b=m99ZbIle8IuHdw+DwSt4LByoYGZPyjAai2tdnONTw4umJQ/r1Vg+MAZtE2hBk2DRq7 Q8l9Ds6rmzAjz/Q2ns9F6Juk70dhTckPlYFjPjvWVvbKYOYkdI1q2z4Fg9457IpO8Ypr YWaXAsgACWFOWMS7Sxg7dEWqEHrQcw9cfO3PA0rXxm8AxI6GYeJSiUxEDxUNhK+Z7o3l x4Nk4bcjhTdJSNuCnf9IwVgICx1cW14jTzxXEZsBKTwegGuY+jla6ve9Y3DERM74ZyhZ SsyEJdPMEv+BKNBxsu/8vTJGhtnrIjlfczXeFcOI6Ox2DmLFc2GRpfhL2mUF9nC604bq T6TQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id g56si6054893qtf.217.2017.10.23.04.44.48; Mon, 23 Oct 2017 04:44:49 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C077662958; Mon, 23 Oct 2017 11:44:48 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 0C389628AA; Mon, 23 Oct 2017 11:15:01 +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 5A5B562291; Mon, 23 Oct 2017 11:13:49 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.linaro.org (Postfix) with ESMTPS id A332C61DEE for ; Mon, 23 Oct 2017 11:11:27 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id 90so19650444lfs.13 for ; Mon, 23 Oct 2017 04:11:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=sW17BP7Hs3QBbS6M2ENpummYFR1taXzSLogxL7ec5QQ=; b=TfMIikV9Cpq24FJ/lP7n0qVBDAhSAKD3dyUGe6anaCV7JVBQXAEp/GFrFx6ydnLNQ8 JTnGoD5sIpZuW5/Q33PmRehhKYKWtfr6LFd2F7ng5Wmo8Jlf+JaqdpCAC3+Y8LXCKH23 Xq5qm7HB/hDTd0EauCmK4U8i7/kIWfbb5iRvOYj/wB0U2lHIvbfjuOOmhhl/3vanOkRQ iY2QMGoL+Fdn+Uzi751z8M454wvW/OTBFfZkv4M9ajYBIm10COaS9xolq7fq/E+//ZoK 4wE9lvRd3vYpRIs1cChcv4XM6sYm8zjD3WUiS8cL1WV+jjZBMQXNutkSLcoKAPOZBLyv YMuQ== X-Gm-Message-State: AMCzsaVGh+i4nB+m6ZtZ9K0bh4rOhJKT2iTUUnQht76ZUWiQsD1m44Tq NT2FAPuc92SR/4R+ZG4fYIl0mQDwrgryKQ== X-Google-Smtp-Source: ABhQp+SEeP3RFeJJUtL6juGxAMunW283x/ukD20w+DSNtm3HizRzwWsFsa/9kPliWiCoxvrM3ExR/A== X-Received: by 10.25.193.215 with SMTP id r206mr4465392lff.55.1508757085951; Mon, 23 Oct 2017 04:11:25 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:24 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:45 +0300 Message-Id: <20171023111057.6328-18-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 17/29] linux-gen: atomic: simplify locked 64-bit support 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" Rewrite atomic_types.h/atomic_inlines.h to clearly separate simple (common) and locked 64-bit cases. This is allows us to ease switching of atomic header to abi setup. Signed-off-by: Dmitry Eremin-Solenikov --- .../include/odp/api/plat/atomic_inlines.h | 315 +++++++++++++-------- .../include/odp/api/plat/atomic_types.h | 58 ++-- .../linux-generic/include/odp_atomic_internal.h | 208 ++++++++++---- 3 files changed, 364 insertions(+), 217 deletions(-) -- 2.14.2 diff --git a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h index 03b2884fdfca..1c58c77db993 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h @@ -109,177 +109,254 @@ _ODP_INLINE void odp_atomic_min_u32(odp_atomic_u32_t *atom, uint32_t new_min) } } +#ifdef ODP_ATOMIC_U64_LOCK + +/** + * @internal + * CAS operation expression for the ATOMIC_OP macro + */ +#define ATOMIC_CAS_OP(ret_ptr, old_val, new_val) \ +({ \ + if (atom->v == (old_val)) { \ + atom->v = (new_val); \ + *(ret_ptr) = 1; \ + } else { \ + *(ret_ptr) = 0; \ + } \ +}) + +/** + * @internal + * Helper macro for lock-based atomic operations on 64-bit integers + * @param[in,out] atom Pointer to the 64-bit atomic variable + * @param expr Expression used update the variable. + * @return The old value of the variable. + */ +#define ATOMIC_OP(atom, expr) \ +({ \ + uint64_t _old_val; \ + /* Loop while lock is already taken, stop when lock becomes clear */ \ + while (__atomic_test_and_set(&(atom)->lock, __ATOMIC_ACQUIRE)) \ + (void)0; \ + _old_val = (atom)->v; \ + (expr); /* Perform whatever update is desired */ \ + __atomic_clear(&(atom)->lock, __ATOMIC_RELEASE); \ + _old_val; /* Return old value */ \ +}) + _ODP_INLINE void odp_atomic_init_u64(odp_atomic_u64_t *atom, uint64_t val) { atom->v = val; -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 __atomic_clear(&atom->lock, __ATOMIC_RELAXED); -#endif } _ODP_INLINE uint64_t odp_atomic_load_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, (void)0); -#else - return __atomic_load_n(&atom->v, __ATOMIC_RELAXED); -#endif } _ODP_INLINE void odp_atomic_store_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v = val); -#else - __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); -#endif } _ODP_INLINE uint64_t odp_atomic_fetch_add_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v += val); -#else - return __atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); -#endif } _ODP_INLINE void odp_atomic_add_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v += val); -#else - (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); -#endif } _ODP_INLINE uint64_t odp_atomic_fetch_sub_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v -= val); -#else - return __atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); -#endif } _ODP_INLINE void odp_atomic_sub_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v -= val); -#else - (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); -#endif } _ODP_INLINE uint64_t odp_atomic_fetch_inc_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v++); -#else - return __atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); -#endif } _ODP_INLINE void odp_atomic_inc_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v++); -#else - (void)__atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); -#endif } _ODP_INLINE uint64_t odp_atomic_fetch_dec_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v--); -#else - return __atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); -#endif } _ODP_INLINE void odp_atomic_dec_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v--); -#else - (void)__atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); -#endif } _ODP_INLINE int odp_atomic_cas_u64(odp_atomic_u64_t *atom, uint64_t *old_val, uint64_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 int ret; *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); return ret; -#else - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_RELAXED, - __ATOMIC_RELAXED); -#endif } _ODP_INLINE uint64_t odp_atomic_xchg_u64(odp_atomic_u64_t *atom, uint64_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v = new_val); -#else - return __atomic_exchange_n(&atom->v, new_val, __ATOMIC_RELAXED); -#endif } -_ODP_INLINE void odp_atomic_max_u64(odp_atomic_u64_t *atom, uint64_t new_max) +_ODP_INLINE uint64_t odp_atomic_load_acq_u64(odp_atomic_u64_t *atom) { - uint64_t old_val; + return ATOMIC_OP(atom, (void)0); +} - old_val = odp_atomic_load_u64(atom); +_ODP_INLINE void odp_atomic_store_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + (void)ATOMIC_OP(atom, atom->v = val); +} - while (new_max > old_val) { - if (odp_atomic_cas_u64(atom, &old_val, new_max)) - break; - } +_ODP_INLINE void odp_atomic_add_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + (void)ATOMIC_OP(atom, atom->v += val); } -_ODP_INLINE void odp_atomic_min_u64(odp_atomic_u64_t *atom, uint64_t new_min) +_ODP_INLINE void odp_atomic_sub_rel_u64(odp_atomic_u64_t *atom, uint64_t val) { - uint64_t old_val; + (void)ATOMIC_OP(atom, atom->v -= val); +} - old_val = odp_atomic_load_u64(atom); +_ODP_INLINE int odp_atomic_cas_acq_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, uint64_t new_val) +{ + int ret; + *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); + return ret; +} - while (new_min < old_val) { - if (odp_atomic_cas_u64(atom, &old_val, new_min)) - break; - } +_ODP_INLINE int odp_atomic_cas_rel_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, uint64_t new_val) +{ + int ret; + *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); + return ret; } -_ODP_INLINE uint32_t odp_atomic_load_acq_u32(odp_atomic_u32_t *atom) +_ODP_INLINE int odp_atomic_cas_acq_rel_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, + uint64_t new_val) +{ + int ret; + *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); + return ret; +} + +#else /* !ODP_ATOMIC_U64_LOCK */ + +_ODP_INLINE void odp_atomic_init_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + atom->v = val; +} + +_ODP_INLINE uint64_t odp_atomic_load_u64(odp_atomic_u64_t *atom) +{ + return __atomic_load_n(&atom->v, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_store_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_fetch_add_u64(odp_atomic_u64_t *atom, + uint64_t val) +{ + return __atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_add_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_fetch_sub_u64(odp_atomic_u64_t *atom, + uint64_t val) +{ + return __atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_sub_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_fetch_inc_u64(odp_atomic_u64_t *atom) +{ + return __atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_inc_u64(odp_atomic_u64_t *atom) +{ + (void)__atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_fetch_dec_u64(odp_atomic_u64_t *atom) +{ + return __atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_dec_u64(odp_atomic_u64_t *atom) +{ + (void)__atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); +} + +_ODP_INLINE int odp_atomic_cas_u64(odp_atomic_u64_t *atom, uint64_t *old_val, + uint64_t new_val) +{ + return __atomic_compare_exchange_n(&atom->v, old_val, new_val, + 0 /* strong */, + __ATOMIC_RELAXED, + __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_xchg_u64(odp_atomic_u64_t *atom, + uint64_t new_val) +{ + return __atomic_exchange_n(&atom->v, new_val, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_load_acq_u64(odp_atomic_u64_t *atom) { return __atomic_load_n(&atom->v, __ATOMIC_ACQUIRE); } -_ODP_INLINE void odp_atomic_store_rel_u32(odp_atomic_u32_t *atom, uint32_t val) +_ODP_INLINE void odp_atomic_store_rel_u64(odp_atomic_u64_t *atom, uint64_t val) { __atomic_store_n(&atom->v, val, __ATOMIC_RELEASE); } -_ODP_INLINE void odp_atomic_add_rel_u32(odp_atomic_u32_t *atom, uint32_t val) +_ODP_INLINE void odp_atomic_add_rel_u64(odp_atomic_u64_t *atom, uint64_t val) { (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELEASE); } -_ODP_INLINE void odp_atomic_sub_rel_u32(odp_atomic_u32_t *atom, uint32_t val) +_ODP_INLINE void odp_atomic_sub_rel_u64(odp_atomic_u64_t *atom, uint64_t val) { (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELEASE); } -_ODP_INLINE int odp_atomic_cas_acq_u32(odp_atomic_u32_t *atom, - uint32_t *old_val, uint32_t new_val) +_ODP_INLINE int odp_atomic_cas_acq_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, uint64_t new_val) { return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, @@ -287,8 +364,8 @@ _ODP_INLINE int odp_atomic_cas_acq_u32(odp_atomic_u32_t *atom, __ATOMIC_RELAXED); } -_ODP_INLINE int odp_atomic_cas_rel_u32(odp_atomic_u32_t *atom, - uint32_t *old_val, uint32_t new_val) +_ODP_INLINE int odp_atomic_cas_rel_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, uint64_t new_val) { return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, @@ -296,9 +373,9 @@ _ODP_INLINE int odp_atomic_cas_rel_u32(odp_atomic_u32_t *atom, __ATOMIC_RELAXED); } -_ODP_INLINE int odp_atomic_cas_acq_rel_u32(odp_atomic_u32_t *atom, - uint32_t *old_val, - uint32_t new_val) +_ODP_INLINE int odp_atomic_cas_acq_rel_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, + uint64_t new_val) { return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, @@ -306,86 +383,78 @@ _ODP_INLINE int odp_atomic_cas_acq_rel_u32(odp_atomic_u32_t *atom, __ATOMIC_RELAXED); } -_ODP_INLINE uint64_t odp_atomic_load_acq_u64(odp_atomic_u64_t *atom) +#endif /* !ODP_ATOMIC_U64_LOCK */ + +_ODP_INLINE void odp_atomic_max_u64(odp_atomic_u64_t *atom, uint64_t new_max) +{ + uint64_t old_val; + + old_val = odp_atomic_load_u64(atom); + + while (new_max > old_val) { + if (odp_atomic_cas_u64(atom, &old_val, new_max)) + break; + } +} + +_ODP_INLINE void odp_atomic_min_u64(odp_atomic_u64_t *atom, uint64_t new_min) +{ + uint64_t old_val; + + old_val = odp_atomic_load_u64(atom); + + while (new_min < old_val) { + if (odp_atomic_cas_u64(atom, &old_val, new_min)) + break; + } +} + +_ODP_INLINE uint32_t odp_atomic_load_acq_u32(odp_atomic_u32_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, (void)0); -#else return __atomic_load_n(&atom->v, __ATOMIC_ACQUIRE); -#endif } -_ODP_INLINE void odp_atomic_store_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +_ODP_INLINE void odp_atomic_store_rel_u32(odp_atomic_u32_t *atom, uint32_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v = val); -#else __atomic_store_n(&atom->v, val, __ATOMIC_RELEASE); -#endif } -_ODP_INLINE void odp_atomic_add_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +_ODP_INLINE void odp_atomic_add_rel_u32(odp_atomic_u32_t *atom, uint32_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v += val); -#else (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELEASE); -#endif } -_ODP_INLINE void odp_atomic_sub_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +_ODP_INLINE void odp_atomic_sub_rel_u32(odp_atomic_u32_t *atom, uint32_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v -= val); -#else (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELEASE); -#endif } -_ODP_INLINE int odp_atomic_cas_acq_u64(odp_atomic_u64_t *atom, - uint64_t *old_val, uint64_t new_val) +_ODP_INLINE int odp_atomic_cas_acq_u32(odp_atomic_u32_t *atom, + uint32_t *old_val, uint32_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED); -#endif } -_ODP_INLINE int odp_atomic_cas_rel_u64(odp_atomic_u64_t *atom, - uint64_t *old_val, uint64_t new_val) +_ODP_INLINE int odp_atomic_cas_rel_u32(odp_atomic_u32_t *atom, + uint32_t *old_val, uint32_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, __ATOMIC_RELEASE, __ATOMIC_RELAXED); -#endif } -_ODP_INLINE int odp_atomic_cas_acq_rel_u64(odp_atomic_u64_t *atom, - uint64_t *old_val, - uint64_t new_val) +_ODP_INLINE int odp_atomic_cas_acq_rel_u32(odp_atomic_u32_t *atom, + uint32_t *old_val, + uint32_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); -#endif } #endif diff --git a/platform/linux-generic/include/odp/api/plat/atomic_types.h b/platform/linux-generic/include/odp/api/plat/atomic_types.h index a674ac9978c4..c0803bf11f63 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_types.h @@ -20,61 +20,39 @@ extern "C" { #include #include -/** - * @internal - * Atomic 64-bit unsigned integer - */ -struct odp_atomic_u64_s { - uint64_t v; /**< Actual storage for the atomic variable */ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - /* Some architectures do not support lock-free operations on 64-bit - * data types. We use a spin lock to ensure atomicity. */ - char lock; /**< Spin lock (if needed) used to ensure atomic access */ -#endif -} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignement! */ - /** * @internal * Atomic 32-bit unsigned integer */ struct odp_atomic_u32_s { uint32_t v; /**< Actual storage for the atomic variable */ -} ODP_ALIGNED(sizeof(uint32_t)); /* Enforce alignement! */ +} ODP_ALIGNED(sizeof(uint32_t)); /* Enforce alignment! */ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 +#if __GCC_ATOMIC_LLONG_LOCK_FREE >= 2 /** * @internal - * CAS operation expression for the ATOMIC_OP macro + * Atomic 64-bit unsigned integer */ -#define ATOMIC_CAS_OP(ret_ptr, old_val, new_val) \ -({ \ - if (atom->v == (old_val)) { \ - atom->v = (new_val); \ - *(ret_ptr) = 1; \ - } else { \ - *(ret_ptr) = 0; \ - } \ -}) +struct odp_atomic_u64_s { + uint64_t v; /**< Actual storage for the atomic variable */ +} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignment! */ + +#else + +#define ODP_ATOMIC_U64_LOCK 1 /** * @internal - * Helper macro for lock-based atomic operations on 64-bit integers - * @param[in,out] atom Pointer to the 64-bit atomic variable - * @param expr Expression used update the variable. - * @return The old value of the variable. + * Atomic 64-bit unsigned integer */ -#define ATOMIC_OP(atom, expr) \ -({ \ - uint64_t _old_val; \ - /* Loop while lock is already taken, stop when lock becomes clear */ \ - while (__atomic_test_and_set(&(atom)->lock, __ATOMIC_ACQUIRE)) \ - (void)0; \ - _old_val = (atom)->v; \ - (expr); /* Perform whatever update is desired */ \ - __atomic_clear(&(atom)->lock, __ATOMIC_RELEASE); \ - _old_val; /* Return old value */ \ -}) +struct odp_atomic_u64_s { + uint64_t v; /**< Actual storage for the atomic variable */ + /* Some architectures do not support lock-free operations on 64-bit + * data types. We use a spin lock to ensure atomicity. */ + char lock; /**< Spin lock (if needed) used to ensure atomic access */ +} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignment! */ + #endif typedef struct odp_atomic_u64_s odp_atomic_u64_t; diff --git a/platform/linux-generic/include/odp_atomic_internal.h b/platform/linux-generic/include/odp_atomic_internal.h index dca2175cefbf..f3696a99426f 100644 --- a/platform/linux-generic/include/odp_atomic_internal.h +++ b/platform/linux-generic/include/odp_atomic_internal.h @@ -223,7 +223,7 @@ static inline void _odp_atomic_u32_sub_mm(odp_atomic_u32_t *atom, *****************************************************************************/ /* Check if the compiler support lock-less atomic operations on 64-bit types */ -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 +#ifdef ODP_ATOMIC_U64_LOCK /** * @internal * Helper macro for lock-based atomic operations on 64-bit integers @@ -247,7 +247,6 @@ static inline void _odp_atomic_u32_sub_mm(odp_atomic_u32_t *atom, __ATOMIC_SEQ_CST : __ATOMIC_RELEASE); \ old_val; /* Return old value */ \ }) -#endif /** * Atomic load of 64-bit atomic variable @@ -258,13 +257,9 @@ static inline void _odp_atomic_u32_sub_mm(odp_atomic_u32_t *atom, * @return Value of the variable */ static inline uint64_t _odp_atomic_u64_load_mm(odp_atomic_u64_t *atom, - _odp_memmodel_t mmodel) + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP_MM(atom, (void)0, mmodel); -#else - return __atomic_load_n(&atom->v, mmodel); -#endif } /** @@ -275,14 +270,10 @@ static inline uint64_t _odp_atomic_u64_load_mm(odp_atomic_u64_t *atom, * @param mmodel Memory order associated with the store operation */ static inline void _odp_atomic_u64_store_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP_MM(atom, atom->v = val, mmodel); -#else - __atomic_store_n(&atom->v, val, mmodel); -#endif } /** @@ -295,15 +286,11 @@ static inline void _odp_atomic_u64_store_mm(odp_atomic_u64_t *atom, * @return Old value of variable */ static inline uint64_t _odp_atomic_u64_xchg_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP_MM(atom, atom->v = val, mmodel); -#else - return __atomic_exchange_n(&atom->v, val, mmodel); -#endif } /** @@ -322,12 +309,11 @@ static inline uint64_t _odp_atomic_u64_xchg_mm(odp_atomic_u64_t *atom, * @retval 0 exchange failed and '*exp' updated with current value */ static inline int _odp_atomic_u64_cmp_xchg_strong_mm(odp_atomic_u64_t *atom, - uint64_t *exp, - uint64_t val, - _odp_memmodel_t success, - _odp_memmodel_t failure) + uint64_t *exp, + uint64_t val, + _odp_memmodel_t success, + _odp_memmodel_t failure) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 /* Possibly we are a bit pessimistic with the memory models */ odp_bool_t ret_succ; /* Loop while lock is already taken, stop when lock becomes clear */ @@ -346,10 +332,6 @@ static inline int _odp_atomic_u64_cmp_xchg_strong_mm(odp_atomic_u64_t *atom, (ret_succ ? success : failure) == _ODP_MEMMODEL_SC ? __ATOMIC_SEQ_CST : __ATOMIC_RELEASE); return ret_succ; -#else - return __atomic_compare_exchange_n(&atom->v, exp, val, - false/*strong*/, success, failure); -#endif } /** @@ -362,14 +344,10 @@ static inline int _odp_atomic_u64_cmp_xchg_strong_mm(odp_atomic_u64_t *atom, * @return Value of the atomic variable before the addition */ static inline uint64_t _odp_atomic_u64_fetch_add_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP_MM(atom, atom->v += val, mmodel); -#else - return __atomic_fetch_add(&atom->v, val, mmodel); -#endif } /** @@ -380,15 +358,11 @@ static inline uint64_t _odp_atomic_u64_fetch_add_mm(odp_atomic_u64_t *atom, * @param mmodel Memory order associated with the add operation. */ static inline void _odp_atomic_u64_add_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP_MM(atom, atom->v += val, mmodel); -#else - (void)__atomic_fetch_add(&atom->v, val, mmodel); -#endif } /** @@ -401,14 +375,10 @@ static inline void _odp_atomic_u64_add_mm(odp_atomic_u64_t *atom, * @return Value of the atomic variable before the subtraction */ static inline uint64_t _odp_atomic_u64_fetch_sub_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP_MM(atom, atom->v -= val, mmodel); -#else - return __atomic_fetch_sub(&atom->v, val, mmodel); -#endif } /** @@ -419,20 +389,150 @@ static inline uint64_t _odp_atomic_u64_fetch_sub_mm(odp_atomic_u64_t *atom, * @param mmodel Memory order associated with the subtract operation */ static inline void _odp_atomic_u64_sub_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP_MM(atom, atom->v -= val, mmodel); -#else - (void)__atomic_fetch_sub(&atom->v, val, mmodel); -#endif } -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 #undef ATOMIC_OP_MM -#endif + +#else /* ! ODP_ATOMIC_U64_LOCK */ + +/** + * Atomic load of 64-bit atomic variable + * + * @param atom Pointer to a 64-bit atomic variable + * @param mmodel Memory order associated with the load operation + * + * @return Value of the variable + */ +static inline uint64_t _odp_atomic_u64_load_mm(odp_atomic_u64_t *atom, + _odp_memmodel_t mmodel) +{ + return __atomic_load_n(&atom->v, mmodel); +} + +/** + * Atomic store to 64-bit atomic variable + * + * @param[out] atom Pointer to a 64-bit atomic variable + * @param val Value to write to the atomic variable + * @param mmodel Memory order associated with the store operation + */ +static inline void _odp_atomic_u64_store_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) +{ + __atomic_store_n(&atom->v, val, mmodel); +} + +/** + * Atomic exchange (swap) of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val New value to write to the atomic variable + * @param mmodel Memory order associated with the exchange operation + * + * @return Old value of variable + */ +static inline uint64_t _odp_atomic_u64_xchg_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) + +{ + return __atomic_exchange_n(&atom->v, val, mmodel); +} + +/** + * Atomic compare and exchange (swap) of 64-bit atomic variable + * "Strong" semantics, will not fail spuriously. + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param[in,out] exp Pointer to expected value (updated on failure) + * @param val New value to write + * @param success Memory order associated with a successful compare-and-swap + * operation + * @param failure Memory order associated with a failed compare-and-swap + * operation + * + * @retval 1 exchange successful + * @retval 0 exchange failed and '*exp' updated with current value + */ +static inline int _odp_atomic_u64_cmp_xchg_strong_mm(odp_atomic_u64_t *atom, + uint64_t *exp, + uint64_t val, + _odp_memmodel_t success, + _odp_memmodel_t failure) +{ + return __atomic_compare_exchange_n(&atom->v, exp, val, + false/*strong*/, success, failure); +} + +/** + * Atomic fetch and add of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val Value to add to the atomic variable + * @param mmodel Memory order associated with the add operation + * + * @return Value of the atomic variable before the addition + */ +static inline uint64_t _odp_atomic_u64_fetch_add_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) +{ + return __atomic_fetch_add(&atom->v, val, mmodel); +} + +/** + * Atomic add of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val Value to add to the atomic variable + * @param mmodel Memory order associated with the add operation. + */ +static inline void _odp_atomic_u64_add_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) + +{ + (void)__atomic_fetch_add(&atom->v, val, mmodel); +} + +/** + * Atomic fetch and subtract of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val Value to subtract from the atomic variable + * @param mmodel Memory order associated with the subtract operation + * + * @return Value of the atomic variable before the subtraction + */ +static inline uint64_t _odp_atomic_u64_fetch_sub_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) +{ + return __atomic_fetch_sub(&atom->v, val, mmodel); +} + +/** + * Atomic subtract of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val Value to subtract from the atomic variable + * @param mmodel Memory order associated with the subtract operation + */ +static inline void _odp_atomic_u64_sub_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) + +{ + (void)__atomic_fetch_sub(&atom->v, val, mmodel); +} + +#endif /* ! ODP_ATOMIC_U64_LOCK */ /***************************************************************************** * Operations on pointer atomics From patchwork Mon Oct 23 11:10:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116718 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4547908qgn; Mon, 23 Oct 2017 04:46:38 -0700 (PDT) X-Received: by 10.200.49.38 with SMTP id g35mr18463705qtb.32.1508759198454; Mon, 23 Oct 2017 04:46:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508759198; cv=none; d=google.com; s=arc-20160816; b=a8NrZR4UMH7A9KomOkRyhDHPTL08IVnKwK4lq8weuaVkURm2YaY1Sf1Rzeq61x1gbk pQCuP75hD0a36O1JNvRCR6hyZBnoLdfjgyuoHpEmXPzISIKyvwfyTBt2lJlJFZos2daj oQrHSy6Lh+QKiaMDgfzBaDs3oF83IZDW4JSTDw1LAN6cFmWj4o9X9spghxiMToJMVSdU zSg5GonE3rqwFPjFj22FV1WZaT2zlEbxPMYw8YN4PcD3h2C5AufNV1R++ajgcjlZ/VPS PrbIS9ZP0J17zCSXQIjTbYomjssCbPKPXQEPKLyHWFX9ZuCt+h52Qhr4P8Pug9DUvm/9 MCNA== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=yl2MYPlakMfyCBfzNfUqi5vlLM9QSynkMdYnUqd63lA=; b=f8OdGdMQLh8JANT1kKjhmg5FhycoRJfZFSvUdh+LBeGBsrMMitinfcQ4cybu/1QUZE qqcPPjB1ni6W++LBJb/W1kR5sOMHsvV1GydI3dGIRZLawt1wX2pB7WdEXGDQKvIeY/I0 g8TsEPoK12+SB4Ys1mnCiW6EFmmHM3fwwkO+W5QHSZcjbhusCE/up5GHvOoN58gAMD56 UqCl88GT+g5pO0NL8qD2D/BFsXJ7Vp9Z8ijmNrdfUQxr4iuQCgDInCHr7pWdSRC11hdh PZox8KB4sf4pnduOD/N+LYiW+qkBcC4/AH2EgSiHo63G+69tHH5lCxIOt8ukg27Ewop1 MpFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id b29si5710147qta.377.2017.10.23.04.46.38; Mon, 23 Oct 2017 04:46:38 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2719662960; Mon, 23 Oct 2017 11:46:38 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 5414C628B1; Mon, 23 Oct 2017 11:15:10 +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 89775622E8; Mon, 23 Oct 2017 11:14:17 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id 9D52662289 for ; Mon, 23 Oct 2017 11:11:28 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id p184so19619533lfe.12 for ; Mon, 23 Oct 2017 04:11:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=yl2MYPlakMfyCBfzNfUqi5vlLM9QSynkMdYnUqd63lA=; b=XKE3jtFKYcz5hUSYdFzs6vHE3NmIsrO3EE70iixWe8Gne+ZQ56TyASaLNFNxG4xw/7 kq2B8iUOT7vZ70rm9MbnyHbvVpC3eanmtp8vQfxhgfCMhgEQNrjrnXLHQtESZ50Rkwm2 0W0EzmakEZQY4/ewDpX32x/eZm1dr/JOYHe5U27ML45pp0C1H5yK3gh+dxoiw8MgaEA8 ps3viD2Y/Vy2XU+KOtQwhmzytMhrP8lfHEi2GcwvQHoy55MPDTqHnELaUymSrPQr6art 4Oh7R7gw15wZn03aS1SZtDzqICn5Xt7a20+6Y6pJZyb/Sd9nTfIvb2jILIWKCNesbWTI 8s7Q== X-Gm-Message-State: AMCzsaUuisUBGFpD/7AEPXaXNtKbe6h0eASzayP67lhO7F5J9Pawkc6A KbNR/ykfTRSaMNY7/kPGv0cGw/1i6+oFLA== X-Google-Smtp-Source: ABhQp+ThDeMa15H37WePf/u64pZj23iHvn5kZMFiHI0fE+DDr1O36BvWevCBY1V0ZZ9Wpvm+lym+rw== X-Received: by 10.25.178.205 with SMTP id t74mr3996057lfk.152.1508757087255; Mon, 23 Oct 2017 04:11:27 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:26 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:46 +0300 Message-Id: <20171023111057.6328-19-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 18/29] linux-gen, include: switch atomic.h to api+abi 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" Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 1 + include/odp/api/atomic.h | 28 +++++++++++++++ platform/linux-generic/Makefile.am | 3 +- .../odp/api/abi/atomic.h} | 14 ++++++-- platform/linux-generic/include/odp/api/atomic.h | 42 ---------------------- .../linux-generic/include/odp/api/ticketlock.h | 1 + platform/linux-generic/odp_atomic.c | 1 + 7 files changed, 44 insertions(+), 46 deletions(-) create mode 100644 include/odp/api/atomic.h rename platform/linux-generic/{include/odp/api/plat/atomic_types.h => include-abi/odp/api/abi/atomic.h} (86%) delete mode 100644 platform/linux-generic/include/odp/api/atomic.h -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 946b7c07cf73..d1eb26bc59c2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -5,6 +5,7 @@ include_HEADERS = \ odpapiincludedir= $(includedir)/odp/api/ odpapiinclude_HEADERS = \ + odp/api/atomic.h \ odp/api/barrier.h \ odp/api/buffer.h \ odp/api/cpumask.h \ diff --git a/include/odp/api/atomic.h b/include/odp/api/atomic.h new file mode 100644 index 000000000000..8e515ec6f736 --- /dev/null +++ b/include/odp/api/atomic.h @@ -0,0 +1,28 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP atomic operations + */ + +#ifndef ODP_API_ATOMIC_H_ +#define ODP_API_ATOMIC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 1516f8ee7aee..304ca86862f3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,7 +20,6 @@ odpinclude_HEADERS = \ odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ include/odp/api/align.h \ - include/odp/api/atomic.h \ include/odp/api/byteorder.h \ include/odp/api/chksum.h \ include/odp/api/classification.h \ @@ -47,7 +46,6 @@ odpapiinclude_HEADERS = \ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ - include/odp/api/plat/atomic_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/packet_flag_inlines.h \ @@ -68,6 +66,7 @@ nodist_odpapiplatinclude_HEADERS = \ if !ODP_ABI_COMPAT odpapiabiarchincludedir= $(includedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ + include-abi/odp/api/abi/atomic.h \ include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ include-abi/odp/api/abi/classification.h \ diff --git a/platform/linux-generic/include/odp/api/plat/atomic_types.h b/platform/linux-generic/include-abi/odp/api/abi/atomic.h similarity index 86% rename from platform/linux-generic/include/odp/api/plat/atomic_types.h rename to platform/linux-generic/include-abi/odp/api/abi/atomic.h index c0803bf11f63..0b7b254ced23 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/atomic.h @@ -10,8 +10,8 @@ * ODP atomic operations */ -#ifndef ODP_ATOMIC_TYPES_H_ -#define ODP_ATOMIC_TYPES_H_ +#ifndef ODP_API_ABI_ATOMIC_H_ +#define ODP_API_ABI_ATOMIC_H_ #ifdef __cplusplus extern "C" { @@ -59,6 +59,16 @@ typedef struct odp_atomic_u64_s odp_atomic_u64_t; typedef struct odp_atomic_u32_s odp_atomic_u32_t; +/** @ingroup odp_atomic + * @{ + */ + +#include +#include + +/** + * @} + */ #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/atomic.h b/platform/linux-generic/include/odp/api/atomic.h deleted file mode 100644 index 7886cb4ea382..000000000000 --- a/platform/linux-generic/include/odp/api/atomic.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (c) 2013, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP atomic operations - */ - -#ifndef ODP_PLAT_ATOMIC_H_ -#define ODP_PLAT_ATOMIC_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -/** @ingroup odp_atomic - * @{ - */ - -#include -#if ODP_ABI_COMPAT == 0 -#include -#endif - -/** - * @} - */ - -#include - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/ticketlock.h b/platform/linux-generic/include/odp/api/ticketlock.h index e0f5d81fd6ed..ca12cc37cf9f 100644 --- a/platform/linux-generic/include/odp/api/ticketlock.h +++ b/platform/linux-generic/include/odp/api/ticketlock.h @@ -19,6 +19,7 @@ extern "C" { #include +#include #if ODP_ABI_COMPAT == 0 #include #endif diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c index 53123b675595..1d76caf2b82f 100644 --- a/platform/linux-generic/odp_atomic.c +++ b/platform/linux-generic/odp_atomic.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include #if ODP_ABI_COMPAT == 1 #include #endif From patchwork Mon Oct 23 11:10:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116719 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4548638qgn; Mon, 23 Oct 2017 04:47:35 -0700 (PDT) X-Received: by 10.55.94.65 with SMTP id s62mr1328984qkb.282.1508759255363; Mon, 23 Oct 2017 04:47:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508759255; cv=none; d=google.com; s=arc-20160816; b=LHFlsGGpENCX/FDGuWq28lzDkqjIc0HleF4ivCaLwQOH8bJcgUUO50/1TyrvqgknvD DpZypNdII3dt6gajP5YKQ9FhyCllWCU9LYcndBC7wyTvidH53Qb+Iqy18QzRzjXxcWxp i03NfdCMJ6OVXlVIw7uAT3RH38zBST9i7/CoQuLC3LBUuZazgFoDF8nZiK9Ak3whDk0h Hf1CkYXa+KU0p0r4psgEcUWIZhWdUjfs0BggqE1tS0XrHzPixHEVohCbgmvAfbo1M1Yx cOUZqAP2vLYsSfoXP/+UsJTa5gSKiah4myHscPesrwEhBsFO2yXP22gKZg4BcJG9ZA04 /uWg== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=38W5S+mPqSKxreDRGJwPRkK2sCXU57RY8NqX7eQZ7To=; b=rb8Ixb2PrpZHDiAMsDWnOml5sk9Z2GQM+15RWMRkGtTyuo75RXyGP7pXLGXWle79gp Cmwuwmz0t+OIWxmhCGLFr6LF2A4F9NQlPw96gJtmgi8m66sRNo7AYllRxqD0aOEieyHH Z04gj176vaZ5Dsijujlpc9u0iJirFXOSpEMlR03LM940LFOXNLttU+DLXEPbvqNnPZvI UC9RaC8QOaTeXq1K+a7CiookKsA5NUyfBs9YyxDvo5X970dDhhO5XZL0B2aefVDrwaHU ouxX2DegG/s41MuErWe3LJ4PGEQja05YvlPbOHaRh83G/gYHL+qgvY7QlM3JIn3jfEls fMCg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id d128si1426903qkf.110.2017.10.23.04.47.35; Mon, 23 Oct 2017 04:47:35 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1598B62964; Mon, 23 Oct 2017 11:47:35 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 8FDDA628B9; Mon, 23 Oct 2017 11:15:13 +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 41E5162874; Mon, 23 Oct 2017 11:14:25 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id 0F40C62292 for ; Mon, 23 Oct 2017 11:11:30 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id a69so19668424lfe.5 for ; Mon, 23 Oct 2017 04:11:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=38W5S+mPqSKxreDRGJwPRkK2sCXU57RY8NqX7eQZ7To=; b=i0uCfrfp2nRM2xHWP3FGlK1K6BZVeCOWF6OogW0VSx5KZMzSMKWxuT82tF7sg6Qgyp p58dN4NVC7izHrE02wqwEiMgrO1yJ8NxAAR3jVq0LAk7gqGE7zxB8f2KWxbyeHNip7Qy EewjujA5eYyQ7RtxYnyZjXdL4slYgbyeNGLRMwH5PNASHp9yVyo9drZoZIpNSpIVrvnX t6ImyM7gVtCrKZmbCpOzgC9pxWpXV3/WBqWoBqNiUD6GKp9M8FY/0voGYYd+eetUQ4mz erboGnChhPJJmBfRr1Pqglkmy8h3PLAFn+N5f+9Lc6iC3W4SLVCGqxiOOOSzuKfrOFOv +wVA== X-Gm-Message-State: AMCzsaUmxylW3RYI/giksp7ROFTIR/VYwf7sluYHs0zqeQWGtZM2PCLa wDVqs8Xmi2YnEAb8tJYM6xLoLwoJ1mWdTA== X-Google-Smtp-Source: ABhQp+QmJUmX2upCBBPfDAPh33GKT++bjkdPbit7q7cPBjO7YbxLuGK9xkapyxbqu/hF6nJmB1gEjw== X-Received: by 10.25.38.21 with SMTP id m21mr4209312lfm.95.1508757088570; Mon, 23 Oct 2017 04:11:28 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:27 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:47 +0300 Message-Id: <20171023111057.6328-20-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 19/29] linux-gen, include: switch byteorder.h to api+abi 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" Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 1 + include/odp/api/byteorder.h | 28 ++++++++++++++ platform/linux-generic/Makefile.am | 3 +- .../odp/api/abi/byteorder.h} | 15 +++++--- platform/linux-generic/include/odp/api/byteorder.h | 43 ---------------------- .../include/odp/api/plat/byteorder_inlines.h | 6 +++ platform/linux-generic/odp_byteorder.c | 1 + 7 files changed, 47 insertions(+), 50 deletions(-) create mode 100644 include/odp/api/byteorder.h rename platform/linux-generic/{include/odp/api/plat/byteorder_types.h => include-abi/odp/api/abi/byteorder.h} (84%) delete mode 100644 platform/linux-generic/include/odp/api/byteorder.h -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index d1eb26bc59c2..229f47fc7173 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -8,6 +8,7 @@ odpapiinclude_HEADERS = \ odp/api/atomic.h \ odp/api/barrier.h \ odp/api/buffer.h \ + odp/api/byteorder.h \ odp/api/cpumask.h \ odp/api/event.h \ odp/api/init.h \ diff --git a/include/odp/api/byteorder.h b/include/odp/api/byteorder.h new file mode 100644 index 000000000000..cbb45429943a --- /dev/null +++ b/include/odp/api/byteorder.h @@ -0,0 +1,28 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP byteorder + */ + +#ifndef ODP_API_BYTEORDER_H_ +#define ODP_API_BYTEORDER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 304ca86862f3..966fc13f5c02 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,7 +20,6 @@ odpinclude_HEADERS = \ odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ include/odp/api/align.h \ - include/odp/api/byteorder.h \ include/odp/api/chksum.h \ include/odp/api/classification.h \ include/odp/api/compiler.h \ @@ -47,7 +46,6 @@ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/byteorder_inlines.h \ - include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inlines.h \ @@ -69,6 +67,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/atomic.h \ include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ + include-abi/odp/api/abi/byteorder.h \ include-abi/odp/api/abi/classification.h \ include-abi/odp/api/abi/cpumask.h \ include-abi/odp/api/abi/crypto.h \ diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_types.h b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h similarity index 84% rename from platform/linux-generic/include/odp/api/plat/byteorder_types.h rename to platform/linux-generic/include-abi/odp/api/abi/byteorder.h index 20d52bf8fa6b..0f8fac0b16c8 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h @@ -10,23 +10,25 @@ * ODP byteorder */ -#ifndef ODP_BYTEORDER_TYPES_H_ -#define ODP_BYTEORDER_TYPES_H_ +#ifndef ODP_API_ABI_BYTEORDER_H_ +#define ODP_API_ABI_BYTEORDER_H_ #ifdef __cplusplus extern "C" { #endif +#include + #ifndef __BYTE_ORDER__ -#error __BYTE_ORDER not defined! +#error __BYTE_ORDER__ not defined! #endif #ifndef __ORDER_BIG_ENDIAN__ -#error __BIG_ENDIAN not defined! +#error __ORDER_BIG_ENDIAN__ not defined! #endif #ifndef __ORDER_LITTLE_ENDIAN__ -#error __LITTLE_ENDIAN not defined! +#error __ORDER_LITTLE_ENDIAN__ not defined! #endif /* for use with type checkers such as sparse */ @@ -73,6 +75,9 @@ typedef uint64_t __odp_bitwise odp_u64be_t; typedef uint16_t __odp_bitwise odp_u16sum_t; typedef uint32_t __odp_bitwise odp_u32sum_t; +#include +#include + /** * @} */ diff --git a/platform/linux-generic/include/odp/api/byteorder.h b/platform/linux-generic/include/odp/api/byteorder.h deleted file mode 100644 index ec3d0eef763a..000000000000 --- a/platform/linux-generic/include/odp/api/byteorder.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP byteorder - */ - -#ifndef ODP_PLAT_BYTEORDER_H_ -#define ODP_PLAT_BYTEORDER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include - -/** @ingroup odp_compiler_optim - * @{ - */ - -#include -#if ODP_ABI_COMPAT == 0 -#include -#endif - -/** - * @} - */ - -#include - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h index e7818904b11a..6f3139628ebd 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h @@ -17,6 +17,12 @@ extern "C" { #endif +#ifndef __odp_force +#define __odp_force +#endif + +#include + /** @ingroup odp_compiler_optim * @{ */ diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder.c index a3d1f981e965..faf1c5904bb4 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include #if ODP_ABI_COMPAT == 1 #include #endif From patchwork Mon Oct 23 11:10:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116720 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4549444qgn; Mon, 23 Oct 2017 04:48:29 -0700 (PDT) X-Received: by 10.200.38.118 with SMTP id v51mr19631139qtv.205.1508759309356; Mon, 23 Oct 2017 04:48:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508759309; cv=none; d=google.com; s=arc-20160816; b=c6O6MynSscOdPy02ch+DqvwW4IfIQa3nmHsOVRICZkR3KOkt7O/q0eTsfscDIhDHzL DuLFPb9o5tM2jTUxj5RuqhPN37y2pS3wV7vP5nOB9r/e8BnLWyRq28hONREVUdWnygW7 4UzbNuiPLPIwPS3Cgfr2cAzE2jUZkhsdTOm9lMtinlhipbKwo36FNmbFsgSo7Tb1EzKt yhLFTeaDucTkCArnxFcFSIdp7dT+UEOh3hyo402z+ncq7vG5hLIBxPJpL3ZrkQW0sD20 VjRc2KE3sef3mLS3iCEpG09IpVAWHF7VtjaDSFpQ/uQNsi2OJIJ0wlga4EQPLBaI8PH/ 2DJw== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=H/ttiCev6/dMjzGn5tTz3EUTNjq4x1TeEWH7XHs65ws=; b=HhDXIJ7rCnFoMTk0JRtnUqLbdNKNHU6ZvmkIiRSiMvFtQFfID+Antk39HjU1WDqHXt 7oSdeMxLrc5wtlic2JtJzvOQ299Q50Rkjqv0mKz5n+SZxn6/HTcqY8MD/409uVBzbg4Z GyZPhCxMrXATTU7VeB0aqUf5w6utjV6rqW5j45lvg6yY/danTJoGvvrjsn/fcGSvsxk2 WU2oWMXH38s+DjZw33rNsHRp/6vCNmoNEBHiv3BafSYH+n2j+OKWxzkbCJCBxyoziw0J 1GL7u2lpVwPJ20mO3QZWzxrDxmzZ9UOpad+WHPjURQV7Bj3B/QWaEBzfWuoO1YZFA4we iMBQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id e3si6009352qtc.337.2017.10.23.04.48.29; Mon, 23 Oct 2017 04:48:29 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id EFEC0628BA; Mon, 23 Oct 2017 11:48:28 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 DD51D628BD; Mon, 23 Oct 2017 11:15:18 +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 29D31628A5; Mon, 23 Oct 2017 11:14:45 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id 20A9862299 for ; Mon, 23 Oct 2017 11:11:31 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id a16so19649127lfk.0 for ; Mon, 23 Oct 2017 04:11:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=H/ttiCev6/dMjzGn5tTz3EUTNjq4x1TeEWH7XHs65ws=; b=WxppZpGsPHZvoh8HMr6/kQiajsygKP5oCtcxg5JdJhJnwyqwLlAxK6c1H3ly6oIPeQ 131qgJskYDPKTevPs1LNTOjbLeTATGhYoe0B6vwm8rSynZmh5Co7cu+Tl17OVVDPL1F0 yDY5QFGFkQhk+E4tAfrSWO4E6GLVZjC05ReUviTNUJJVU65asMXdD5djRMGB7XRcbJOC RLfweMhEKzoHdwLD+kXt4DamGvTTkBMtO0DYvMjXJIm/r8tfn/9uBabwYxSkxC/4Zw7x vZk8UMaav8nh3TT3wRzpn+Z/RjDhepUTmZHCScV/fk6SwrE1ATXiJutqY31Zo5aH02nc KxoQ== X-Gm-Message-State: AMCzsaWZi5AORyOe8b1d48Ct2A7uv7S2LWHz1z3fxagBgZLgDhKBMFoM zfb+2lkx5m/vdOdNkUe4Tfn6j0nklrNjxw== X-Google-Smtp-Source: ABhQp+QDup7AbNB4VWceuuMw0g/PMQlvpA0jr2ngDDMjQov+5RCY3jr89MtdqoG50ntkAzgtsgUKBQ== X-Received: by 10.25.222.25 with SMTP id v25mr5075927lfg.154.1508757089589; Mon, 23 Oct 2017 04:11:29 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:28 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:48 +0300 Message-Id: <20171023111057.6328-21-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 20/29] linux-gen, include: switch std_clib.h to api+abi 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" Signed-off-by: Dmitry Eremin-Solenikov --- example/traffic_mgmt/odp_traffic_mgmt.c | 1 + helper/test/linux/process.c | 2 ++ helper/test/linux/pthread.c | 2 ++ helper/threads.c | 1 + include/Makefile.am | 1 + include/odp/api/std_clib.h | 24 ++++++++++++++++++++++ platform/linux-generic/Makefile.am | 2 +- .../odp/api => include-abi/odp/api/abi}/std_clib.h | 17 ++++++++------- .../include/odp/api/plat/std_clib_inlines.h | 1 - platform/linux-generic/odp_std_clib.c | 1 + 10 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 include/odp/api/std_clib.h rename platform/linux-generic/{include/odp/api => include-abi/odp/api/abi}/std_clib.h (60%) -- 2.14.2 diff --git a/example/traffic_mgmt/odp_traffic_mgmt.c b/example/traffic_mgmt/odp_traffic_mgmt.c index 1f1102ddfdaf..e02a1af8dc3f 100644 --- a/example/traffic_mgmt/odp_traffic_mgmt.c +++ b/example/traffic_mgmt/odp_traffic_mgmt.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c index 12504d01bd9f..3ed2032b0c59 100644 --- a/helper/test/linux/process.c +++ b/helper/test/linux/process.c @@ -11,6 +11,8 @@ #include #include +#include + #define NUMBER_WORKERS 16 /* 0 = max */ static void *worker_fn(void *arg ODPH_UNUSED) diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c index a50df027f3f2..0863283d60aa 100644 --- a/helper/test/linux/pthread.c +++ b/helper/test/linux/pthread.c @@ -10,6 +10,8 @@ #include #include +#include + #define NUMBER_WORKERS 16 static void *worker_fn(void *arg ODPH_UNUSED) { diff --git a/helper/threads.c b/helper/threads.c index a83014d424de..32a092825084 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -10,6 +10,7 @@ #define _GNU_SOURCE #endif #include +#include #include #include #include diff --git a/include/Makefile.am b/include/Makefile.am index 229f47fc7173..6b3d12f793a4 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -22,6 +22,7 @@ odpapiinclude_HEADERS = \ odp/api/shared_memory.h \ odp/api/spinlock.h \ odp/api/spinlock_recursive.h \ + odp/api/std_clib.h \ odp/api/std_types.h \ odp/api/thread.h \ odp/api/thrmask.h \ diff --git a/include/odp/api/std_clib.h b/include/odp/api/std_clib.h new file mode 100644 index 000000000000..fde1c1dd3a4a --- /dev/null +++ b/include/odp/api/std_clib.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_API_STD_CLIB_H_ +#define ODP_API_STD_CLIB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include + +#include + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 966fc13f5c02..cdb45d8e0c9a 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -36,7 +36,6 @@ odpapiinclude_HEADERS = \ include/odp/api/packet_io.h \ include/odp/api/packet_io_stats.h \ include/odp/api/random.h \ - include/odp/api/std_clib.h \ include/odp/api/support.h \ include/odp/api/sync.h \ include/odp/api/system_info.h \ @@ -84,6 +83,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/spinlock.h \ include-abi/odp/api/abi/spinlock_recursive.h \ + include-abi/odp/api/abi/std_clib.h \ include-abi/odp/api/abi/std_types.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ diff --git a/platform/linux-generic/include/odp/api/std_clib.h b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h similarity index 60% rename from platform/linux-generic/include/odp/api/std_clib.h rename to platform/linux-generic/include-abi/odp/api/abi/std_clib.h index fea4725437e7..b31034df4705 100644 --- a/platform/linux-generic/include/odp/api/std_clib.h +++ b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h @@ -4,22 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ODP_PLAT_STD_CLIB_H_ -#define ODP_PLAT_STD_CLIB_H_ +/** + * @file + * + * ODP barrier + */ + +#ifndef ODP_API_ABI_STD_CLIB_H_ +#define ODP_API_ABI_STD_CLIB_H_ #ifdef __cplusplus extern "C" { #endif -#include -#include - #include -#if ODP_ABI_COMPAT == 0 #include -#endif - -#include #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h index 8f505d079c33..bb6f9d02b29e 100644 --- a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h @@ -11,7 +11,6 @@ extern "C" { #endif -#include #include _ODP_INLINE void *odp_memcpy(void *dst, const void *src, size_t num) diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib.c index ed7c6446b556..38406b86b3c4 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include #if ODP_ABI_COMPAT == 1 #include #endif From patchwork Mon Oct 23 11:10:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116721 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4556799qgn; Mon, 23 Oct 2017 04:57:50 -0700 (PDT) X-Received: by 10.233.244.1 with SMTP id y1mr19144287qkl.300.1508759870249; Mon, 23 Oct 2017 04:57:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508759870; cv=none; d=google.com; s=arc-20160816; b=BRVoxgGogyWrBNo6tAINKpP2wvWkMZhlFfyyvTzcoOkU9UilcRLwbo9gIJmaATcvtI 1E+6FFpj6df3X79yjSeI42jr+3DvrW1bykK3OGqPFB1+4nyBU3hIyaopwPwyN4fVXNp6 GWb9gOdXYl+BKmF5Up7FGtEOHy6aWPyk2NAx9TdRw7U248zSU6sQT/uYnJMs/j566D31 l5lCSTd6PtlEWLB/uaXStU8CfgM5DKLBYXDP3Az64ph+EYeWaxuwl+z6E2Y/RC1NHM5a iehhXbjWwXKLMojrSotAmddPKX/hEaOtGvLvP/KaA92mfnQYTclJ8E8OWbBHpQ8yB6Ei 1iMA== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=ZVxwDJSSh2bgAELbHteShWbLMDv62lcjGp9Ye/YjQCk=; b=Azq44O14bgu1hB1T7lWo0EaD3dJdQYo8CaEMuckmWsvAmEfskCs9mHH2UfVv3An5DR AT2y/sC0EEhjOXtBVCkYOIwI75mdSugZgmWjSgQYuSiZVZvbghTSLguPudyMxlLcAHU8 viHoJXyC1BQAg70bImKCX75AxbQoxrdf1O6KfBpwbBDtaNyAR1KREhpv3/+TXb8Vau46 R3cpJ2VaAvbASVBoQtUxODrE+vtvXZnyqN3LNkdtkzqrA4683VeAzYIj6GKaUbHzL6TJ tHiXQ5adir4d3fa7KfbC5Ah2HIRHp40MMJKuBNp52Gj2PvkqleNT/RH+o96qzI5fBPom zUEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id k34si968460qtf.93.2017.10.23.04.57.50; Mon, 23 Oct 2017 04:57:50 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E274962907; Mon, 23 Oct 2017 11:57:49 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 8C98C628E9; Mon, 23 Oct 2017 11:15:25 +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 ADF21628B1; Mon, 23 Oct 2017 11:15:05 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.linaro.org (Postfix) with ESMTPS id 0BB186228C for ; Mon, 23 Oct 2017 11:11:32 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id 90so19650712lfs.13 for ; Mon, 23 Oct 2017 04:11:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZVxwDJSSh2bgAELbHteShWbLMDv62lcjGp9Ye/YjQCk=; b=tDSk6EmogjKvVRveH5M4qweU3Lg9AHw+eN0+MGTX6RDL7oLXDuvA/MMRxT0Q/zoCc4 Zqpo8soAh9OnBroLhwrgD5REXWlNbrZiUQ61YMGdQhtDCwT0M1NYv36FVXsSmkksOl+R DUBollegjS9yNz6z+AdvGunFCV48edmsW/XicNVuRVzTdVzHI4xA7wXiR68ht/F3YsBa Oa1mMkinXcLF5uxRe0bIU3RQvPVBjG76cKeyUOwY4dkpTnnVSvE7mXK0RXV1AaltNF9D fDiqNy7KiMk9a5jIA1Fe38sCXB/pUf6mXT/IQG9B3jPc3YbCTROV43qp2bxkEg5oog6l vgXQ== X-Gm-Message-State: AMCzsaVFOUFz/SLzKEBd60/y5QpZ8s2vVoHqK1PXjJBZJcMpqYqQU0vw uonpZI7plpI80VuRMcqliQVN+sVej/z8bg== X-Google-Smtp-Source: ABhQp+TrqUPT5oaIsD22lmnKpkjg9WYLSi/ZZbgkL5Ukfa+IufaBeVYfrMpP9kgm7V0VAy9r7ZsKQQ== X-Received: by 10.25.158.198 with SMTP id h189mr4217478lfe.76.1508757090602; Mon, 23 Oct 2017 04:11:30 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:29 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:49 +0300 Message-Id: <20171023111057.6328-22-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 21/29] linux-gen, include: switch sync.h to api+abi 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" Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 1 + include/odp/api/sync.h | 28 ++++++++++++++++++++++ platform/linux-generic/Makefile.am | 2 +- .../odp/api => include-abi/odp/api/abi}/sync.h | 12 ++++------ platform/linux-generic/odp_sync.c | 1 + 5 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 include/odp/api/sync.h rename platform/linux-generic/{include/odp/api => include-abi/odp/api/abi}/sync.h (63%) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 6b3d12f793a4..4a9c3efe674a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -24,6 +24,7 @@ odpapiinclude_HEADERS = \ odp/api/spinlock_recursive.h \ odp/api/std_clib.h \ odp/api/std_types.h \ + odp/api/sync.h \ odp/api/thread.h \ odp/api/thrmask.h \ odp/api/time.h \ diff --git a/include/odp/api/sync.h b/include/odp/api/sync.h new file mode 100644 index 000000000000..b84289ca8cb6 --- /dev/null +++ b/include/odp/api/sync.h @@ -0,0 +1,28 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP synchronisation + */ + +#ifndef ODP_API_SYNC_H_ +#define ODP_API_SYNC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index cdb45d8e0c9a..69ccd8e0b978 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -37,7 +37,6 @@ odpapiinclude_HEADERS = \ include/odp/api/packet_io_stats.h \ include/odp/api/random.h \ include/odp/api/support.h \ - include/odp/api/sync.h \ include/odp/api/system_info.h \ include/odp/api/ticketlock.h @@ -85,6 +84,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/spinlock_recursive.h \ include-abi/odp/api/abi/std_clib.h \ include-abi/odp/api/abi/std_types.h \ + include-abi/odp/api/abi/sync.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ include-abi/odp/api/abi/time.h \ diff --git a/platform/linux-generic/include/odp/api/sync.h b/platform/linux-generic/include-abi/odp/api/abi/sync.h similarity index 63% rename from platform/linux-generic/include/odp/api/sync.h rename to platform/linux-generic/include-abi/odp/api/abi/sync.h index e1afcc722d07..74e3fb15fef9 100644 --- a/platform/linux-generic/include/odp/api/sync.h +++ b/platform/linux-generic/include-abi/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2015, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -7,11 +7,11 @@ /** * @file * - * ODP synchronisation + * ODP barrier */ -#ifndef ODP_PLAT_SYNC_H_ -#define ODP_PLAT_SYNC_H_ +#ifndef ODP_API_ABI_SYNC_H_ +#define ODP_API_ABI_SYNC_H_ #ifdef __cplusplus extern "C" { @@ -22,16 +22,12 @@ extern "C" { */ #include -#if ODP_ABI_COMPAT == 0 #include -#endif /** * @} */ -#include - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync.c index 7acdc92dd497..a9d2bbe24369 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include #if ODP_ABI_COMPAT == 1 #include #endif From patchwork Mon Oct 23 11:10:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116722 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4558084qgn; Mon, 23 Oct 2017 04:59:23 -0700 (PDT) X-Received: by 10.200.50.45 with SMTP id x42mr18994332qta.114.1508759963354; Mon, 23 Oct 2017 04:59:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508759963; cv=none; d=google.com; s=arc-20160816; b=Lqej9e9bNevMcwSeQbIWJSyQmKXmCI9I2L79yeQZ+cn5mQKbHS6WTCH0Bw6NXklsL6 qtnR8bD3sC7B4WybMDfwc3iHjzHUzAH10eHfTazOx6KM+FGlpK4GRZljH8NnpIRdGvSQ wpdzgE6OiX/4Oc6hOrQJlJk+igXHfOZBCTzKsX89PsDhPNRst7+dzBWlnC7JkkOE+qLy vVqvpowXxMeUSFi17fQpXkF+phx27QK6m2TipXDJed2SGEtL6WbC9CaZbEKR793SmzfY Q4snCkieBS8SS0U7uuoP8ZS1VeAsDupk8FKSSSV1SBo5NhwSVRiqYhRnvK1LC7895SRT rCCA== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=zz/94r/PZjNErBjLdqhkTfgF/oM40LCFm9QsxZpYTjk=; b=RWeqRQHDBuzsA6QmzveE7d5GZPNVV4JE937PeThlN02BBr9V+4m9AjfFKfgMoUOz4t nio/hF5Fe+DAqVLA/HN9UfQ+DT+QjbXw/p9T593bblrA4+1zxesOJ18z1G3lUdn2L6MV 7jt5VR4s7faI7zmMXNxsHiVbQLRGgRq8bIW2G9ceAbXbffcb5osEBnwsvv0NeC81zWw/ QS4AHwgkL30RnAlTG1kyXVdqIqDkHP4nqW9Kq1DW2YMuyCNcNi46yuqxBq7vAuyfhNq3 p2YGNkF05CVTnIhLBjiiQiA4icuGSeCBaUYRUmxJBtfZjXVsaCU0ZyDKF5pduE+gpY2v l/VQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id s27si5939350qtb.370.2017.10.23.04.59.23; Mon, 23 Oct 2017 04:59:23 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 04A3E62978; Mon, 23 Oct 2017 11:59:23 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 ACB90628FA; Mon, 23 Oct 2017 11:15:55 +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 BAD5A628F7; Mon, 23 Oct 2017 11:15:26 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id 21A70618EC for ; Mon, 23 Oct 2017 11:11:33 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id a16so19649263lfk.0 for ; Mon, 23 Oct 2017 04:11:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=zz/94r/PZjNErBjLdqhkTfgF/oM40LCFm9QsxZpYTjk=; b=TTsytySUNt/ab8w86nHZaPlooP+JvgdYv/2VZNV9pNjpxusx3StARGlnLKY6GG04s8 +VNU+Fh/Abao9WGvIAKNKDpMEoj9/1hyfOaKLPt8kPauDG1t5250LFn1yYplgtHuiZ6C mk/1Tuyl+/W5CugPRYj2OPwyopevJ91bdK8EgE39nzja9aRCrM4SOGCkBp8yrX04Qpjg Rn65uN72Iq3lueQx/tKBGdmxnIBYFi0wBfcKwhZDACN5rkF+7sNhsupNA8WUj1kOwccC IrimIzFeBLC4EGOWavDMbVR8soFrUd6HXwwgJWS8ZY4AALnuLmqp2RZFTJZqFcPxA21/ AmeA== X-Gm-Message-State: AMCzsaV1vq7ykXFPZU5KNJ2y8Nk/JtZa49RG6ZXCpKWPxQgd42R/AiSe kjlo9MbmsK11FGybzke7V3MwQHnUuA/7kg== X-Google-Smtp-Source: ABhQp+TCNz8SeXexarqy+cS2LLLGQAGdVXThIpcKywtUxlVIydMsMyNxjFjoCYEMXxV2kAxc9ci8xQ== X-Received: by 10.25.22.28 with SMTP id m28mr4431738lfi.185.1508757091679; Mon, 23 Oct 2017 04:11:31 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:31 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:50 +0300 Message-Id: <20171023111057.6328-23-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 22/29] linux-gen, include: switch ticketlock.h to api+abi 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" Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 1 + .../include => include}/odp/api/ticketlock.h | 11 +++-------- platform/linux-generic/Makefile.am | 7 +++---- .../odp/api/abi/ticketlock.h} | 21 ++++++++++++++++----- .../include/odp/api/plat/ticketlock_inlines.h | 20 -------------------- platform/linux-generic/odp_queue_scalable.c | 1 + platform/linux-generic/odp_ticketlock.c | 4 +++- 7 files changed, 27 insertions(+), 38 deletions(-) rename {platform/linux-generic/include => include}/odp/api/ticketlock.h (54%) rename platform/linux-generic/{include/odp/api/plat/ticketlock_types.h => include-abi/odp/api/abi/ticketlock.h} (52%) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 4a9c3efe674a..617aa4a6e67a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -27,6 +27,7 @@ odpapiinclude_HEADERS = \ odp/api/sync.h \ odp/api/thread.h \ odp/api/thrmask.h \ + odp/api/ticketlock.h \ odp/api/time.h \ odp/api/timer.h \ odp/api/traffic_mngr.h \ diff --git a/platform/linux-generic/include/odp/api/ticketlock.h b/include/odp/api/ticketlock.h similarity index 54% rename from platform/linux-generic/include/odp/api/ticketlock.h rename to include/odp/api/ticketlock.h index ca12cc37cf9f..d875c0e34e76 100644 --- a/platform/linux-generic/include/odp/api/ticketlock.h +++ b/include/odp/api/ticketlock.h @@ -10,19 +10,14 @@ * ODP ticketlock */ -#ifndef ODP_PLAT_TICKETLOCK_H_ -#define ODP_PLAT_TICKETLOCK_H_ +#ifndef ODP_API_TICKETLOCK_H_ +#define ODP_API_TICKETLOCK_H_ #ifdef __cplusplus extern "C" { #endif -#include - -#include -#if ODP_ABI_COMPAT == 0 -#include -#endif +#include #include diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 69ccd8e0b978..3aee7ce6340e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -37,8 +37,7 @@ odpapiinclude_HEADERS = \ include/odp/api/packet_io_stats.h \ include/odp/api/random.h \ include/odp/api/support.h \ - include/odp/api/system_info.h \ - include/odp/api/ticketlock.h + include/odp/api/system_info.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ @@ -53,8 +52,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/ticketlock_inlines.h \ - include/odp/api/plat/ticketlock_inlines_api.h \ - include/odp/api/plat/ticketlock_types.h + include/odp/api/plat/ticketlock_inlines_api.h nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h @@ -87,6 +85,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/sync.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ + include-abi/odp/api/abi/ticketlock.h \ include-abi/odp/api/abi/time.h \ include-abi/odp/api/abi/timer.h \ include-abi/odp/api/abi/traffic_mngr.h \ diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_types.h b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h similarity index 52% rename from platform/linux-generic/include/odp/api/plat/ticketlock_types.h rename to platform/linux-generic/include-abi/odp/api/abi/ticketlock.h index 81d479d61a61..958184be6907 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h @@ -11,8 +11,8 @@ * ODP ticketlock */ -#ifndef ODP_TICKETLOCK_TYPES_H_ -#define ODP_TICKETLOCK_TYPES_H_ +#ifndef ODP_API_ABI_TICKETLOCK_H_ +#define ODP_API_ABI_TICKETLOCK_H_ #ifdef __cplusplus extern "C" { @@ -20,13 +20,24 @@ extern "C" { #include +/** @ingroup odp_locks + * @{ + */ + /** @internal */ -struct odp_ticketlock_s { +typedef struct odp_ticketlock_s { odp_atomic_u32_t next_ticket; /**< Next ticket */ odp_atomic_u32_t cur_ticket; /**< Current ticket */ -}; +} odp_ticketlock_t; + +/* Include inlined versions of API functions */ +#include +#include +#include -typedef struct odp_ticketlock_s odp_ticketlock_t; +/** + * @} + */ #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index ecbea7c4d611..185d77de015f 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -14,10 +14,6 @@ #define _ODP_PLAT_TICKETLOCK_INLINES_H_ #include -#include -#include - -#include /** @internal * Acquire ticket lock. @@ -111,20 +107,4 @@ static inline int _odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) odp_atomic_load_u32(&ticketlock->next_ticket); } -/* Include inlined versions of API functions */ -#include -#if ODP_ABI_COMPAT == 0 - -/** @ingroup odp_locks - * @{ - */ - -#include - -/** - * @} - */ - -#endif - #endif diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 07201ce7b5f7..09413e80314e 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c index 0c94f8ae2fa3..59431620f203 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock.c @@ -6,8 +6,9 @@ #include "config.h" +#include + #include -#include void odp_ticketlock_init(odp_ticketlock_t *ticketlock) { @@ -16,6 +17,7 @@ void odp_ticketlock_init(odp_ticketlock_t *ticketlock) } /* Include non-inlined versions of API functions */ +#include #if ODP_ABI_COMPAT == 1 #include #endif From patchwork Mon Oct 23 11:10:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116723 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4560000qgn; Mon, 23 Oct 2017 05:01:02 -0700 (PDT) X-Received: by 10.237.37.76 with SMTP id w12mr19147095qtc.201.1508760062361; Mon, 23 Oct 2017 05:01:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508760062; cv=none; d=google.com; s=arc-20160816; b=aLhTYzIH66F0CdKkAOMJbQL3+yMUyWu74fB2OFzachJ0YK8jHrHZCI8CKvmdblAbMV 0Lp5hPIUpk+NpfZ2w+CHIN1ptdb2GhOtiVLKg+U7NyuhNnDB1P7XtGnLQY2xauzD7ItV xh13AGsfq45ysOsa0OtRDtoWnFtz0j/JC+WtpDn4Pk/OkWSfzpLuoi73LRzjVda80vww YoKeNjTAR+BYdUTz0d7tjEnoCQPQnn4luJqCT5o0/yOaKfIUSfmngffRsA74s/EXvLY7 xUGYY4gU6dN3mTxyvE35/mM7DeNvuMM8vElXmU7gLdo4fcr8jeFYLN/wMGozbMiw8dMn FdEw== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=Bcwx75+M3+lsP1dr7t94AdzR1iq4F1UAHx4E7xvO1fc=; b=G96B5ev5GWAoY7AoyHYdySMM324SbzAtAIufUmW/Q+PCJA6gWUcyse4VWsGWD7wqhu wp8GPND/LLjzZvwqYlrQLpxzOO+IdBF8inMIBGgiBv+1WLAzLZHwEdKXWhynHhe8rUZ9 P1Cak+/Qk9Afjf+um2KHRKUM7Fis27nGkhlftjsJpybgx4qcxzZ05BPZobX4VZ2ipMED oHFeZXdt9vYWCNIxGNhueVfIjpz+Y7CKFH3Jvch3uhRAHvVEUYfuOZMfWd2g3SQ7diPD uOSsIzPDsHARQlQAIaIoc4qZT/fsZhSiAk4UT/iymwtmprXMYK/1Ln55fBuHBKLhuH74 yRCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id a67si5815305qkf.101.2017.10.23.05.01.02; Mon, 23 Oct 2017 05:01:02 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id F14476298C; Mon, 23 Oct 2017 12:01:01 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 3787B62909; Mon, 23 Oct 2017 11:16:13 +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 B187A62907; Mon, 23 Oct 2017 11:15:58 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id 45A926204C for ; Mon, 23 Oct 2017 11:11:34 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id 75so19658705lfx.1 for ; Mon, 23 Oct 2017 04:11:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Bcwx75+M3+lsP1dr7t94AdzR1iq4F1UAHx4E7xvO1fc=; b=MLBudenn72IBEs/8Ko4QExUQVXDmCOZjNeXHikGPwFB57ZtP0jcS7rH23Y2/8rogNw SVY1HQQ5iC+31HnCGtdjUd4DwsLUHnfx/VWdRcYTzl+xUF8zX9TSjtnbl/BVi+Kg4obq sluIoRJgvXDS6bcuH+w4hjia+LTVSh9SC69dczicKub+AWRPqGc3ROL23bEI/ZeihyOL hCEcPX+3BmK1xmWCa3ku7otjojxZcCh2PEMCwhfwwdKrGwqLcO0J5EhfuALnMmiAUW3O PlFATrbMobJFoyqveQiVwUfK2lGpT+JtRKSqjTURc2yf/V/NqBcgVliklG2aRpuCEHxN E5cw== X-Gm-Message-State: AMCzsaX+xZhAf8AE3uRj873e2Hu0Ytr3VxPBfdc2F4A4n6/twHhoZUDe zFjuufrIZ06sOZuaHSZ8ZukukGFB9yPUzw== X-Google-Smtp-Source: ABhQp+Sme7dIhhapIbbvTCdA7uZkCJbFxCKU5pS1BrjSHPwuEGPWPawGVw+EcbQnk77AqxmW31ZL4g== X-Received: by 10.25.162.140 with SMTP id l134mr4264770lfe.126.1508757092705; Mon, 23 Oct 2017 04:11:32 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:32 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:51 +0300 Message-Id: <20171023111057.6328-24-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 23/29] linux-gen, include: move more headers from platform to generic 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" Move more generic headers from platform include dir to common include dir. Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 10 ++++++++++ {platform/linux-generic/include => include}/odp/api/chksum.h | 12 ++---------- .../linux-generic/include => include}/odp/api/compiler.h | 12 ++---------- .../linux-generic/include => include}/odp/api/deprecated.h | 4 ++-- {platform/linux-generic/include => include}/odp/api/errno.h | 5 ++--- .../linux-generic/include => include}/odp/api/feature.h | 12 ++---------- {platform/linux-generic/include => include}/odp/api/hash.h | 12 ++---------- {platform/linux-generic/include => include}/odp/api/hints.h | 12 ++---------- {platform/linux-generic/include => include}/odp/api/random.h | 12 ++---------- .../linux-generic/include => include}/odp/api/support.h | 12 ++---------- .../linux-generic/include => include}/odp/api/system_info.h | 5 ++--- platform/linux-generic/Makefile.am | 12 +----------- 12 files changed, 31 insertions(+), 89 deletions(-) rename {platform/linux-generic/include => include}/odp/api/chksum.h (72%) rename {platform/linux-generic/include => include}/odp/api/compiler.h (69%) rename {platform/linux-generic/include => include}/odp/api/deprecated.h (82%) rename {platform/linux-generic/include => include}/odp/api/errno.h (83%) rename {platform/linux-generic/include => include}/odp/api/feature.h (71%) rename {platform/linux-generic/include => include}/odp/api/hash.h (72%) rename {platform/linux-generic/include => include}/odp/api/hints.h (70%) rename {platform/linux-generic/include => include}/odp/api/random.h (70%) rename {platform/linux-generic/include => include}/odp/api/support.h (73%) rename {platform/linux-generic/include => include}/odp/api/system_info.h (82%) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 617aa4a6e67a..addf4bc92261 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -9,12 +9,20 @@ odpapiinclude_HEADERS = \ odp/api/barrier.h \ odp/api/buffer.h \ odp/api/byteorder.h \ + odp/api/chksum.h \ + odp/api/compiler.h \ odp/api/cpumask.h \ + odp/api/deprecated.h \ + odp/api/errno.h \ odp/api/event.h \ + odp/api/feature.h \ + odp/api/hash.h \ + odp/api/hints.h \ odp/api/init.h \ odp/api/ipsec.h \ odp/api/pool.h \ odp/api/queue.h \ + odp/api/random.h \ odp/api/rwlock.h \ odp/api/rwlock_recursive.h \ odp/api/schedule.h \ @@ -24,7 +32,9 @@ odpapiinclude_HEADERS = \ odp/api/spinlock_recursive.h \ odp/api/std_clib.h \ odp/api/std_types.h \ + odp/api/support.h \ odp/api/sync.h \ + odp/api/system_info.h \ odp/api/thread.h \ odp/api/thrmask.h \ odp/api/ticketlock.h \ diff --git a/platform/linux-generic/include/odp/api/chksum.h b/include/odp/api/chksum.h similarity index 72% rename from platform/linux-generic/include/odp/api/chksum.h rename to include/odp/api/chksum.h index 18dcb6d11cb9..6dd1554ce48d 100644 --- a/platform/linux-generic/include/odp/api/chksum.h +++ b/include/odp/api/chksum.h @@ -10,21 +10,13 @@ * ODP checksum functions */ -#ifndef ODP_PLAT_CHKSUM_H_ -#define ODP_PLAT_CHKSUM_H_ +#ifndef ODP_API_CHKSUM_H_ +#define ODP_API_CHKSUM_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_chksum - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/compiler.h b/include/odp/api/compiler.h similarity index 69% rename from platform/linux-generic/include/odp/api/compiler.h rename to include/odp/api/compiler.h index 5249d5d6264b..04e815bb0fa5 100644 --- a/platform/linux-generic/include/odp/api/compiler.h +++ b/include/odp/api/compiler.h @@ -10,21 +10,13 @@ * Compiler related */ -#ifndef ODP_PLAT_COMPILER_H_ -#define ODP_PLAT_COMPILER_H_ +#ifndef ODP_API_COMPILER_H_ +#define ODP_API_COMPILER_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/deprecated.h b/include/odp/api/deprecated.h similarity index 82% rename from platform/linux-generic/include/odp/api/deprecated.h rename to include/odp/api/deprecated.h index 82797ebc4505..881f23d1975f 100644 --- a/platform/linux-generic/include/odp/api/deprecated.h +++ b/include/odp/api/deprecated.h @@ -10,8 +10,8 @@ * Control deprecated API definitions */ -#ifndef ODP_PLAT_DEPRECATED_H_ -#define ODP_PLAT_DEPRECATED_H_ +#ifndef ODP_API_DEPRECATED_H_ +#define ODP_API_DEPRECATED_H_ #ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/errno.h b/include/odp/api/errno.h similarity index 83% rename from platform/linux-generic/include/odp/api/errno.h rename to include/odp/api/errno.h index f70d84df0112..420d5d078339 100644 --- a/platform/linux-generic/include/odp/api/errno.h +++ b/include/odp/api/errno.h @@ -10,14 +10,13 @@ * ODP errno API */ -#ifndef ODP_PLAT_ERRNO_H_ -#define ODP_PLAT_ERRNO_H_ +#ifndef ODP_API_ERRNO_H_ +#define ODP_API_ERRNO_H_ #ifdef __cplusplus extern "C" { #endif - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/feature.h b/include/odp/api/feature.h similarity index 71% rename from platform/linux-generic/include/odp/api/feature.h rename to include/odp/api/feature.h index 55a86a831084..6bbde3c3831a 100644 --- a/platform/linux-generic/include/odp/api/feature.h +++ b/include/odp/api/feature.h @@ -10,21 +10,13 @@ * ODP features. */ -#ifndef ODP_PLAT_FEATURE_H_ -#define ODP_PLAT_FEATURE_H_ +#ifndef ODP_API_FEATURE_H_ +#define ODP_API_FEATURE_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_feature - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/hash.h b/include/odp/api/hash.h similarity index 72% rename from platform/linux-generic/include/odp/api/hash.h rename to include/odp/api/hash.h index 332029ed0a24..8e1699ccce67 100644 --- a/platform/linux-generic/include/odp/api/hash.h +++ b/include/odp/api/hash.h @@ -10,21 +10,13 @@ * ODP Hash function */ -#ifndef ODP_PLAT_HASH_H_ -#define ODP_PLAT_HASH_H_ +#ifndef ODP_API_HASH_H_ +#define ODP_API_HASH_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_hash - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/hints.h b/include/odp/api/hints.h similarity index 70% rename from platform/linux-generic/include/odp/api/hints.h rename to include/odp/api/hints.h index 3ba1ba95ed4f..c4d134b74818 100644 --- a/platform/linux-generic/include/odp/api/hints.h +++ b/include/odp/api/hints.h @@ -10,21 +10,13 @@ * ODP compiler hints */ -#ifndef ODP_PLAT_HINTS_H_ -#define ODP_PLAT_HINTS_H_ +#ifndef ODP_API_HINTS_H_ +#define ODP_API_HINTS_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/random.h b/include/odp/api/random.h similarity index 70% rename from platform/linux-generic/include/odp/api/random.h rename to include/odp/api/random.h index c8529b3f9b9a..4ce973840cd7 100644 --- a/platform/linux-generic/include/odp/api/random.h +++ b/include/odp/api/random.h @@ -10,21 +10,13 @@ * ODP random number API */ -#ifndef ODP_PLAT_RANDOM_H_ -#define ODP_PLAT_RANDOM_H_ +#ifndef ODP_API_RANDOM_H_ +#define ODP_API_RANDOM_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_random ODP RANDOM - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/support.h b/include/odp/api/support.h similarity index 73% rename from platform/linux-generic/include/odp/api/support.h rename to include/odp/api/support.h index dd6abab23a29..6c1759d4b8f6 100644 --- a/platform/linux-generic/include/odp/api/support.h +++ b/include/odp/api/support.h @@ -10,21 +10,13 @@ * ODP support API - platform specific header */ -#ifndef ODP_PLAT_SUPPORT_H_ -#define ODP_PLAT_SUPPORT_H_ +#ifndef ODP_API_SUPPORT_H_ +#define ODP_API_SUPPORT_H_ #ifdef __cplusplus extern "C" { #endif -/** @ingroup odp_support - * @{ - */ - -/** - * @} - */ - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/system_info.h b/include/odp/api/system_info.h similarity index 82% rename from platform/linux-generic/include/odp/api/system_info.h rename to include/odp/api/system_info.h index 36ddc814b4c0..7b95a876affa 100644 --- a/platform/linux-generic/include/odp/api/system_info.h +++ b/include/odp/api/system_info.h @@ -10,8 +10,8 @@ * ODP system information */ -#ifndef ODP_PLAT_SYSTEM_INFO_H_ -#define ODP_PLAT_SYSTEM_INFO_H_ +#ifndef ODP_API_SYSTEM_INFO_H_ +#define ODP_API_SYSTEM_INFO_H_ #ifdef __cplusplus extern "C" { @@ -19,7 +19,6 @@ extern "C" { #include - #include #ifdef __cplusplus diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 3aee7ce6340e..14b449ea42c1 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,24 +20,14 @@ odpinclude_HEADERS = \ odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ include/odp/api/align.h \ - include/odp/api/chksum.h \ include/odp/api/classification.h \ - include/odp/api/compiler.h \ include/odp/api/cpu.h \ include/odp/api/crypto.h \ include/odp/api/debug.h \ - include/odp/api/deprecated.h \ - include/odp/api/errno.h \ - include/odp/api/feature.h \ - include/odp/api/hash.h \ - include/odp/api/hints.h \ include/odp/api/packet_flags.h \ include/odp/api/packet.h \ include/odp/api/packet_io.h \ - include/odp/api/packet_io_stats.h \ - include/odp/api/random.h \ - include/odp/api/support.h \ - include/odp/api/system_info.h + include/odp/api/packet_io_stats.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ From patchwork Mon Oct 23 11:10:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116724 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4561621qgn; Mon, 23 Oct 2017 05:02:12 -0700 (PDT) X-Received: by 10.55.17.33 with SMTP id b33mr18523297qkh.58.1508760132271; Mon, 23 Oct 2017 05:02:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508760132; cv=none; d=google.com; s=arc-20160816; b=arN/g2Y6ptjrU038iTz6M2mQSfdVCwv2wgpl2327poncBIzusd/tnm7wf4p2QOF9Nn aYobFYRmPiFjpOrGzDpT1rISWRerNDZhiICCoUdn6IQOZOeFYoQd18kvGk4zsX/amQd7 1DkckPnqV+vpGOW/JYGAAyK8cINZc5P7UR/eBpOEsPPYRKOuu13fGdSgaFGKu/FTCDq4 +HD/AjAlvM7D2d7i2J1OhbYe0icZJ8PnjiMeYo5RgC8FPpkQSDTzfGZVfNfF9E4FaK3q nw+4LnfEUVD3kLTKg00L3+OsW619VByXSsRZUtdRUexsRL1HsWGyLGASEOunfZE75yCW ashg== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=9nrZOKq5Ztx8TGZ2+3aTNV6pZZdRlYW/TjSwlcUE1+Q=; b=RMu/gwgCZMiiwl94BuzRg2a7yskyoHDMNZPRKgrOsel9M5R2Ny50UQSWSTnp9uIyd6 pHZdeDadQzYP9Xs9VHWk3d9jmxVkyyq/4sjgTJB226D1PPkJe6vcqZuSFl6EuTvr9UOI MAAg5FzxynN9ivYdalYbFneSIP8yoVABFQum8bTr0hBCW8wwXViqcXPPpiAlpWzhbKbO f2SvbUl7B0KkOKWC1xY3Nq6Z7rzMjM8WUAQWVYKs0H8a/zINxxfe1Dcsb/rXKFaEzaj4 Pot2/+2wGl8nyY6cDh+z18WoYaygvM+3/BxmJChUTo+lWjnmHLE3foUNDAfKqI02bEWw RI6w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id t204si826173qke.42.2017.10.23.05.02.12; Mon, 23 Oct 2017 05:02:12 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E95FC61617; Mon, 23 Oct 2017 12:02: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=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 7E6CB6290B; Mon, 23 Oct 2017 11:16:27 +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 6DFE06228A; Mon, 23 Oct 2017 11:16:19 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id 743B86228A for ; Mon, 23 Oct 2017 11:11:35 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id 90so19650875lfs.13 for ; Mon, 23 Oct 2017 04:11:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=9nrZOKq5Ztx8TGZ2+3aTNV6pZZdRlYW/TjSwlcUE1+Q=; b=B0TaLrDrn1kztG4YxwzhNmf2Wmg2/m49mvLY/IQRevbtPpuZypkTglyqtMHNADCHsA D+D9TtoC0xyCdOl5Br08YniXlY48APTGvJs7o6FwIzzPvQU8FYMyIWG3EX5y8jefliNT At0tKSaZxXrMDnnawM7WdgzRISBcdv/Lf4OEx6rzWXYHVUvC/Y/nvhZ+INklzRYPcHZe yn5Fm503aJMUgtULuo3IG2mqDzEyF9H3kDWzoH4oRMeygUad8KhTVXgSyQGFcJTFYDXp IBuwOy6Fd77WNs9LQMlHsMxY/75DUB2ua+gyvp1XM66ZgDjCBxkoZRBnQq8//07BeIV4 K4qA== X-Gm-Message-State: AMCzsaX/005TBKGHOGIwHo7dnsEWu8RBkxglDu+ybVx5cer4BpltnhlO ZRxTAwfoN/OBB9RVVkKPiYdFiyNUqh81Ww== X-Google-Smtp-Source: ABhQp+Sk7psL44KClfygcLWw15w9KheA9HrzFiOkF9Oj1MfybggLSsNyjdyf/y534DezqCPe7pWKrw== X-Received: by 10.46.58.17 with SMTP id h17mr5289275lja.194.1508757093926; Mon, 23 Oct 2017 04:11:33 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:33 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:52 +0300 Message-Id: <20171023111057.6328-25-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 24/29] linux-gen, include: switch packet headers to api+abi 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" Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 6 ++ .../include => include}/odp/api/classification.h | 2 +- .../include => include}/odp/api/crypto.h | 2 +- .../include => include}/odp/api/packet.h | 11 +--- .../include => include}/odp/api/packet_flags.h | 9 +-- .../include => include}/odp/api/packet_io.h | 6 +- .../include => include}/odp/api/packet_io_stats.h | 4 +- platform/linux-generic/Makefile.am | 12 ++-- .../linux-generic/include-abi/odp/api/abi/packet.h | 68 ++++++++++++++++++++++ .../include-abi/odp/api/abi/packet_flags.h | 27 +++++++++ .../include/odp/api/plat/packet_flag_inlines.h | 19 +----- .../plat/{packet_types.h => packet_inline_types.h} | 53 +---------------- .../include/odp/api/plat/packet_inlines.h | 27 +++------ .../linux-generic/include/odp_packet_internal.h | 3 +- platform/linux-generic/odp_packet.c | 2 +- platform/linux-generic/pktio/dpdk.c | 2 +- platform/linux-generic/pktio/netmap.c | 2 +- 17 files changed, 136 insertions(+), 119 deletions(-) rename {platform/linux-generic/include => include}/odp/api/classification.h (93%) rename {platform/linux-generic/include => include}/odp/api/crypto.h (92%) rename {platform/linux-generic/include => include}/odp/api/packet.h (67%) rename {platform/linux-generic/include => include}/odp/api/packet_flags.h (59%) rename {platform/linux-generic/include => include}/odp/api/packet_io.h (83%) rename {platform/linux-generic/include => include}/odp/api/packet_io_stats.h (79%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/packet.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/packet_flags.h rename platform/linux-generic/include/odp/api/plat/{packet_types.h => packet_inline_types.h} (76%) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index addf4bc92261..4ef4d89185d0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -10,8 +10,10 @@ odpapiinclude_HEADERS = \ odp/api/buffer.h \ odp/api/byteorder.h \ odp/api/chksum.h \ + odp/api/classification.h \ odp/api/compiler.h \ odp/api/cpumask.h \ + odp/api/crypto.h \ odp/api/deprecated.h \ odp/api/errno.h \ odp/api/event.h \ @@ -20,6 +22,10 @@ odpapiinclude_HEADERS = \ odp/api/hints.h \ odp/api/init.h \ odp/api/ipsec.h \ + odp/api/packet.h \ + odp/api/packet_flags.h \ + odp/api/packet_io.h \ + odp/api/packet_io_stats.h \ odp/api/pool.h \ odp/api/queue.h \ odp/api/random.h \ diff --git a/platform/linux-generic/include/odp/api/classification.h b/include/odp/api/classification.h similarity index 93% rename from platform/linux-generic/include/odp/api/classification.h rename to include/odp/api/classification.h index 01be7063d102..ecdf92031d0a 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/include/odp/api/classification.h @@ -20,7 +20,7 @@ extern "C" { #include #include #include -#include +#include #include #include diff --git a/platform/linux-generic/include/odp/api/crypto.h b/include/odp/api/crypto.h similarity index 92% rename from platform/linux-generic/include/odp/api/crypto.h rename to include/odp/api/crypto.h index ead28eab0bfc..3f4104677201 100644 --- a/platform/linux-generic/include/odp/api/crypto.h +++ b/include/odp/api/crypto.h @@ -18,7 +18,7 @@ extern "C" { #endif #include -#include +#include #include #include #include diff --git a/platform/linux-generic/include/odp/api/packet.h b/include/odp/api/packet.h similarity index 67% rename from platform/linux-generic/include/odp/api/packet.h rename to include/odp/api/packet.h index 5d744df544d6..88c4f0278c84 100644 --- a/platform/linux-generic/include/odp/api/packet.h +++ b/include/odp/api/packet.h @@ -10,8 +10,8 @@ * ODP packet descriptor */ -#ifndef ODP_PLAT_PACKET_H_ -#define ODP_PLAT_PACKET_H_ +#ifndef ODP_API_PACKET_H_ +#define ODP_API_PACKET_H_ #ifdef __cplusplus extern "C" { @@ -20,15 +20,10 @@ extern "C" { #include #include #include -#include +#include #include #include -#include -#if ODP_ABI_COMPAT == 0 -#include -#endif - #include #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/packet_flags.h b/include/odp/api/packet_flags.h similarity index 59% rename from platform/linux-generic/include/odp/api/packet_flags.h rename to include/odp/api/packet_flags.h index 1e55af823736..2b3006b5192c 100644 --- a/platform/linux-generic/include/odp/api/packet_flags.h +++ b/include/odp/api/packet_flags.h @@ -10,17 +10,14 @@ * ODP packet flags */ -#ifndef ODP_PLAT_PACKET_FLAGS_H_ -#define ODP_PLAT_PACKET_FLAGS_H_ +#ifndef ODP_API_PACKET_FLAGS_H_ +#define ODP_API_PACKET_FLAGS_H_ #ifdef __cplusplus extern "C" { #endif -#include -#if ODP_ABI_COMPAT == 0 -#include -#endif +#include #include diff --git a/platform/linux-generic/include/odp/api/packet_io.h b/include/odp/api/packet_io.h similarity index 83% rename from platform/linux-generic/include/odp/api/packet_io.h rename to include/odp/api/packet_io.h index 9107685a36dc..a854d7b987b0 100644 --- a/platform/linux-generic/include/odp/api/packet_io.h +++ b/include/odp/api/packet_io.h @@ -10,8 +10,8 @@ * ODP Packet IO */ -#ifndef ODP_PLAT_PACKET_IO_H_ -#define ODP_PLAT_PACKET_IO_H_ +#ifndef ODP_API_PACKET_IO_H_ +#define ODP_API_PACKET_IO_H_ #ifdef __cplusplus extern "C" { @@ -20,7 +20,7 @@ extern "C" { #include #include #include -#include +#include #include #include diff --git a/platform/linux-generic/include/odp/api/packet_io_stats.h b/include/odp/api/packet_io_stats.h similarity index 79% rename from platform/linux-generic/include/odp/api/packet_io_stats.h rename to include/odp/api/packet_io_stats.h index a9cd9535e610..b2b32075ea22 100644 --- a/platform/linux-generic/include/odp/api/packet_io_stats.h +++ b/include/odp/api/packet_io_stats.h @@ -10,8 +10,8 @@ * ODP packet IO stats */ -#ifndef ODP_PLAT_PACKET_IO_STATS_H_ -#define ODP_PLAT_PACKET_IO_STATS_H_ +#ifndef ODP_API_PACKET_IO_STATS_H_ +#define ODP_API_PACKET_IO_STATS_H_ #ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 14b449ea42c1..f2454ac51fff 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,14 +20,8 @@ odpinclude_HEADERS = \ odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ include/odp/api/align.h \ - include/odp/api/classification.h \ include/odp/api/cpu.h \ - include/odp/api/crypto.h \ - include/odp/api/debug.h \ - include/odp/api/packet_flags.h \ - include/odp/api/packet.h \ - include/odp/api/packet_io.h \ - include/odp/api/packet_io_stats.h + include/odp/api/debug.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ @@ -35,9 +29,9 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ + include/odp/api/plat/packet_inline_types.h \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ - include/odp/api/plat/packet_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ @@ -60,6 +54,8 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/event.h \ include-abi/odp/api/abi/init.h \ include-abi/odp/api/abi/ipsec.h \ + include-abi/odp/api/abi/packet.h \ + include-abi/odp/api/abi/packet_flags.h \ include-abi/odp/api/abi/packet_io.h \ include-abi/odp/api/abi/pool.h \ include-abi/odp/api/abi/queue.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h new file mode 100644 index 000000000000..31d446f8dd9f --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -0,0 +1,68 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet descriptor + */ + +#ifndef ODP_API_ABI_PACKET_H_ +#define ODP_API_ABI_PACKET_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +/** @ingroup odp_packet + * @{ + */ + +typedef ODP_HANDLE_T(odp_packet_t); + +#define ODP_PACKET_INVALID _odp_cast_scalar(odp_packet_t, 0) + +#define ODP_PACKET_OFFSET_INVALID 0xffff + +typedef uint8_t odp_packet_seg_t; + +static inline uint8_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) +{ + return (uint8_t)seg; +} + +static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) +{ + return (odp_packet_seg_t)ndx; +} + +#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) + +typedef enum { + ODP_PACKET_GREEN = 0, + ODP_PACKET_YELLOW = 1, + ODP_PACKET_RED = 2, + ODP_PACKET_ALL_COLORS = 3, +} odp_packet_color_t; + +#define ODP_NUM_PACKET_COLORS 3 + +#include +#include +#include + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h new file mode 100644 index 000000000000..9a8474a33eda --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet descriptor + */ + +#ifndef ODP_API_ABI_PACKET_FLAGS_H_ +#define ODP_API_ABI_PACKET_FLAGS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index 42003e3179ea..3212248f336c 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -13,7 +13,8 @@ #ifndef _ODP_PLAT_PACKET_FLAG_INLINES_H_ #define _ODP_PLAT_PACKET_FLAG_INLINES_H_ -#include +#include +#include #include /** @internal Inline function offsets */ @@ -70,20 +71,4 @@ static inline int _odp_packet_has_ts(odp_packet_t pkt) return flags.timestamp; } -/* Include inlined versions of API functions */ -#include -#if ODP_ABI_COMPAT == 0 - -/** @ingroup odp_packet - * @{ - */ - -#include - -/** - * @} - */ - -#endif - #endif diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h similarity index 76% rename from platform/linux-generic/include/odp/api/plat/packet_types.h rename to platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 68c66312b2f3..0bfd0241331a 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -11,61 +11,14 @@ * ODP packet descriptor */ -#ifndef ODP_PACKET_TYPES_H_ -#define ODP_PACKET_TYPES_H_ +#ifndef ODP_PACKET_INLINE_TYPES_H_ +#define ODP_PACKET_INLINE_TYPES_H_ #ifdef __cplusplus extern "C" { #endif -#include - -#include -#if ODP_ABI_COMPAT == 1 -#include -#else - -#include -#include - -/** @ingroup odp_packet - * @{ - */ - -typedef ODP_HANDLE_T(odp_packet_t); - -#define ODP_PACKET_INVALID _odp_cast_scalar(odp_packet_t, 0) - -#define ODP_PACKET_OFFSET_INVALID 0xffff - -typedef uint8_t odp_packet_seg_t; - -static inline uint8_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) -{ - return (uint8_t)seg; -} - -static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) -{ - return (odp_packet_seg_t)ndx; -} - -#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) - -typedef enum { - ODP_PACKET_GREEN = 0, - ODP_PACKET_YELLOW = 1, - ODP_PACKET_RED = 2, - ODP_PACKET_ALL_COLORS = 3, -} odp_packet_color_t; - -#define ODP_NUM_PACKET_COLORS 3 - -/** - * @} - */ - -#endif +#include /** @internal Packet field accessor */ #define _odp_pkt_get(pkt, cast, field) \ diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index bfd65cbf1068..48475ba823e8 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -13,16 +13,21 @@ #ifndef _ODP_PLAT_PACKET_INLINES_H_ #define _ODP_PLAT_PACKET_INLINES_H_ -#include -#include +#include #include -#include +#include #include +#include +#include + +#include /** @internal Inline function offsets */ extern const _odp_packet_inline_offset_t _odp_packet_inline; +#include #if ODP_ABI_COMPAT == 1 +#include /** @internal Inline function @param seg @return */ static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) { @@ -164,20 +169,4 @@ static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) return (odp_buffer_t)pkt; } -/* Include inlined versions of API functions */ -#include -#if ODP_ABI_COMPAT == 0 - -/** @ingroup odp_packet - * @{ - */ - -#include - -/** - * @} - */ - -#endif - #endif diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index fed562aa3409..db4864ff0b5e 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -23,11 +23,12 @@ extern "C" { #include #include #include +#include #include #include #include #include -#include +#include #include /** Minimum segment length expected by packet_parse_common() */ diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 603ac7181dea..ada02faec018 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -6,8 +6,8 @@ #include "config.h" -#include #include +#include #include #include #include diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 1a930a487abf..28b4d25d282f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -17,8 +17,8 @@ #include -#include #include +#include #include #include diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 812416b2fc94..1473d0b8030a 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -10,8 +10,8 @@ #include -#include #include +#include #include #include From patchwork Mon Oct 23 11:10:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116725 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4564556qgn; Mon, 23 Oct 2017 05:04:25 -0700 (PDT) X-Received: by 10.200.35.42 with SMTP id a39mr19846715qta.9.1508760265524; Mon, 23 Oct 2017 05:04:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508760265; cv=none; d=google.com; s=arc-20160816; b=XRqSydbLq2dilnYWPkhWWMZ21gody/27Yk6RW1fIx2iYten2AYiHoguu0Xoy+IS9DT yMJoxHglc0505DUpGN0WjZu04kWAnd4kFoxRuFJQAnJ8hS8NiO0Y60nlJzqUSp9JEosh avuW8Zc3I+/BRu5yejcjjPdTJeF6Fcw+AXnyyojBIzLq0Lg2a0i/tla0tYeeJHIjTkdj XJKurJ9/+kEqLO8/RHiannsy+v2h5YH/cLhFl/Qzc+BmyGcrVIVbBn9pgnqDIaleks2r K8Gver3cJ8k1PyyAWryLOi50qpncqfpw97WggFUxDOW57Kfv7Bf9kLCar52pPu5OZegk RY0g== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=J67IA9Rwafm458dcLqY7a4tKx5BXYYE+Ns2Tcb2/oMw=; b=T2W/fx2lcLjA2afnA4ZaiCOO1CYurpeYVMLsHxESa+fLTVcYt5sxROsLvDBZF3j6JF 7SXBdruKC3XlgjXlabcaaWlyzM7jt5QO30O7yt8woyBghidtflgN1zNqTffLKePNn5O2 W/7ShwdnA1ysb54xRSZuegguw0NxKh4DFcwqFCq2L2ZXIZ+BKvZGNv+WkT/LiUYjmqfz TAnUvi3ZeU1Tn2rE34PzZkyHer99MS0kTWb4gdf9+kS4KMye0k7CtMM8kdnMo+Y+1kLJ kHYC8oliuYSjGkQRFWTgAg3s6uL8DQdr1h3H9Gaf41pvQwAdZplZjNmWjdznaJ8KQtnK y8KQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id u52si934802qth.12.2017.10.23.05.04.25; Mon, 23 Oct 2017 05:04:25 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 38C1162914; Mon, 23 Oct 2017 12:04:25 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 6C10C62916; Mon, 23 Oct 2017 11:16:37 +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 9845862916; Mon, 23 Oct 2017 11:16:32 +0000 (UTC) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.linaro.org (Postfix) with ESMTPS id 9A9E26229A for ; Mon, 23 Oct 2017 11:11:40 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id 90so19651114lfs.13 for ; Mon, 23 Oct 2017 04:11:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=J67IA9Rwafm458dcLqY7a4tKx5BXYYE+Ns2Tcb2/oMw=; b=uLbbV/jTgzAKIpjKQwC9QVaMaWqIyX3TAtMCYg4pX4Bb66UucCHy0+8lEGL/I4+u2J ZjUKQh/BAOGeDLai9LGx9/TERFJF40GSrkgtSkBZ7HvfI1MW4QfLIhO4uhdu5VkSjRJ0 psTGiwC0YY6dWFMGI3SorR+Bbgm8c2Ze6GRN5sQZwV9FKakpnwZQtJVyhKlKeh/klAQO WNXaYuuoRKA7x74+FLALdn6ZK3iHaFSpkmCzj/w3oHX1pC7TwVQ4+5t0FU1GiUrMzom/ 1mwILV6WG2seaNXegmYmPbY7G0XkG3TUzEsuiboRs3Kg6g1XIyHgiyNRWmrizyuAChu4 bqEg== X-Gm-Message-State: AMCzsaWG2GYXH8I64pQxu5auINwEuFPBx93YxUUldPeCL1kXR3UezIjg h1tctMTUAcdjw7TI3ZddZ0ipXFppcG/2jg== X-Google-Smtp-Source: ABhQp+Q30GPxPxMRqjEJUj9okgA3jK99kimLDLP1X9bq5eA2ip71xLLA4egRUEqGtIAULC+Cs8d3Jg== X-Received: by 10.46.81.90 with SMTP id b26mr4911236lje.98.1508757099165; Mon, 23 Oct 2017 04:11:39 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:38 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:53 +0300 Message-Id: <20171023111057.6328-26-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 25/29] linux-gen: move several files under ODP_ABI_COMPAT condition 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" Several files consist only (or mostly) of functions compiled only if ODP is compiled in ABI compatibility mode. Instead of having an ifdef inside, guard them with if ODP_ABI_COMPAT condition in Makefile.am Signed-off-by: Dmitry Eremin-Solenikov --- platform/linux-generic/Makefile.am | 13 +++++++++---- .../include/odp/api/plat/ticketlock_inlines_api.h | 6 ++++++ platform/linux-generic/odp_atomic.c | 4 ---- platform/linux-generic/odp_atomic_api.c | 13 +++++++++++++ platform/linux-generic/odp_byteorder.c | 6 +++--- platform/linux-generic/odp_std_clib.c | 6 +++--- platform/linux-generic/odp_sync.c | 6 +++--- platform/linux-generic/odp_ticketlock.c | 10 +--------- 8 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 platform/linux-generic/odp_atomic_api.c -- 2.14.2 diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index f2454ac51fff..078d154f8f15 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -167,7 +167,6 @@ __LIB__libodp_linux_la_SOURCES = \ odp_barrier.c \ odp_bitmap.c \ odp_buffer.c \ - odp_byteorder.c \ odp_chksum.c \ odp_classification.c \ odp_cpu.c \ @@ -215,12 +214,9 @@ __LIB__libodp_linux_la_SOURCES = \ odp_sorted_list.c \ odp_spinlock.c \ odp_spinlock_recursive.c \ - odp_std_clib.c \ - odp_sync.c \ odp_system_info.c \ odp_thread.c \ odp_thrmask.c \ - odp_ticketlock.c \ odp_time.c \ odp_timer.c \ odp_timer_wheel.c \ @@ -233,6 +229,15 @@ __LIB__libodp_linux_la_SOURCES = \ drv_shm.c \ drv_spinlock.c +if ODP_ABI_COMPAT +__LIB__libodp_linux_la_SOURCES += \ + odp_atomic_api.c \ + odp_byteorder.c \ + odp_std_clib.c \ + odp_sync.c \ + odp_ticketlock.c +endif + if ARCH_IS_ARM __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_cpu_cycles.c \ diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h index 5efe696ff734..4f8509569228 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h @@ -33,4 +33,10 @@ _ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *lock) return _odp_ticketlock_is_locked(lock); } +_ODP_INLINE void odp_ticketlock_init(odp_ticketlock_t *ticketlock) +{ + odp_atomic_init_u32(&ticketlock->next_ticket, 0); + odp_atomic_init_u32(&ticketlock->cur_ticket, 0); +} + #endif diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c index 1d76caf2b82f..8c46bb5bb11f 100644 --- a/platform/linux-generic/odp_atomic.c +++ b/platform/linux-generic/odp_atomic.c @@ -7,10 +7,6 @@ #include "config.h" #include -#include -#if ODP_ABI_COMPAT == 1 -#include -#endif int odp_atomic_lock_free_u64(odp_atomic_op_t *atomic_op) { diff --git a/platform/linux-generic/odp_atomic_api.c b/platform/linux-generic/odp_atomic_api.c new file mode 100644 index 000000000000..a1aabb07c692 --- /dev/null +++ b/platform/linux-generic/odp_atomic_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE +#include diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder.c index faf1c5904bb4..ff0b74b233cf 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder.c @@ -7,7 +7,7 @@ #include "config.h" #include -#include -#if ODP_ABI_COMPAT == 1 + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE #include -#endif diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib.c index 38406b86b3c4..b267ea654ee2 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib.c @@ -7,7 +7,7 @@ #include "config.h" #include -#include -#if ODP_ABI_COMPAT == 1 + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE #include -#endif diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync.c index a9d2bbe24369..b9e85593bbbf 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync.c @@ -7,7 +7,7 @@ #include "config.h" #include -#include -#if ODP_ABI_COMPAT == 1 + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE #include -#endif diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c index 59431620f203..63381f44b456 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock.c @@ -10,14 +10,6 @@ #include -void odp_ticketlock_init(odp_ticketlock_t *ticketlock) -{ - odp_atomic_init_u32(&ticketlock->next_ticket, 0); - odp_atomic_init_u32(&ticketlock->cur_ticket, 0); -} - /* Include non-inlined versions of API functions */ -#include -#if ODP_ABI_COMPAT == 1 +#define _ODP_INLINE #include -#endif From patchwork Mon Oct 23 11:10:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116726 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4565904qgn; Mon, 23 Oct 2017 05:05:26 -0700 (PDT) X-Received: by 10.55.42.136 with SMTP id q8mr16870561qkq.86.1508760325857; Mon, 23 Oct 2017 05:05:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508760325; cv=none; d=google.com; s=arc-20160816; b=Cew2t74UlZR8dOnL1UkA0Yv/ta8PSslHqBHF6IptfukapYOtSFvoo/wJ7SHQs+cgRz zlLogIrfS3q7fPy1eBDjCTGzlYsp6IuQrFoP5GTkbj69IHIXOW4NUWOJh386jZBqzAXi e0iAgzY6u2eMr1P0A5loylnmosHKP3YYEm+q94k8q3xB+yIA5CftOam7U4961RMeWcNz LAPIxg8VjWwkGIieE4ZbZQsD4PJyN9AfFVNdvMDXSvKaUSrsBzspA6gL+JLgXBTlWjgJ UKbJV9cM4HfJld3tEQmmmA+FCptRGjUcOMju8xKPojXPCmvz3lT+X099erVR6TwGIsqA 5eSQ== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=ahXInwELJ7a/Lp58m3Xfmmb5mdXimec3O+AfBXhhQa4=; b=iWL6WK+5cLkO9rYP7aQ701dSyzkqWIztsZNmdISes8LgLUKqDklBPCYSr72rYfzrrl YEUtE7/HxjuHecfQvsG+7VO6XlAOwoBYdzzepwO6wp6aWWpSbOZcvn/0QDbWMt8QdZT/ XLgCDSa7FDvOz1yPY4/pBAGHbsa3uWSOHMieQ36Ue7KDw1vgm9ZbnGy4u4p5vGsxGDMf 9ihc1azCG5OUyO+YqeLpTbv3qqHPUwa/5p6l6qiOK90x6238Iscbp4H4J5OIuDdCguDV AWiDpfaQx4NrqIOehwbhOQQPh2bYoVqUMLEen3debeEtYeA5FCqMiRyN6fYulEf6VnoV 6gZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id f15si6199287qkf.11.2017.10.23.05.05.25; Mon, 23 Oct 2017 05:05:25 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4CDCF6299A; Mon, 23 Oct 2017 12:05:25 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 29CC1622A0; Mon, 23 Oct 2017 11:18:08 +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 A52716229C; Mon, 23 Oct 2017 11:17:39 +0000 (UTC) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.linaro.org (Postfix) with ESMTPS id 8F2056229D for ; Mon, 23 Oct 2017 11:11:42 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id g70so19665367lfl.3 for ; Mon, 23 Oct 2017 04:11:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ahXInwELJ7a/Lp58m3Xfmmb5mdXimec3O+AfBXhhQa4=; b=YlsKTKOsRCyFe74EHNPC6nmjdM30DsHIXh/LC11WndCLiADyWCqx7e6O5fDSTTuCAz TXvM0IFZ9a+MggI1/Mrye8Ldo407j29bH+Hfa3DNtfBwV4JgLwfGiW9n+5FWX8Jvtr4Y gvcoIcGV2qrVsxGn+MWzZh68dOe1WRWdIkXX17opoSZVj2SATscUSa5FadQT3maGsz5p SxjoUyveqr9E6KvOxgEn6vMsoEufhIiUh0nPqYY3Tp4TRxf9LZgbYYC+mUBpMj2EEGUg v5/rT5QQ1PcZW+QkMP3qYq/2gEC8OG7BiISIuyyQwiP41M5QPsjW/SioGPyzbYpKdQOd bNCA== X-Gm-Message-State: AMCzsaVnvAE+Kc7TkjXVFrU9lh3p4RB7tJ0zXZGdGKfL7rW/pLrquaKV 7DbzMCSGXfLhCoAJXT0RUh51LK0kA0K6jA== X-Google-Smtp-Source: ABhQp+Sd6G1J2QZGl0bFzbhNdlaSOH4KexXywGFVGYqeI4aVuo1O0Id6A59IQlLz457MKIe0pwwdKQ== X-Received: by 10.46.82.16 with SMTP id g16mr5466784ljb.131.1508757101082; Mon, 23 Oct 2017 04:11:41 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:40 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:55 +0300 Message-Id: <20171023111057.6328-28-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 27/29] linux-gen: remove static_inline.h header 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" Replace static_inline.h header with unconditional defines of _ODP_INLINE macro (either to 'static inline' or to empty value) depending on the compilation place. Signed-off-by: Dmitry Eremin-Solenikov --- Makefile.inc | 1 - platform/linux-generic/.gitignore | 1 - platform/linux-generic/Makefile.am | 3 -- .../linux-generic/include-abi/odp/api/abi/atomic.h | 2 +- .../include-abi/odp/api/abi/byteorder.h | 2 +- .../linux-generic/include-abi/odp/api/abi/packet.h | 5 ++- .../include-abi/odp/api/abi/std_clib.h | 2 +- .../linux-generic/include-abi/odp/api/abi/sync.h | 2 +- .../include-abi/odp/api/abi/ticketlock.h | 2 +- .../include/odp/api/plat/packet_inlines.h | 3 +- .../include/odp/api/plat/static_inline.h.in | 43 ---------------------- platform/linux-generic/m4/configure.m4 | 1 - 12 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 platform/linux-generic/include/odp/api/plat/static_inline.h.in -- 2.14.2 diff --git a/Makefile.inc b/Makefile.inc index 91be46bcb017..9d31dff1da9b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,5 +1,4 @@ ODP_INCLUDES = \ - -I$(top_builddir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ diff --git a/platform/linux-generic/.gitignore b/platform/linux-generic/.gitignore index 442e82a938bb..fd5ade7e304d 100644 --- a/platform/linux-generic/.gitignore +++ b/platform/linux-generic/.gitignore @@ -1,2 +1 @@ -include/odp/api/plat/static_inline.h libodp-linux.pc diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 3c1551aab7a6..0a49fe67e03b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -38,9 +38,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h -nodist_odpapiplatinclude_HEADERS = \ - include/odp/api/plat/static_inline.h - if !ODP_ABI_COMPAT odpapiabiarchincludedir= $(includedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/atomic.h b/platform/linux-generic/include-abi/odp/api/abi/atomic.h index 0b7b254ced23..67127aa4d64e 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/atomic.h +++ b/platform/linux-generic/include-abi/odp/api/abi/atomic.h @@ -63,7 +63,7 @@ typedef struct odp_atomic_u32_s odp_atomic_u32_t; * @{ */ -#include +#define _ODP_INLINE static inline #include /** diff --git a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h index 0f8fac0b16c8..da07c0eb0b87 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h +++ b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h @@ -75,7 +75,7 @@ typedef uint64_t __odp_bitwise odp_u64be_t; typedef uint16_t __odp_bitwise odp_u16sum_t; typedef uint32_t __odp_bitwise odp_u32sum_t; -#include +#define _ODP_INLINE static inline #include /** diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index 31d446f8dd9f..1aa7cbd5838e 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -32,6 +32,9 @@ typedef ODP_HANDLE_T(odp_packet_t); typedef uint8_t odp_packet_seg_t; +/* or it will be provided by packet_inlines.h */ +#define _ODP_HAVE_PACKET_SEG_NDX 1 + static inline uint8_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) { return (uint8_t)seg; @@ -53,7 +56,7 @@ typedef enum { #define ODP_NUM_PACKET_COLORS 3 -#include +#define _ODP_INLINE static inline #include #include diff --git a/platform/linux-generic/include-abi/odp/api/abi/std_clib.h b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h index b31034df4705..8ef9e9ad22c8 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/std_clib.h +++ b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h @@ -17,7 +17,7 @@ extern "C" { #endif -#include +#define _ODP_INLINE static inline #include #ifdef __cplusplus diff --git a/platform/linux-generic/include-abi/odp/api/abi/sync.h b/platform/linux-generic/include-abi/odp/api/abi/sync.h index 74e3fb15fef9..9ecc40f227c7 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/sync.h +++ b/platform/linux-generic/include-abi/odp/api/abi/sync.h @@ -21,7 +21,7 @@ extern "C" { * @{ */ -#include +#define _ODP_INLINE static inline #include /** diff --git a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h index 958184be6907..87358d2afe1d 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h @@ -31,7 +31,7 @@ typedef struct odp_ticketlock_s { } odp_ticketlock_t; /* Include inlined versions of API functions */ -#include +#define _ODP_INLINE static inline #include #include diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 48475ba823e8..2419404c32f0 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -25,8 +25,7 @@ /** @internal Inline function offsets */ extern const _odp_packet_inline_offset_t _odp_packet_inline; -#include -#if ODP_ABI_COMPAT == 1 +#ifndef _ODP_HAVE_PACKET_SEG_NDX #include /** @internal Inline function @param seg @return */ static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) diff --git a/platform/linux-generic/include/odp/api/plat/static_inline.h.in b/platform/linux-generic/include/odp/api/plat/static_inline.h.in deleted file mode 100644 index 3cf0043478f3..000000000000 --- a/platform/linux-generic/include/odp/api/plat/static_inline.h.in +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Macro for static inline functions - */ - -#ifndef ODP_PLAT_STATIC_INLINE_H_ -#define ODP_PLAT_STATIC_INLINE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @internal - * @def ODP_ABI_COMPAT - * Control ABI compatibility - */ - -/** - * @internal - * @def _ODP_INLINE - * Define a function as inlined or not inlined (for ABI compatibility) - */ -#if @ODP_ABI_COMPAT@ -#define ODP_ABI_COMPAT 1 -#define _ODP_INLINE -#else -#define ODP_ABI_COMPAT 0 -#define _ODP_INLINE static inline -#endif - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index f4504bf98e45..e605f6281806 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -22,7 +22,6 @@ AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], [test "${with_platform}" = "linux-generic"]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc - platform/linux-generic/include/odp/api/plat/static_inline.h platform/linux-generic/test/Makefile platform/linux-generic/test/validation/api/shmem/Makefile platform/linux-generic/test/validation/api/pktio/Makefile From patchwork Mon Oct 23 11:10:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116727 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4567118qgn; Mon, 23 Oct 2017 05:06:32 -0700 (PDT) X-Received: by 10.55.131.135 with SMTP id f129mr18234778qkd.318.1508760392065; Mon, 23 Oct 2017 05:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508760392; cv=none; d=google.com; s=arc-20160816; b=tnajqfS+yKlJAPw1Og+jPfhJhbYoS8+waui0WNDrImg9tNdopfq2qBgKUuk3uXgJLW ocMTzAzVZ7rhbR6R25+iyCRNMSq7Ie0iD+6e+LG8e/u7253xsj63q7NVIEQCmlLGrcOp 7aEvM0SLYMaOQt3Fqbot1UMWpyx+BUZ7XkDyZhlu7NEaFA3MQvqHvwVK5MO3dH2aNsVQ AV5dVNH+xDYIfoLhkblpcgMiFZK3D55AUE9WFQIcBBurlqK8c2KEQZWgWM+bzdrsodSO Hyx2+OdtMzo7rFhctoQQty9WxjFbY1lGoZHCydt9c0tDSPjw8vbbLE/tXZ5qOTlm/Cjy +Shg== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=nt0ujegZipVHchiv4O7VLRD4IAyIxkOTyB3SsS/CSqo=; b=Dt0ijS7b+6dL4A32itPMdEFMYO9qnCkEVItxv/KO+xabOTJ06eCBSxTcjjblCHBZ4i wrcjyhDit9/r0KFhAXkaNZNJ7x5zAHHr/EueHhDzufgdMhG/mBMRI8gEx7YbwEHyLK+L HQpaqothiWBJVti3/A4i/uR0AJTWXUEh29bIL0v7+G69tu0psUB+nZvWYNEZLDlJsSrB //NzzZjMXDd+R/msafVv7BcpdjxP/QuPX/0tDnpbSIpO4eXQYgEbJsxoRKXiOmgtO6pS QCrJ6jwcwQI+IKmtHV+f/JEOpeFZFpZOj/zW14UXEu58miEbD/NQb95jTEP5w5Xp8t5N FxSw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id w70si4327605qka.127.2017.10.23.05.06.31; Mon, 23 Oct 2017 05:06:32 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B9EFD628A6; Mon, 23 Oct 2017 12:06:31 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 70B4262922; Mon, 23 Oct 2017 11:18:10 +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 993786291E; Mon, 23 Oct 2017 11:17:58 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.linaro.org (Postfix) with ESMTPS id 56ED8622A0 for ; Mon, 23 Oct 2017 11:11:43 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id a132so19653704lfa.7 for ; Mon, 23 Oct 2017 04:11:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=nt0ujegZipVHchiv4O7VLRD4IAyIxkOTyB3SsS/CSqo=; b=rBr/WpQLyJQ+mq5tu3s57C2QK7XYpwFKyT2VbQz2ay+PpMxB8/tFs3GWwFH7SJtxyb HI02/97alXMqvm0grcbg9pJwwS3JNHL85Cr+T4pBnH75dkbfBeYlvvqq8F85o4Sek4DS WgJvV3GlTd1durXn92n3oypbcJbgkswntOP9KhJeKwahqK0hE7EZ3MJygiUQJVMyRVJc M25M+H9dNlGTIGYkJP2Z1b63QpFFDBqO3M20dt4f+ivZ1VkCyGR9tw1O6ZfO9d703rq6 nEtaHlZZ7UlXLI/eyxGLQ3H0Sjn5/NejVSLSfq4ExPc6errOTok8XE5xdhCx4k2roi9A WgRA== X-Gm-Message-State: AMCzsaXVlQTWGunk44r/ASfEVW2Qyd1D0mpcmisZf55sMq5HBb2TUAyJ gFDwtjWpmxIrDaQRlyfpKbVLeGJ/dcgmYQ== X-Google-Smtp-Source: ABhQp+TOK0TGQX6Us8gOo1msNEMRkd7AU2KFi8RRXwnyRo6d2AigwPCk4xSkPYublCFV9jiLnkehqw== X-Received: by 10.46.5.130 with SMTP id 124mr4990441ljf.116.1508757102061; Mon, 23 Oct 2017 04:11:42 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:41 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:56 +0300 Message-Id: <20171023111057.6328-29-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 28/29] linux-gen: don't install inline headers in non-ABI-compat mode 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" There is no point in installing inline headers in non-ABI-compat mode anymore. They are not included by any other header. Signed-off-by: Dmitry Eremin-Solenikov --- platform/linux-generic/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.2 diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0a49fe67e03b..08e915af4e36 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -24,6 +24,7 @@ odpapiinclude_HEADERS = \ include/odp/api/debug.h odpapiplatincludedir= $(includedir)/odp/api/plat +if !ODP_ABI_COMPAT odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/byteorder_inlines.h \ @@ -38,7 +39,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h -if !ODP_ABI_COMPAT odpapiabiarchincludedir= $(includedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/atomic.h \ From patchwork Mon Oct 23 11:10:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116728 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4567743qgn; Mon, 23 Oct 2017 05:07:03 -0700 (PDT) X-Received: by 10.55.111.3 with SMTP id k3mr17605442qkc.332.1508760423744; Mon, 23 Oct 2017 05:07:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508760423; cv=none; d=google.com; s=arc-20160816; b=xsdXjkNNI6+mIvZPH6/PjkAp4Oy8NkwfZnCrzyn8NpF9GBwb8Y7zGlNW+571pUkHnn 057qGwmwVSml+WDQyE4iPKWECwzU0iTxq74XQx7DdtYI+B7iZqw5lp+tvcgnIKfNTD+X N4WcH5ela4FPLYAlPBrr0YPTUVsKlZYKAi2Y9ZyJ3TtpMPX0IRsRxE6u8YV2sspWuD4U II82YL63ObFp1csc1+zkQcWNdEIHi7EMBjowhG2uUQOtLLS0xcTUsmP7q+3j4zsdVSqg a0h1pCI0NZLJMcR/Nwle+lbghaWUKI8mQgRUf7VVs+76Z+vrYJv+yQkurr6D603XbHVo 9D8w== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=oEUKRCxEQI0XiDzqYPWyZTUeYx0r8vkQ4fDChF4nm6Q=; b=SLOcZTd+1VdSs4L/pHKkuoxqtFrOxuwjL0XE5hiIWS8jffFwL0PI01IGNf/0GJqYIK mRJ6t2s4OlJ3kHBOTSocyPY7BaopiMv7fulpYUXO0/N35W4fs0n7m4v4Ong4R0FTaFv5 wv19bZrmUx8VSonuErlKI8VAJnykcIYB9F40G7U7A42hAQ8Cs4ubWkf/0sppuXPG/lHH dW5g3WJ+pseZNJ2SXKwbXYXYnb44MhWManD7wlhkFICTcsK6Pwd1d/a2kyvxfAAvF07f 6BgDtcZgCtM/nBLsQuSNrCAG/SEEXlwHU3nf2aMqNpLmsRYGikI0SdZqAVwLKhAlW3lz MFyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id p39si2349565qtc.218.2017.10.23.05.07.03; Mon, 23 Oct 2017 05:07:03 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 63B5C6299E; Mon, 23 Oct 2017 12:07:03 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 1BCF661613; Mon, 23 Oct 2017 11:18:37 +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 D546461DEB; Mon, 23 Oct 2017 11:18:31 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id 7D28D61DEB for ; Mon, 23 Oct 2017 11:11:44 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id w21so19689985lfc.6 for ; Mon, 23 Oct 2017 04:11:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=oEUKRCxEQI0XiDzqYPWyZTUeYx0r8vkQ4fDChF4nm6Q=; b=KRGiqMfbW297bEtoAqXd9TS+tFzZPz+NZSevAW8WogydHYS7vq+95go5oRYKx2dKw2 AsZPxRXHMu4N7P3AUXCkSOZOIU+rcVSvmfedbsXEZqyJqHBIaqWBNBJDSoemV26u6IjT s1I5lnGKEt5bZj5YCxoVsKPo7ZNphqJvgDd2GeETvrqTyCTheNm1sjP/BXqEcI6dFWuK 6j4uCYEarzM7KAbsYXXj0vMAYd8LCaNm9A1vMo2bL1ncGO8h5xD4sQUE/mDGpP2dsZNJ R0Pn/K2NPu07rNSGsQDxMN82vhag0HeL/XjHFp8dOf1twFUumw+QasHaP6Ro0cLQQSmj qCag== X-Gm-Message-State: AMCzsaVLyDweHNHguhU67UKpF+lsWNc+0AOn6gGNZ4ydNSVF8XLWvX68 c6LcrqhFOZt/T+plIj54FV6L2no6veXDGg== X-Google-Smtp-Source: ABhQp+SK2ZXe7nYd9OpwsxXn5/77lZ966pCpxFreGoR5fDaibZzZGzDQtMClPSReUmjL2pnI3SpmVw== X-Received: by 10.46.25.218 with SMTP id 87mr5122483ljz.122.1508757103197; Mon, 23 Oct 2017 04:11:43 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:42 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:57 +0300 Message-Id: <20171023111057.6328-30-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 29/29] configure: stop AC_SUBST'ing ODP_ABI_COMPAT 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" With static_inline.h gone, there is no need to AC_SUBST([ODP_ABI_COMPAT]). Drop it from configure.ac. Signed-off-by: Dmitry Eremin-Solenikov --- configure.ac | 1 - 1 file changed, 1 deletion(-) -- 2.14.2 diff --git a/configure.ac b/configure.ac index 255de960c180..6d74c98b3083 100644 --- a/configure.ac +++ b/configure.ac @@ -270,7 +270,6 @@ AC_ARG_ENABLE([abi-compat], #if there is no ABI compatibility the .so numbers are meaningless ODP_LIBSO_VERSION=0:0:0 fi]) -AC_SUBST(ODP_ABI_COMPAT) AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"]) ##########################################################################