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