From patchwork Wed Sep 9 10:06:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 53310 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 1412A22B19 for ; Wed, 9 Sep 2015 10:08:57 +0000 (UTC) Received: by lanb10 with SMTP id b10sf1978055lan.3 for ; Wed, 09 Sep 2015 03:08:56 -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=TVd+T5wXEaAgCz5g+9WZzwg9bzeWwGa1rGj5aB/r54Y=; b=GQLDmLbs9AJ73kHzrNHMH6EopvVVuVEcq6scrFmSeocBPkFaUbHlRcMjsatY187sLp jyNcsgmUAXVZIE6WP49xr2OB1AiaxxCodAhxr8aIyIVf2JI6s/qrKD0x2jPOTr9P/bf3 Ers/JlAYzMLsg0E2ChDdhNd76HFzjDvkTekE+t5hXvX46K+I4Zo+VpXKKlyQJsMPZxoi UJTVGToJp2lvSvjq7UP/pdFEwg2rtIrqYWSBYAebTfVLFc9roS5fOOLljXKfBkkLGcCB xsfF/i0zfAc7gBU7s3NdCrH5gi8LitGhQ1crnN+MnFyHRG1AxoXhYysbdHOOZhUvXcnm PlEQ== X-Gm-Message-State: ALoCoQmxd0qbYtBJAJDlLa1g/PhQtW0v8Tgm/jzKwx3P2u0MAU/MrpP73NJkUtUjVVm914Ts6EGF X-Received: by 10.112.132.105 with SMTP id ot9mr7753828lbb.21.1441793336016; Wed, 09 Sep 2015 03:08:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.70 with SMTP id o6ls28241laj.2.gmail; Wed, 09 Sep 2015 03:08:55 -0700 (PDT) X-Received: by 10.152.36.200 with SMTP id s8mr617122laj.119.1441793335850; Wed, 09 Sep 2015 03:08:55 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id mt3si6200900lbb.113.2015.09.09.03.08.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Sep 2015 03:08:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by laeb10 with SMTP id b10so3477929lae.1 for ; Wed, 09 Sep 2015 03:08:55 -0700 (PDT) X-Received: by 10.152.18.133 with SMTP id w5mr17812228lad.72.1441793335698; Wed, 09 Sep 2015 03:08:55 -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.59.35 with SMTP id w3csp226923lbq; Wed, 9 Sep 2015 03:08:54 -0700 (PDT) X-Received: by 10.140.100.182 with SMTP id s51mr25917588qge.25.1441793334590; Wed, 09 Sep 2015 03:08:54 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x8si7576073qkx.53.2015.09.09.03.08.53; Wed, 09 Sep 2015 03:08:54 -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 55B4461D84; Wed, 9 Sep 2015 10:08:53 +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 F1DAA61E10; Wed, 9 Sep 2015 10:07:02 +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 E441161E10; Wed, 9 Sep 2015 10:06:53 +0000 (UTC) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by lists.linaro.org (Postfix) with ESMTPS id 660C861CC2 for ; Wed, 9 Sep 2015 10:06:47 +0000 (UTC) Received: by laeb10 with SMTP id b10so3444076lae.1 for ; Wed, 09 Sep 2015 03:06:46 -0700 (PDT) X-Received: by 10.152.28.167 with SMTP id c7mr15337161lah.17.1441793205950; Wed, 09 Sep 2015 03:06:45 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-161-180.pppoe.mtu-net.ru. [91.76.161.180]) by smtp.gmail.com with ESMTPSA id qu6sm1654092lbb.27.2015.09.09.03.06.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Sep 2015 03:06:45 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Wed, 9 Sep 2015 13:06:35 +0300 Message-Id: <1441793199-30966-3-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441793199-30966-1-git-send-email-maxim.uvarov@linaro.org> References: <1441793199-30966-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 2/6] 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.215.46 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 b9ed3b0..ac6d751 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -154,6 +154,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 489bdce..4bb6b4e 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