From patchwork Thu Nov 19 09:43:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 56974 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp3073663lbb; Thu, 19 Nov 2015 01:49:32 -0800 (PST) X-Received: by 10.140.136.18 with SMTP id 18mr6303715qhi.16.1447926572822; Thu, 19 Nov 2015 01:49:32 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c126si6041041qhd.101.2015.11.19.01.49.32; Thu, 19 Nov 2015 01:49:32 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id 79D0F61814; Thu, 19 Nov 2015 09:49:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, 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 2A82A61FE7; Thu, 19 Nov 2015 09:45:00 +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 1B7F061E13; Thu, 19 Nov 2015 09:44:51 +0000 (UTC) Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by lists.linaro.org (Postfix) with ESMTPS id E674A61E13 for ; Thu, 19 Nov 2015 09:43:47 +0000 (UTC) Received: by lfaz4 with SMTP id z4so44268076lfa.0 for ; Thu, 19 Nov 2015 01:43:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0Ci3aDUD3rwP4LUkEZEAWB0cJkPmmCqzs7s9bhlAh7o=; b=hKMLneyAm0WZnN8ETzpleythhVZ2HAFB2LZhC6VnzgQZoJmMZAagD0gsCLKIDaSplF GM98ltx50J+c4NzT8hJ25BT4IBj2+XyQ25s7WsLGxEpRSLhPOJYObss2RSk/ihKkAbuU QZOtqgMLOvTzhLPh1MVid9CNpRp6bOQ5ExotEIrBlp9oYJMinnwK3dmrjOqT70hwOtLE ue9g6VBC1jiSW2lyx9QiSGpzrU1BDYQcgLjO++tZkMmxJI89+uYo1UeilD6pxeT2JTYZ sqXEGQqAwyJkhsjVmL3I9sPwlFCxW6yBV6fwNctxaeieBn/4MnDFZdxwd9wF0+xI8LNu js8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0Ci3aDUD3rwP4LUkEZEAWB0cJkPmmCqzs7s9bhlAh7o=; b=Haw1huHz1xJ9Pj4Bmq5Sb/eCngyttIVtRSKrvI8yUMxyIwM2oiCwqyL9qEnuQBfR89 dE01wJIee89FW55c355c0w13iBdnF2le62K/puX2Cvx8GVoTCpwZ9+W8aG/9V3ACJE9w 6/Yhvl9lDZoVon1Na3NFs4M8IguhH3zfThDCKj20WSoOQrzREfopoxlfGzh7E5AUevrE 24xbeFY1EU0ZfSaI9XuhFHBvclDJi0ic3rY5UvPYMYpkHcfkMO04zlFvl/hJaSKrdt7P G6iDsAK1Fua/z3HRSfpxgTbjywgi/L53Gk/YqEYubfNqTPPdmhyQfXB0jqOJ3onVLaZ+ xSyQ== X-Gm-Message-State: ALoCoQnVwEt9lrlj7Eqryh1aS9aedzsfCfzrGNgVwQzefd/4vyf6TX34jhs4RpCQ4pIoEC/Ax3bj X-Received: by 10.25.17.66 with SMTP id g63mr2396878lfi.110.1447926226869; Thu, 19 Nov 2015 01:43:46 -0800 (PST) Received: from localhost.localdomain (ppp91-76-161-180.pppoe.mtu-net.ru. [91.76.161.180]) by smtp.gmail.com with ESMTPSA id 194sm1081186lfd.4.2015.11.19.01.43.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 01:43:46 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 19 Nov 2015 12:43:30 +0300 Message-Id: <1447926212-15365-8-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447926212-15365-1-git-send-email-maxim.uvarov@linaro.org> References: <1447926212-15365-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv14 7/9] helper: move odp pause to installed helper 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" ipc pktio depends on ring which depends on pause. Move pause to installed helpers to support out of tree builds. Signed-off-by: Maxim Uvarov --- helper/Makefile.am | 4 ++-- helper/{odph_pause.h => include/odp/helper/pause.h} | 0 helper/ring.c | 2 +- helper/test/pause.c | 2 +- platform/linux-generic/Makefile.am | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) rename helper/{odph_pause.h => include/odp/helper/pause.h} (100%) diff --git a/helper/Makefile.am b/helper/Makefile.am index e72507e..f045393 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -18,11 +18,11 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/ipsec.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ - $(srcdir)/include/odp/helper/udp.h + $(srcdir)/include/odp/helper/udp.h \ + $(srcdir)/include/odp/helper/pause.h noinst_HEADERS = \ $(srcdir)/odph_debug.h \ - $(srcdir)/odph_pause.h \ $(srcdir)/odph_hashtable.h \ $(srcdir)/odph_lineartable.h \ $(srcdir)/odph_list_internal.h diff --git a/helper/odph_pause.h b/helper/include/odp/helper/pause.h similarity index 100% rename from helper/odph_pause.h rename to helper/include/odp/helper/pause.h diff --git a/helper/ring.c b/helper/ring.c index 2bd8e67..bd2ba11 100644 --- a/helper/ring.c +++ b/helper/ring.c @@ -71,13 +71,13 @@ #include #include -#include "odph_pause.h" #include #include #include #include #include "odph_debug.h" #include +#include #include static TAILQ_HEAD(, odph_ring) odp_ring_list; diff --git a/helper/test/pause.c b/helper/test/pause.c index f5f5da3..c5a5f1a 100644 --- a/helper/test/pause.c +++ b/helper/test/pause.c @@ -5,7 +5,7 @@ */ #include -#include "../odph_pause.h" +#include int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) { diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0135947..2695dc8 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -6,6 +6,7 @@ include $(top_srcdir)/platform/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/helper/include +AM_CFLAGS += -I$(top_srcdir)/helper include_HEADERS = \ $(top_srcdir)/include/odp.h