From patchwork Tue Aug 18 11:01:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 52499 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id 6CA0A22DB1 for ; Tue, 18 Aug 2015 11:06:06 +0000 (UTC) Received: by lbcli1 with SMTP id li1sf54410374lbc.2 for ; Tue, 18 Aug 2015 04:06:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=C5Xqk0/WpQJRiWk770/ZoYfLroLhJjQz4mBH3qRhNs8=; b=NkuWtvA7ht+ZOcF+8CyVFW5RZZj98iKraF7UuZGmsd0jeJIfU89ei8/pJVZ+Xkpjhr QkEZcJYZVUnuPz50JWOx+ycgnp46qrA1y/dkL/pwDhvy00ffF+ZnCtPWD3pUj3CpSjVq bMHPmFdB9N+PQVp3w6geVk+2gUTnJe01JH3eHdAWpk0DvxHJPA+73ONZU6w3gFn/Was9 P6ug1duI0KAl1Y2qRN4Qzj5xyNwsCMsGcqAaanwlIasfxzoDo2u2zAWePvSXS1qGZVVv QFEPTW3psQasrb3jkACS3j3GeXV0FHh9WGQX+iNpCo8xE5O9aZ5ogh99SXPVTgJ4I6LW zhIw== X-Gm-Message-State: ALoCoQn1iwWhAPGugi1yIwG2UKAf+s24IoWdZ+FvVvyzuOZxEtmynzRRPGggX9TpWr6ivEe8qe+h X-Received: by 10.180.79.66 with SMTP id h2mr6168492wix.3.1439895965334; Tue, 18 Aug 2015 04:06:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.137 with SMTP id w9ls713224lad.102.gmail; Tue, 18 Aug 2015 04:06:05 -0700 (PDT) X-Received: by 10.112.159.226 with SMTP id xf2mr5690817lbb.74.1439895965034; Tue, 18 Aug 2015 04:06:05 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id o10si13851599laj.148.2015.08.18.04.06.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Aug 2015 04:06:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbbsx3 with SMTP id sx3so100381802lbb.0 for ; Tue, 18 Aug 2015 04:06:04 -0700 (PDT) X-Received: by 10.112.77.10 with SMTP id o10mr5760964lbw.73.1439895964695; Tue, 18 Aug 2015 04:06:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.162.200 with SMTP id yc8csp406412lbb; Tue, 18 Aug 2015 04:06:03 -0700 (PDT) X-Received: by 10.55.48.82 with SMTP id w79mr11679947qkw.95.1439895963078; Tue, 18 Aug 2015 04:06:03 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id h184si30654548qhc.21.2015.08.18.04.06.02; Tue, 18 Aug 2015 04:06:03 -0700 (PDT) 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; Received: by lists.linaro.org (Postfix, from userid 109) id 2433161E89; Tue, 18 Aug 2015 11:06:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal 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 ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6CE0061F75; Tue, 18 Aug 2015 11:02:46 +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 A493061F64; Tue, 18 Aug 2015 11:02:37 +0000 (UTC) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by lists.linaro.org (Postfix) with ESMTPS id BA7F161F49 for ; Tue, 18 Aug 2015 11:01:53 +0000 (UTC) Received: by wijp15 with SMTP id p15so97229238wij.0 for ; Tue, 18 Aug 2015 04:01:53 -0700 (PDT) X-Received: by 10.180.96.164 with SMTP id dt4mr44107269wib.53.1439895712988; Tue, 18 Aug 2015 04:01:52 -0700 (PDT) Received: from localhost.localdomain ([87.120.178.39]) by smtp.gmail.com with ESMTPSA id e8sm20892047wiz.0.2015.08.18.04.01.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Aug 2015 04:01:52 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 18 Aug 2015 14:01:32 +0300 Message-Id: <1439895698-18597-7-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439895698-18597-1-git-send-email-maxim.uvarov@linaro.org> References: <1439895698-18597-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv8 06/12] linux-generic: move odp_ring from helper to linux-generic platfrom X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Maxim Uvarov --- configure.ac | 1 - helper/Makefile.am | 4 +--- platform/linux-generic/Makefile.am | 1 + .../ring.h => platform/linux-generic/include/odp_ring_internal.h | 0 platform/linux-generic/m4/configure.m4 | 1 + {helper => platform/linux-generic/pktio}/ring.c | 4 ++-- platform/linux-generic/test/Makefile.am | 3 ++- {test/api_test => platform/linux-generic/test/ring}/.gitignore | 1 - {test/api_test => platform/linux-generic/test/ring}/Makefile.am | 3 ++- {test/api_test => platform/linux-generic/test/ring}/odp_common.c | 0 {test/api_test => platform/linux-generic/test/ring}/odp_common.h | 0 {test/api_test => platform/linux-generic/test/ring}/odp_ring_test.c | 3 +-- test/Makefile.am | 2 +- 13 files changed, 11 insertions(+), 12 deletions(-) rename helper/include/odp/helper/ring.h => platform/linux-generic/include/odp_ring_internal.h (100%) rename {helper => platform/linux-generic/pktio}/ring.c (99%) rename {test/api_test => platform/linux-generic/test/ring}/.gitignore (52%) rename {test/api_test => platform/linux-generic/test/ring}/Makefile.am (66%) rename {test/api_test => platform/linux-generic/test/ring}/odp_common.c (100%) rename {test/api_test => platform/linux-generic/test/ring}/odp_common.h (100%) rename {test/api_test => platform/linux-generic/test/ring}/odp_ring_test.c (99%) diff --git a/configure.ac b/configure.ac index 15dc6cf..d90b09b 100644 --- a/configure.ac +++ b/configure.ac @@ -292,7 +292,6 @@ AC_CONFIG_FILES([Makefile pkgconfig/libodphelper.pc scripts/Makefile test/Makefile - test/api_test/Makefile test/performance/Makefile test/validation/Makefile test/validation/buffer/Makefile diff --git a/helper/Makefile.am b/helper/Makefile.am index cde8af2..7ca4782 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -9,7 +9,6 @@ AM_CFLAGS += -I$(top_srcdir)/include helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ - $(srcdir)/include/odp/helper/ring.h \ $(srcdir)/include/odp/helper/linux.h \ $(srcdir)/include/odp/helper/chksum.h\ $(srcdir)/include/odp/helper/eth.h\ @@ -22,7 +21,6 @@ helperinclude_HEADERS = \ noinst_HEADERS = $(srcdir)/odph_debug.h __LIB__libodphelper_la_SOURCES = \ - linux.c \ - ring.c + linux.c lib_LTLIBRARIES = $(LIB)/libodphelper.la diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index cfeeef9..e833a56 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -148,6 +148,7 @@ __LIB__libodp_la_SOURCES = \ pktio/loop.c \ pktio/socket.c \ pktio/socket_mmap.c \ + pktio/ring.c \ odp_pool.c \ odp_queue.c \ odp_rwlock.c \ diff --git a/helper/include/odp/helper/ring.h b/platform/linux-generic/include/odp_ring_internal.h similarity index 100% rename from helper/include/odp/helper/ring.h rename to platform/linux-generic/include/odp_ring_internal.h diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 9658274..ff6ec7d 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -21,4 +21,5 @@ m4_include([platform/linux-generic/m4/odp_openssl.m4]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/test/Makefile + platform/linux-generic/test/ring/Makefile platform/linux-generic/test/pktio/Makefile]) diff --git a/helper/ring.c b/platform/linux-generic/pktio/ring.c similarity index 99% rename from helper/ring.c rename to platform/linux-generic/pktio/ring.c index fe01c5d..0ab5dd3 100644 --- a/helper/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -76,9 +76,9 @@ #include #include #include -#include "odph_debug.h" #include -#include +#include +#include static TAILQ_HEAD(, odph_ring) odp_ring_list; diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 7d1ce1b..be134ef 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -1,10 +1,11 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation -ODP_MODULES = pktio +ODP_MODULES = pktio ring if test_vald TESTS = pktio/pktio_run \ + ${top_builddir}/platform/linux-generic/test/ring/odp_ring$(EXEEXT) \ ${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \ ${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \ ${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \ diff --git a/test/api_test/.gitignore b/platform/linux-generic/test/ring/.gitignore similarity index 52% rename from test/api_test/.gitignore rename to platform/linux-generic/test/ring/.gitignore index 950f443..6cb99bc 100644 --- a/test/api_test/.gitignore +++ b/platform/linux-generic/test/ring/.gitignore @@ -1,2 +1 @@ odp_ring -odp_shm diff --git a/test/api_test/Makefile.am b/platform/linux-generic/test/ring/Makefile.am similarity index 66% rename from test/api_test/Makefile.am rename to platform/linux-generic/test/ring/Makefile.am index fcdba48..73cd8ee 100644 --- a/test/api_test/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/test/Makefile.inc +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation bin_PROGRAMS = odp_ring$(EXEEXT) @@ -7,7 +8,7 @@ odp_ring_CFLAGS = $(AM_CFLAGS) odp_ring_LDFLAGS = $(AM_LDFLAGS) -static noinst_HEADERS = \ - $(top_srcdir)/test/api_test/odp_common.h \ + $(top_srcdir)/platform/linux-generic/test/ring/odp_common.h \ $(top_srcdir)/test/test_debug.h dist_odp_ring_SOURCES = odp_ring_test.c odp_common.c diff --git a/test/api_test/odp_common.c b/platform/linux-generic/test/ring/odp_common.c similarity index 100% rename from test/api_test/odp_common.c rename to platform/linux-generic/test/ring/odp_common.c diff --git a/test/api_test/odp_common.h b/platform/linux-generic/test/ring/odp_common.h similarity index 100% rename from test/api_test/odp_common.h rename to platform/linux-generic/test/ring/odp_common.h diff --git a/test/api_test/odp_ring_test.c b/platform/linux-generic/test/ring/odp_ring_test.c similarity index 99% rename from test/api_test/odp_ring_test.c rename to platform/linux-generic/test/ring/odp_ring_test.c index e8a962a..cec8221 100644 --- a/test/api_test/odp_ring_test.c +++ b/platform/linux-generic/test/ring/odp_ring_test.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #define RING_SIZE 4096 @@ -467,4 +467,3 @@ fail: return 0; } - diff --git a/test/Makefile.am b/test/Makefile.am index 2ba8008..4a75364 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = api_test performance miscellaneous +SUBDIRS = performance miscellaneous if cunit_support SUBDIRS += validation