From patchwork Mon Jan 23 19:46:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 92269 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1385657qgi; Mon, 23 Jan 2017 11:47:34 -0800 (PST) X-Received: by 10.200.36.81 with SMTP id d17mr24015272qtd.99.1485200854851; Mon, 23 Jan 2017 11:47:34 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t73si11503952qke.263.2017.01.23.11.47.34; Mon, 23 Jan 2017 11:47:34 -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 825E462D6D; Mon, 23 Jan 2017 19:47:34 +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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 6741762C5F; Mon, 23 Jan 2017 19:46:50 +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 E8A0662C37; Mon, 23 Jan 2017 19:46:44 +0000 (UTC) Received: from mail-yw0-f172.google.com (mail-yw0-f172.google.com [209.85.161.172]) by lists.linaro.org (Postfix) with ESMTPS id 36D6460F38 for ; Mon, 23 Jan 2017 19:46:15 +0000 (UTC) Received: by mail-yw0-f172.google.com with SMTP id u68so107658489ywg.0 for ; Mon, 23 Jan 2017 11:46:15 -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=W1KLtE7ioFiNfbljexQ+R0ara28I8K/81I8v8wEo8sM=; b=jm/NLFxC0KICs7+yJTTA3kuidV98Lk2ZqI58PmW06syFBDyqLv0s3NVEBv7yJnLejR rX3VZGEs+3ZcFhzB108dNVFDLIdOyDjsX9mCc/cUDFcBs1EYeL5xJiky2Q4lXc9COyG9 ZrJUNzA+jzuyX7Ta76Mj/gej44Mzljvf1+zQohHQFIH8iXjoO1tSRoBvexS8S6iwYaHO SOV0RKNwGebjNtmqcGdMrnPwLWvCb/14R3G41ac3d5ke5m1V5O45GMiRKhKbn+juf3PZ mCO3mJkdalVW3QuMAmyhRgueEqa8YSNY3GH99RqE4Ht+hotaLp05PNzOAARvH+4a5Je+ gZAA== X-Gm-Message-State: AIkVDXIUbN8KHNAZLxk/lnARm+mncXKpp/nY4ejecTXUO5P7GZ/ukuppzSkKJqpkqek4xNh0ZSc= X-Received: by 10.55.26.159 with SMTP id l31mr26995702qkh.164.1485200774446; Mon, 23 Jan 2017 11:46:14 -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 23sm13960695qtp.20.2017.01.23.11.46.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jan 2017 11:46:13 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 23 Jan 2017 14:46:05 -0500 Message-Id: <20170123194608.4552-2-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 1/4] helper: add odph_api.h for existing exported headers 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" Rather than have all applications include a variable number of helper api files, consolidate them into one include odph_api.h Signed-off-by: Mike Holmes --- helper/Makefile.am | 1 + helper/include/odp/helper/odph_api.h | 35 +++++++++++++++++++++++++++++++++++ helper/test/chksum.c | 4 +--- helper/test/odpthreads.c | 2 +- helper/test/parse.c | 3 +-- 5 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 helper/include/odp/helper/odph_api.h -- 2.9.3 diff --git a/helper/Makefile.am b/helper/Makefile.am index 9b2f18a..76cad1b 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -19,6 +19,7 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/icmp.h\ $(srcdir)/include/odp/helper/ip.h\ $(srcdir)/include/odp/helper/ipsec.h\ + $(srcdir)/include/odp/helper/odph_api.h\ $(srcdir)/include/odp/helper/strong_types.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h new file mode 100644 index 0000000..ae6e77b --- /dev/null +++ b/helper/include/odp/helper/odph_api.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * The OpenDataPlane helper API + * + */ + +#ifndef ODP_HELPER_H_ +#define ODP_HELPER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +} +#endif +#endif diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 7c572ae..1beae47 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -6,9 +6,7 @@ #include "odph_debug.h" #include -#include -#include -#include +#include struct udata_struct { uint64_t u64; diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index 4bb3c3b..219e1b6 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -15,7 +15,7 @@ #include #include -#include +#include #define NUMBER_WORKERS 16 diff --git a/helper/test/parse.c b/helper/test/parse.c index 26dfc68..0429f2c 100644 --- a/helper/test/parse.c +++ b/helper/test/parse.c @@ -7,8 +7,7 @@ #include #include -#include -#include +#include #include #include 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 /** From patchwork Mon Jan 23 19:46:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 92272 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1386382qgi; Mon, 23 Jan 2017 11:49:48 -0800 (PST) X-Received: by 10.237.35.179 with SMTP id j48mr24816879qtc.290.1485200988013; Mon, 23 Jan 2017 11:49:48 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b51si11524545qtc.140.2017.01.23.11.49.47; Mon, 23 Jan 2017 11:49:48 -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 A5B9962D32; Mon, 23 Jan 2017 19:49: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.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 6078B62D5D; Mon, 23 Jan 2017 19:47:01 +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 67CF160F38; Mon, 23 Jan 2017 19:46:47 +0000 (UTC) Received: from mail-qt0-f174.google.com (mail-qt0-f174.google.com [209.85.216.174]) by lists.linaro.org (Postfix) with ESMTPS id 4BE9962C5F for ; Mon, 23 Jan 2017 19:46:19 +0000 (UTC) Received: by mail-qt0-f174.google.com with SMTP id v23so142441989qtb.0 for ; Mon, 23 Jan 2017 11:46:19 -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=zFLnoD59AlU0FT3MK6EUAFW4Q8ujmx/3gt2mTMsRdXE=; b=rqcRAXyELdff1zsc0Q7ZFg6vOEWvBKtifKSeRQy1IvouLRiwECYnx5r+AstlQZ7arb W1sAR1buCQEQMT4Eb57HVXP06XvXZJ23y1KSR0ar3BJs8oy4qp5XlqFG97+Xcp9AHVwv +tHJBLOqZCjMrmPOgO1bVNgS0ykloSNMqnOri7vs1NY76P5rEQ5pAv3pLlN9JX5bpNA6 5gowI60DG32rm5nysXt/MkCavKdKZR43EdpxXyYosYqu2C+8lWeHJPVh0/Ha2p1wsuLR BRFbkvglHKXakJqgH8lfktXRLow5PIScH5sNQ6B3sZry2mVTySeTBoFDUl66hvXMCRXK vjtA== X-Gm-Message-State: AIkVDXKUhTC/I1/7/Ghry+VrBqzMy8s52NL5hh8NFCGpumX+H69mrJIcldZ/7Qzpt9k4PccF/Vc= X-Received: by 10.200.46.110 with SMTP id s43mr24909491qta.225.1485200778574; Mon, 23 Jan 2017 11:46:18 -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 n129sm13990274qkd.16.2017.01.23.11.46.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jan 2017 11:46:17 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 23 Jan 2017 14:46:07 -0500 Message-Id: <20170123194608.4552-4-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 3/4] test: use odph_api.h 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" Clean up all the includes and replace them with odph_api.h Signed-off-by: Mike Holmes --- test/common_plat/common/odp_cunit_common.c | 2 +- test/common_plat/performance/odp_crypto.c | 2 +- test/common_plat/performance/odp_l2fwd.c | 4 +--- test/common_plat/performance/odp_pktio_perf.c | 5 +---- test/common_plat/performance/odp_sched_latency.c | 2 +- test/common_plat/performance/odp_scheduling.c | 2 +- .../validation/api/classification/odp_classification_common.c | 4 ---- .../validation/api/classification/odp_classification_test_pmr.c | 4 ---- .../validation/api/classification/odp_classification_tests.c | 4 ---- .../validation/api/classification/odp_classification_testsuites.h | 1 + test/common_plat/validation/api/pktio/pktio.c | 4 +--- test/common_plat/validation/api/timer/timer.c | 2 +- test/common_plat/validation/api/traffic_mngr/traffic_mngr.c | 6 +----- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 4 +--- test/linux-generic/pktio_ipc/ipc_common.h | 5 +---- test/linux-generic/ring/ring_stress.c | 2 +- 16 files changed, 13 insertions(+), 40 deletions(-) -- 2.9.3 diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c index 6d18fa0..d3328af 100644 --- a/test/common_plat/common/odp_cunit_common.c +++ b/test/common_plat/common/odp_cunit_common.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include /* Globals */ static odph_odpthread_t thread_tbl[MAX_WORKERS]; static odp_instance_t instance; diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index bff20e5..954bdb7 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -17,7 +17,7 @@ #include #include -#include +#include #define app_err(fmt, ...) \ fprintf(stderr, "%s:%d:%s(): Error: " fmt, __FILE__, \ diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index fa59d5e..54dc4cf 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -25,9 +25,7 @@ #include #include -#include -#include -#include +#include /** @def MAX_WORKERS * @brief Maximum number of worker threads diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index ee3b8ab..0946308 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -22,10 +22,7 @@ */ #include -#include -#include -#include -#include +#include #include #include diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/common_plat/performance/odp_sched_latency.c index 2066f91..2b28cd7 100644 --- a/test/common_plat/performance/odp_sched_latency.c +++ b/test/common_plat/performance/odp_sched_latency.c @@ -20,7 +20,7 @@ #include /* ODP helper for Linux apps */ -#include +#include /* GNU lib C */ #include diff --git a/test/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c index 713dba1..c74a071 100644 --- a/test/common_plat/performance/odp_scheduling.c +++ b/test/common_plat/performance/odp_scheduling.c @@ -20,7 +20,7 @@ #include /* ODP helper for Linux apps */ -#include +#include /* Needs librt*/ #include diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c index 2923a71..f7ec6e5 100644 --- a/test/common_plat/validation/api/classification/odp_classification_common.c +++ b/test/common_plat/validation/api/classification/odp_classification_common.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include -#include -#include -#include -#include #include "test_debug.h" typedef struct cls_test_packet { diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c index 88fbf8f..a54954e 100644 --- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c +++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include -#include -#include -#include -#include static odp_pool_t pkt_pool; diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c index ed45518..4f1aecd 100644 --- a/test/common_plat/validation/api/classification/odp_classification_tests.c +++ b/test/common_plat/validation/api/classification/odp_classification_tests.c @@ -7,10 +7,6 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include -#include -#include -#include -#include static odp_cos_t cos_list[CLS_ENTRIES]; static odp_pmr_t pmr_list[CLS_ENTRIES]; diff --git a/test/common_plat/validation/api/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h index aea3de1..f9fd908 100644 --- a/test/common_plat/validation/api/classification/odp_classification_testsuites.h +++ b/test/common_plat/validation/api/classification/odp_classification_testsuites.h @@ -8,6 +8,7 @@ #define ODP_CLASSIFICATION_TESTSUITES_H_ #include +#include #include #include diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c index c23e2cc..4f3c0c0 100644 --- a/test/common_plat/validation/api/pktio/pktio.c +++ b/test/common_plat/validation/api/pktio/pktio.c @@ -6,9 +6,7 @@ #include #include -#include -#include -#include +#include #include #include "pktio.h" diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index 304b1d5..b7d84c6 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include "odp_cunit_common.h" #include "test_debug.h" #include "timer.h" diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c index 0271758..88a7d8c 100644 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c @@ -12,11 +12,7 @@ #include #include #include -#include -#include -#include -#include -#include +#include #include #include "odp_cunit_common.h" #include "traffic_mngr.h" diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c index a12eb3c..bda810e 100644 --- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c +++ b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c @@ -10,9 +10,7 @@ #include #include -#include -#include -#include +#include #define POOL_NUM_PKT 8192 #define POOL_SEG_LEN 1856 diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index d2a355d..6245577 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -17,10 +17,7 @@ #include #include -#include -#include -#include -#include +#include /** @def SHM_PKT_POOL_SIZE * @brief Size of the shared memory block diff --git a/test/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c index 19bd65b..b6ddb34 100644 --- a/test/linux-generic/ring/ring_stress.c +++ b/test/linux-generic/ring/ring_stress.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include From patchwork Mon Jan 23 19:46:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 92270 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1385841qgi; Mon, 23 Jan 2017 11:48:07 -0800 (PST) X-Received: by 10.237.62.182 with SMTP id n51mr25655574qtf.252.1485200887626; Mon, 23 Jan 2017 11:48:07 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v13si11519906qta.74.2017.01.23.11.48.07; Mon, 23 Jan 2017 11:48:07 -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 459AC62C3A; Mon, 23 Jan 2017 19:48:07 +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 CCE3A62D2E; Mon, 23 Jan 2017 19:46:54 +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 ABB0C60F38; Mon, 23 Jan 2017 19:46:46 +0000 (UTC) Received: from mail-qt0-f176.google.com (mail-qt0-f176.google.com [209.85.216.176]) by lists.linaro.org (Postfix) with ESMTPS id 44D5062CA7 for ; Mon, 23 Jan 2017 19:46:21 +0000 (UTC) Received: by mail-qt0-f176.google.com with SMTP id l7so143096966qtd.1 for ; Mon, 23 Jan 2017 11:46:21 -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=ys3CXIXsQTFjvt8H4laUjS+kzyEtgO4QNz0Xek17y6w=; b=Sw01PyIUes8K4PZjxzJIYOj5xMJoY94YrdfQ3pSwgOK+5JpYIe5D4kDpbAszeDwHJx XOjRbQcsehrSpf1Qhz4IvhvzyEUF8HXpcv74ziyLFA3l1rK3lS3j3J3ydiB6jQdxQTAZ Czq2BNazvYyu5xvBX69Hdwdgi5LBkPgPUgr8tsLZOXL4loYJhiRREqI26oPYmP9XNKJf DpED5Cx+Tlbxf4F2SkVHezLOTFKftj0XWQAMuTTWMEtYrXCdU8SPnmSKfOfoTbJx4Nyy h+BDVec7YOwk6Xi4sEPRokVxYSkDbcpNgQYtAI4bdBYxB/6pPnb5sCgVabCGx+tRWRnB elfg== X-Gm-Message-State: AIkVDXL8C/ZX9AIZ4J8mFQrkjis9CFP7vtpb5GRDLJuT7R8cmnz2fkrLjJlSGKFqeQXzlLQ/5U4= X-Received: by 10.55.212.22 with SMTP id l22mr25266501qki.48.1485200780525; Mon, 23 Jan 2017 11:46:20 -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 d67sm13994859qkg.17.2017.01.23.11.46.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jan 2017 11:46:19 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 23 Jan 2017 14:46:08 -0500 Message-Id: <20170123194608.4552-5-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 4/4] examples: use odph_api.h 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" clean up all the examples and just use odph_api.h Signed-off-by: Mike Holmes --- example/classifier/odp_classifier.c | 4 +--- example/generator/odp_generator.c | 6 +----- example/ipsec/odp_ipsec.c | 6 +----- example/ipsec/odp_ipsec_fwd_db.h | 1 - example/ipsec/odp_ipsec_loop_db.h | 1 - example/ipsec/odp_ipsec_misc.h | 4 +--- example/ipsec/odp_ipsec_stream.c | 4 +--- example/l2fwd_simple/odp_l2fwd_simple.c | 4 +--- example/l3fwd/odp_l3fwd.c | 6 +----- example/l3fwd/odp_l3fwd_db.h | 2 +- example/packet/odp_pktio.c | 4 +--- example/switch/odp_switch.c | 4 +--- example/time/time_global_test.c | 2 +- example/timer/odp_timer_test.c | 2 +- 14 files changed, 12 insertions(+), 38 deletions(-) -- 2.9.3 diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index c2f69d4..d67fe5a 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -12,9 +12,7 @@ #include #include -#include -#include -#include +#include #include #include #include diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 194c0a0..6ac8f2d 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -20,11 +20,7 @@ #include -#include -#include -#include -#include -#include +#include #define MAX_WORKERS 32 /**< max number of works */ #define SHM_PKT_POOL_SIZE (512*2048) /**< pkt pool size */ diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index d686160..9ed3aa2 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -24,11 +24,7 @@ #include -#include -#include -#include -#include -#include +#include #include #include diff --git a/example/ipsec/odp_ipsec_fwd_db.h b/example/ipsec/odp_ipsec_fwd_db.h index 748ae04..152bdfb 100644 --- a/example/ipsec/odp_ipsec_fwd_db.h +++ b/example/ipsec/odp_ipsec_fwd_db.h @@ -12,7 +12,6 @@ extern "C" { #endif #include -#include #include #define OIF_LEN 32 diff --git a/example/ipsec/odp_ipsec_loop_db.h b/example/ipsec/odp_ipsec_loop_db.h index 0778186..1f9ade6 100644 --- a/example/ipsec/odp_ipsec_loop_db.h +++ b/example/ipsec/odp_ipsec_loop_db.h @@ -12,7 +12,6 @@ extern "C" { #endif #include -#include #include /** diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h index 6a49dcb..e0320eb 100644 --- a/example/ipsec/odp_ipsec_misc.h +++ b/example/ipsec/odp_ipsec_misc.h @@ -12,9 +12,7 @@ extern "C" { #endif #include -#include -#include -#include +#include #ifndef TRUE #define TRUE 1 diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index 4dc9acf..428ec04 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -21,9 +21,7 @@ #include -#include -#include -#include +#include #include #include diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index 2473a11..b97808f 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -10,9 +10,7 @@ #include #include -#include -#include -#include +#include #define POOL_NUM_PKT 8192 #define POOL_SEG_LEN 1856 diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 4e35b64..ba06972 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -14,11 +14,7 @@ #include #include -#include -#include -#include -#include -#include +#include #include "odp_l3fwd_db.h" #include "odp_l3fwd_lpm.h" diff --git a/example/l3fwd/odp_l3fwd_db.h b/example/l3fwd/odp_l3fwd_db.h index 1b24f1a..8df2999 100644 --- a/example/l3fwd/odp_l3fwd_db.h +++ b/example/l3fwd/odp_l3fwd_db.h @@ -12,7 +12,7 @@ extern "C" { #endif #include -#include +#include #define OIF_LEN 32 #define MAX_DB 32 diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 6e24deb..ea84282 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -13,9 +13,7 @@ #include #include -#include -#include -#include +#include /** @def MAX_WORKERS * @brief Maximum number of worker threads diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 2bbce10..561c293 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -11,9 +11,7 @@ #include #include -#include -#include -#include +#include /** Maximum number of worker threads */ #define MAX_WORKERS 32 diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index dd33949..e24e9f4 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -8,7 +8,7 @@ #include #include -#include +#include #define MAX_WORKERS 32 #define ITERATION_NUM 2048 diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index b847e2b..1088a74 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -14,7 +14,7 @@ #include /* ODP helper for Linux apps */ -#include +#include /* GNU lib C */ #include