From patchwork Fri Nov 20 18:41:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 57083 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp40551lbb; Fri, 20 Nov 2015 10:45:47 -0800 (PST) X-Received: by 10.55.78.143 with SMTP id c137mr14646284qkb.72.1448045147634; Fri, 20 Nov 2015 10:45:47 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d81si769142qkb.124.2015.11.20.10.45.47; Fri, 20 Nov 2015 10:45:47 -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 516666199A; Fri, 20 Nov 2015 18:45:47 +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 E4AA962008; Fri, 20 Nov 2015 18:42: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 2C17C61FEA; Fri, 20 Nov 2015 18:42:03 +0000 (UTC) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by lists.linaro.org (Postfix) with ESMTPS id 48EE361FF0 for ; Fri, 20 Nov 2015 18:41:16 +0000 (UTC) Received: by lbbcs9 with SMTP id cs9so66863268lbb.1 for ; Fri, 20 Nov 2015 10:41:15 -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=durmvVm/MA7rUrZJH7ZM+5QN5rOy/dozdIp0uVu0wUI=; b=C5/mv3LTmYhXpIVNjd4LJ/UDIktdbzS/FQSEBWtfdfews0/qBtRaCnOqDbQtW+zFwI +69cJX87E2s5AuZCyDIpBlnINi6g0BWna+89x7rz9V9zpGbG1fg+PoCEDCRsZpVHFa8j kvNMBS25ufJfjnkED1owW4KqP+6VBV7ywGpUYCOIx0wAbYl+Z7jCCZTBpRJnKE+h/NoC UNZpSLkroP+/MpeLloqq2czFEoyZZlf+zt/2+tT6LwNB2CBNzPFmu6e+QJTaT6ox84z6 amZ/cv2bYfcDXqFDAMQqxBTGy2GjqZyVYXdY/MYUZRsEJIIxXPIXjP+Koj11xnJ4dtD3 dyGg== 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=durmvVm/MA7rUrZJH7ZM+5QN5rOy/dozdIp0uVu0wUI=; b=JNiaA3jVvfeCKxINjHQjS6VrZ7ZK3vmHrtAO8pR0P3k83E2C/LClAwAIgZ1WeNOb4r l4ck+QUQVe41Dg0AkVB41hePgERUIi0Sg1QKXonWEf/Z83pFdm7aNUf8nt+yMGEAgCn2 s4Q9k9u/sEwz55gl4DXKDfIRUgOWE6Z52usfenxDzCqhwLckCgcCsKcnXxv1uuoLBsMs oJxzUPNslsGnszgDC5xYoMFcZiUBgKvztoLoIX6OewYCG1WCEI3pqI9lJbHy0kJZM5uA 2REtRhGkuvd4rhIK0QkkILl4paiA8nxuUsZryVJayr88yHJ+X5PGTehUuncInwPi+ZIh cbkw== X-Gm-Message-State: ALoCoQmXdueNCgqOxAUMKplxsZfl5ng05RR9MHXy0TxgGzCNJZ5RV++lgCitaInj3UUSYupH2w8Q X-Received: by 10.112.11.133 with SMTP id q5mr6421812lbb.86.1448044875219; Fri, 20 Nov 2015 10:41:15 -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 70sm105460lfw.2.2015.11.20.10.41.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Nov 2015 10:41:14 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 20 Nov 2015 21:41:03 +0300 Message-Id: <1448044865-8229-8-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448044865-8229-1-git-send-email-maxim.uvarov@linaro.org> References: <1448044865-8229-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv15 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 e113606..e37d33e 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 610e04d..d847d6a 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