From patchwork Fri Oct 27 12:50:05 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: 117345 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp772219qgn; Fri, 27 Oct 2017 06:27:12 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TU0Orgy46+1Z3/4aJQSNeBuX4+EFLnDX9nc2Wp0v0+qjDf9t3dSpIrRjGvf0hCfb5QU2PB X-Received: by 10.107.169.34 with SMTP id s34mr601837ioe.103.1509110832010; Fri, 27 Oct 2017 06:27:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509110832; cv=none; d=google.com; s=arc-20160816; b=RnjtCycjm9miOAgNRdCjpDy7yz3jE4x/Jsr+y21KdrkEd+qHE+8S64O3JyXAMtC7BF Omh4mZrsXalGtmSMp+BgLgD6URmaQkYouOqyptHnjHeVuT5ON/ln12kE576j/veShLFL VrGiavUXqtp4IId/LYXqhz/+AGQ0iy3Mx3V4J4tXyPyHnlFjopCsElefaJma/iUnui6I Dwm2VTBVeJlkEE27Zye1rXSyZfsQ5PQM9tfcnYP1Jzbiox1eZ/Ohtxy5oYybXGpqjA9Z xMVXAsd8I3tg64PR/MyCE1uI41SSGgvdLb/CF0BjRX76vj4tMMXr5nhCj2AhKVFTA6vs iSWA== 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=TB3S9wBJb1jvsbghgxZDUcDi89lUbwGqsX2YLZqHccs7kUWZWshstGVszC8mb3gYlc G+sxekukdJxTLaZCaUXYS00w5NcXOvDLfX8QDDZFusiCa2mf8Ygav1aDcxEUlzcFWazT LXMSyndwxuZZOh8kcQv5LnhC9aEnNugHi8AGXyJbKdSHBgvIY2NImBZfBvNBjHugDsvZ UBlSzU2WVSHE4/Ioy2J/ilm3372pAUswxGWcSHYPJKDwBWKffROv7DfaEDcThttm0BTe D0EbBoZ3bXiehqzhLAbGxCazTIb7CTABoXD28zYKEzC0LxDajgc8yp9JLMOQqnyXcX3m JCXw== 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 k144si1355599ita.39.2017.10.27.06.27.11; Fri, 27 Oct 2017 06:27:11 -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 6DCC561D48; Fri, 27 Oct 2017 13:27: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 7E257629AD; Fri, 27 Oct 2017 12:54:32 +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 C559562956; Fri, 27 Oct 2017 12:53:32 +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 1BE8D62966 for ; Fri, 27 Oct 2017 12:50:47 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id r129so7288912lff.8 for ; Fri, 27 Oct 2017 05:50:47 -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=c0QIMf6T14Jc1I3C0sSg1zKLoRDcADV0gj7KnbDxhG7g6CrEmzO+t0vWLrwdbXIkPP yecEcWOrF0aWPjug72t3ckpuAV26vW6tTyuRJp6jYjYYyteae60QuL62mhjk2Z8LHodh nOBkHL3KjFcyriGjQZAAGjRqeKs172nDB++gkhKE2cp07SCV9lU816pT6wURcvKKPXnD x8QpcgXGg3X8h1weSe8CyRDOUit+02JsTTKDNR3Alhr2v3fFei+Ta52475CvMz+HFqxF N+fps+gj36sJg80QAfBaTUUlm88SpoiNNa5QSkhtFD4HDCFdFra2TwZ8MsNEMmJQvbhE V+9w== X-Gm-Message-State: AMCzsaU8/nFPczomEb6F9+FhHq4E9bsLdXztD99UnX6stQ5PYq0SrLAZ Kyy9hHojOofoZWdBaYw0Kb9XDoHkZwWgzg== X-Received: by 10.46.43.69 with SMTP id q66mr168385lje.104.1509108645704; Fri, 27 Oct 2017 05:50:45 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.222]) by smtp.gmail.com with ESMTPSA id l194sm1584690lfl.11.2017.10.27.05.50.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Oct 2017 05:50:45 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Fri, 27 Oct 2017 15:50:05 +0300 Message-Id: <20171027125014.27313-22-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171027125014.27313-1-dmitry.ereminsolenikov@linaro.org> References: <20171027125014.27313-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH v10 21/30] 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