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