From patchwork Mon Jan 23 19:46:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 92271 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1386105qgi; Mon, 23 Jan 2017 11:48:56 -0800 (PST) X-Received: by 10.55.76.204 with SMTP id z195mr22272171qka.128.1485200936298; Mon, 23 Jan 2017 11:48:56 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d192si11519474qkb.75.2017.01.23.11.48.56; Mon, 23 Jan 2017 11:48:56 -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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id EFAB762D48; Mon, 23 Jan 2017 19:48:55 +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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 256B662D25; Mon, 23 Jan 2017 19:46:58 +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 B4B9362C37; Mon, 23 Jan 2017 19:46:46 +0000 (UTC) Received: from mail-qt0-f181.google.com (mail-qt0-f181.google.com [209.85.216.181]) by lists.linaro.org (Postfix) with ESMTPS id 9C1B162C3A for ; Mon, 23 Jan 2017 19:46:17 +0000 (UTC) Received: by mail-qt0-f181.google.com with SMTP id x49so141661427qtc.2 for ; Mon, 23 Jan 2017 11:46:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=m+GWeKVVHhlsQITUJ3xlLDuO/UZHTvPZjlOZvkFRnW4=; b=Vw9k2bGcVLkuSVlagQcLZQUTfxsUMOV6DBzbSdK7SvgYlDKfK8fuPJ6UOXq6NbUKzS Jt0F9ZOVUiILomDKYt+mH/cY/6pDbRwywElZgPlytKeIyfe9NpD0KzYsqdkXUgPMfae9 0BDhRJRcC6S41XkKHcIGM9LSqued7DpwbY1MCmvIg2yK19NIbvyY/hJ/bQKDsZrA+OOp kMoE4AZ948F8Mz3M5/QZwoTLoRnPYBu0FjS38sBsEWrCRrmPBjmAJdqZBe2QrsWZqnpV 4tJeFy3r20CYS+BVoRL86Ln6+a/NqqEJoQuMvConcRd3wkIFUB0S7NLrgW2tSb8hsMnw NoVg== X-Gm-Message-State: AIkVDXLRVablEeNqWwMkT6+35Yn5drcroNxwdS6Zw0agn4MINeEWeveBkcbhJH121UAgENQr9yY= X-Received: by 10.237.53.236 with SMTP id d41mr27371595qte.135.1485200776673; Mon, 23 Jan 2017 11:46:16 -0800 (PST) Received: from localhost (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id l53sm13990334qtl.41.2017.01.23.11.46.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jan 2017 11:46:15 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 23 Jan 2017 14:46:06 -0500 Message-Id: <20170123194608.4552-3-mike.holmes@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170123194608.4552-1-mike.holmes@linaro.org> References: <20170123194608.4552-1-mike.holmes@linaro.org> Subject: [lng-odp] [PATCH 2/4] helper: use odph_api.h for test include for unexported 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" Adding the previously missing table functions to the public helper api allows the tests to use just odph_api.h Signed-off-by: Mike Holmes --- helper/Makefile.am | 10 +++++----- helper/cuckootable.c | 2 +- helper/hashtable.c | 2 +- helper/include/odp/helper/odph_api.h | 4 ++++ helper/{ => include/odp/helper}/odph_cuckootable.h | 0 helper/{ => include/odp/helper}/odph_hashtable.h | 0 helper/{ => include/odp/helper}/odph_iplookuptable.h | 0 helper/{ => include/odp/helper}/odph_lineartable.h | 0 helper/iplookuptable.c | 2 +- helper/lineartable.c | 2 +- helper/test/cuckootable.c | 2 +- helper/test/iplookuptable.c | 2 +- helper/test/table.c | 3 +-- 13 files changed, 16 insertions(+), 13 deletions(-) rename helper/{ => include/odp/helper}/odph_cuckootable.h (100%) rename helper/{ => include/odp/helper}/odph_hashtable.h (100%) rename helper/{ => include/odp/helper}/odph_iplookuptable.h (100%) rename helper/{ => include/odp/helper}/odph_lineartable.h (100%) -- 2.9.3 diff --git a/helper/Makefile.am b/helper/Makefile.am index 76cad1b..4d24a69 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -20,6 +20,10 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/ip.h\ $(srcdir)/include/odp/helper/ipsec.h\ $(srcdir)/include/odp/helper/odph_api.h\ + $(srcdir)/include/odp/helper/odph_cuckootable.h\ + $(srcdir)/include/odp/helper/odph_hashtable.h\ + $(srcdir)/include/odp/helper/odph_iplookuptable.h\ + $(srcdir)/include/odp/helper/odph_lineartable.h\ $(srcdir)/include/odp/helper/strong_types.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ @@ -33,11 +37,7 @@ endif noinst_HEADERS = \ $(srcdir)/odph_debug.h \ - $(srcdir)/odph_hashtable.h \ - $(srcdir)/odph_lineartable.h \ - $(srcdir)/odph_cuckootable.h \ - $(srcdir)/odph_list_internal.h \ - $(srcdir)/odph_iplookuptable.h + $(srcdir)/odph_list_internal.h __LIB__libodphelper_@with_platform@_la_SOURCES = \ eth.c \ diff --git a/helper/cuckootable.c b/helper/cuckootable.c index b4fce6c..83647ec 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -42,7 +42,7 @@ #include #include -#include "odph_cuckootable.h" +#include "odp/helper/odph_cuckootable.h" #include "odph_debug.h" #include diff --git a/helper/hashtable.c b/helper/hashtable.c index 8bb1ae5..983b3da 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -7,7 +7,7 @@ #include #include -#include "odph_hashtable.h" +#include "odp/helper/odph_hashtable.h" #include "odph_list_internal.h" #include "odph_debug.h" #include diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h index ae6e77b..7ed0e77 100644 --- a/helper/include/odp/helper/odph_api.h +++ b/helper/include/odp/helper/odph_api.h @@ -19,10 +19,14 @@ extern "C" { #endif #include +#include #include +#include #include #include #include +#include +#include #include #include #include diff --git a/helper/odph_cuckootable.h b/helper/include/odp/helper/odph_cuckootable.h similarity index 100% rename from helper/odph_cuckootable.h rename to helper/include/odp/helper/odph_cuckootable.h diff --git a/helper/odph_hashtable.h b/helper/include/odp/helper/odph_hashtable.h similarity index 100% rename from helper/odph_hashtable.h rename to helper/include/odp/helper/odph_hashtable.h diff --git a/helper/odph_iplookuptable.h b/helper/include/odp/helper/odph_iplookuptable.h similarity index 100% rename from helper/odph_iplookuptable.h rename to helper/include/odp/helper/odph_iplookuptable.h diff --git a/helper/odph_lineartable.h b/helper/include/odp/helper/odph_lineartable.h similarity index 100% rename from helper/odph_lineartable.h rename to helper/include/odp/helper/odph_lineartable.h diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 5f80743..f6d6f88 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -9,7 +9,7 @@ #include #include -#include "odph_iplookuptable.h" +#include #include "odph_list_internal.h" #include "odph_debug.h" #include diff --git a/helper/lineartable.c b/helper/lineartable.c index e82c165..8917901 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -8,7 +8,7 @@ #include #include -#include "odph_lineartable.h" +#include "odp/helper/odph_lineartable.h" #include "odph_debug.h" #include diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index 6736f2b..002e52e 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -49,7 +49,7 @@ #include #include -#include <../odph_cuckootable.h> +#include /******************************************************************************* * Hash function performance test configuration section. diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c index 86aa1b3..b5d774c 100644 --- a/helper/test/iplookuptable.c +++ b/helper/test/iplookuptable.c @@ -12,7 +12,7 @@ #include #include -#include <../odph_iplookuptable.h> +#include #include static void print_prefix_info( diff --git a/helper/test/table.c b/helper/test/table.c index 3b74b22..ac454da 100644 --- a/helper/test/table.c +++ b/helper/test/table.c @@ -5,8 +5,7 @@ */ #include -#include <../odph_hashtable.h> -#include <../odph_lineartable.h> +#include #include /**